diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef7c370d..14daf67c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 1. [](#new)
     * Added ability to set a preferred markdown editor in user profile
-    * Added new `onAdminListMarkdownEditors` event to add a custom editor to the list of available
+    * Added new `onAdminListContentEditors` event to add a custom editor to the list of available
 1. [](#bugfix)
     * Use `Pages::find()` instead of `Pages::dispatch()` as we do not want to redirect out of admin
     * Fixed broken `parent` field  when using the old pages
diff --git a/classes/plugin/Admin.php b/classes/plugin/Admin.php
index 79b99568..4ce8766c 100644
--- a/classes/plugin/Admin.php
+++ b/classes/plugin/Admin.php
@@ -199,14 +199,14 @@ class Admin
         $debugger->addMessage($message, 'debug', $data);
     }
 
-    public static function markdownEditor()
+    public static function contentEditor()
     {
         $options = [
             'default' => 'Default',
             'codemirror' => 'CodeMirror'
         ];
         $event = new Event(['options' => &$options]);
-        Grav::instance()->fireEvent('onAdminListMarkdownEditors', $event);
+        Grav::instance()->fireEvent('onAdminListContentEditors', $event);
         return $options;
     }
 
diff --git a/languages/en.yaml b/languages/en.yaml
index 273a8d3d..e8e230fd 100644
--- a/languages/en.yaml
+++ b/languages/en.yaml
@@ -952,5 +952,5 @@ PLUGIN_ADMIN:
   CUSTOM_PRESETS: "Custom Presets"
   CUSTOM_PRESETS_HELP: "Drag-n-drop a theme .yaml file here, or you can create an array of presets with text based keys"
   GENERAL: "General"
-  MARKDOWN_EDITOR: "Markdown Editor"
-  MARKDOWN_EDITOR_HELP: "Custom editors can be preferred for markdown editing"
+  CONTENT_EDITOR: "Content Editor"
+  CONTENT_EDITOR_HELP: "Custom editors can be preferred for content editing"