diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp
index 556b9dc4b..18a85e1be 100644
--- a/editor/connections_dialog.cpp
+++ b/editor/connections_dialog.cpp
@@ -74,8 +74,8 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 static Node *_find_first_script(Node *p_root, Node *p_node) {
@@ -816,7 +816,7 @@ void ConnectionsDock::_go_to_script(TreeItem &item) {
 		return;
 	}
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	if (script.is_valid() && ScriptEditor::get_singleton()->script_goto_method(script, c.method)) {
 		editor->call("_editor_select", EditorNode::EDITOR_SCRIPT);
 	}
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp
index b0a974759..cbc1b90a8 100644
--- a/editor/editor_data.cpp
+++ b/editor/editor_data.cpp
@@ -45,8 +45,8 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 class Resource;
@@ -557,7 +557,7 @@ void EditorData::remove_scene(int p_idx) {
 		current_edited_scene--;
 	}
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	if (edited_scene[p_idx].path != String()) {
 		ScriptEditor::get_singleton()->close_builtin_scripts_from_scene(edited_scene[p_idx].path);
 	}
diff --git a/editor/editor_data.h b/editor/editor_data.h
index 876b1f0db..824a25705 100644
--- a/editor/editor_data.h
+++ b/editor/editor_data.h
@@ -54,8 +54,8 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor_plugin.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor_plugin.h"
 #endif
 
 class ConfigFile;
diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp
index 49d66ca20..26517c258 100644
--- a/editor/editor_export.cpp
+++ b/editor/editor_export.cpp
@@ -59,8 +59,8 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 static int _get_pad(int p_alignment, int p_n) {
@@ -333,7 +333,7 @@ void EditorExportPlatform::gen_debug_flags(Vector<String> &r_flags, int p_flags)
 		}
 	}
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	int remote_port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port");
 
 	if (p_flags & DEBUG_FLAG_REMOTE_DEBUG) {
@@ -1260,7 +1260,7 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags
 		}
 	}
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	int remote_port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port");
 
 	if (p_flags & DEBUG_FLAG_REMOTE_DEBUG) {
diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp
index 1c18c91ab..fd1676910 100644
--- a/editor/editor_help.cpp
+++ b/editor/editor_help.cpp
@@ -65,8 +65,8 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 #define CONTRIBUTE_URL vformat("%s/community/contributing/updating_the_class_reference.html", VERSION_DOCS_URL)
@@ -1703,7 +1703,7 @@ EditorHelp::~EditorHelp() {
 
 void EditorHelpBit::_go_to_help(String p_what) {
 	EditorNode::get_singleton()->set_visible_editor(EditorNode::EDITOR_SCRIPT);
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	ScriptEditor::get_singleton()->goto_help(p_what);
 #endif
 	emit_signal("request_hide");
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index c728db343..7fe35f3fe 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -192,10 +192,10 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
-#include "modules/code_editor/script_text_editor.h"
-#include "modules/code_editor/text_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
+#include "modules/editor_code_editor/script_text_editor.h"
+#include "modules/editor_code_editor/text_editor.h"
 #endif
 
 class Camera;
@@ -588,7 +588,7 @@ void EditorNode::_notification(int p_what) {
 
 			recent_scenes->set_as_minsize();
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 			// debugger area
 			if (ScriptEditor::get_singleton()->get_debugger()->is_visible()) {
 				bottom_panel->add_theme_style_override("panel", gui_base->get_theme_stylebox("BottomPanelDebuggerOverride", "EditorStyles"));
@@ -2011,7 +2011,7 @@ void EditorNode::_edit_current(bool p_skip_foreign) {
 	Object *prev_inspected_object = get_inspector()->get_edited_object();
 
 	bool disable_folding = bool(EDITOR_GET("interface/inspector/disable_folding"));
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	bool stay_in_script_editor_on_node_selected = bool(EDITOR_GET("text_editor/navigation/stay_in_script_editor_on_node_selected"));
 #endif
 	bool is_resource = current_obj->is_class("Resource");
@@ -2052,7 +2052,7 @@ void EditorNode::_edit_current(bool p_skip_foreign) {
 			node_dock->set_node(current_node);
 			scene_tree_dock->set_selected(current_node);
 			inspector_dock->update(current_node);
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 			if (!inspector_only) {
 				inspector_only = stay_in_script_editor_on_node_selected && ScriptEditor::get_singleton()->is_visible_in_tree();
 			}
@@ -2134,7 +2134,7 @@ void EditorNode::_edit_current(bool p_skip_foreign) {
 				if (!changing_scene) {
 					main_plugin->edit(current_obj);
 				}
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 			} else if (main_plugin != editor_plugin_screen && (!ScriptEditor::get_singleton() || !ScriptEditor::get_singleton()->is_visible_in_tree() || ScriptEditor::get_singleton()->can_take_away_focus())) {
 				// update screen main_plugin
 				_editor_select(plugin_index);
@@ -2240,7 +2240,7 @@ void EditorNode::_run(bool p_current, const String &p_custom) {
 
 	args = ProjectSettings::get_singleton()->get("editor/main_run_args");
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	skip_breakpoints = ScriptEditor::get_singleton()->get_debugger()->is_skip_breakpoints();
 #endif
 	emit_signal("play_pressed");
@@ -2409,7 +2409,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 
 			if (!scene) {
 				if (p_option == FILE_SAVE_SCENE) {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 					// Pressing Ctrl + S saves the current script if a scene is currently open, but it won't if the scene has no root node.
 					// Work around this by explicitly saving the script in this case (similar to pressing Ctrl + Alt + S).
 					ScriptEditor::get_singleton()->save_current_script();
@@ -2730,7 +2730,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_LIVE_DEBUG));
 
 			debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_LIVE_DEBUG), !ischecked);
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 			ScriptEditor::get_singleton()->get_debugger()->set_live_debugging(!ischecked);
 #endif
 			EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_live_debug", !ischecked);
@@ -2770,7 +2770,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			bool ischecked = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(RUN_RELOAD_SCRIPTS));
 			debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_RELOAD_SCRIPTS), !ischecked);
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 			ScriptEditor::get_singleton()->set_live_auto_reload_running_scripts(!ischecked);
 #endif
 			EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_reload_scripts", !ischecked);
@@ -3464,7 +3464,7 @@ void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) {
 
 	//this should only happen at the very end
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	ScriptEditor::get_singleton()->get_debugger()->update_live_edit_root();
 	ScriptEditor::get_singleton()->set_scene_root_script(editor_data.get_scene_root_script(editor_data.get_edited_scene()));
 #endif
@@ -3698,7 +3698,7 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b
 	opening_prev = false;
 	scene_tree_dock->set_selected(new_scene);
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	ScriptEditor::get_singleton()->get_debugger()->update_live_edit_root();
 #endif
 
@@ -5129,7 +5129,7 @@ void EditorNode::_bottom_panel_switch(bool p_enable, int p_idx) {
 			bottom_panel_items[i].control->set_visible(i == p_idx);
 		}
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 		if (ScriptEditor::get_singleton()->get_debugger() == bottom_panel_items[p_idx].control) { // this is the debug panel which uses tabs, so the top section should be smaller
 			bottom_panel->add_theme_style_override("panel", gui_base->get_theme_stylebox("BottomPanelDebuggerOverride", "EditorStyles"));
 		} else {
diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp
index f53173e1d..fa1154ea7 100644
--- a/editor/editor_plugin.cpp
+++ b/editor/editor_plugin.cpp
@@ -76,8 +76,8 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 class ConfigFile;
@@ -211,7 +211,7 @@ void EditorInterface::edit_node(Node *p_node) {
 }
 
 void EditorInterface::edit_script(const Ref<Script> &p_script, int p_line, int p_col, bool p_grab_focus) {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	ScriptEditor::get_singleton()->edit(p_script, p_line, p_col, p_grab_focus);
 #endif
 }
@@ -274,7 +274,7 @@ Array EditorInterface::get_open_scenes() const {
 	return ret;
 }
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 ScriptEditor *EditorInterface::get_script_editor() {
 	return ScriptEditor::get_singleton();
 }
@@ -366,7 +366,7 @@ void EditorInterface::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("inspect_object", "object", "for_property", "inspector_only"), &EditorInterface::inspect_object, DEFVAL(String()), DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("get_selection"), &EditorInterface::get_selection);
 	ClassDB::bind_method(D_METHOD("get_editor_settings"), &EditorInterface::get_editor_settings);
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	ClassDB::bind_method(D_METHOD("get_script_editor"), &EditorInterface::get_script_editor);
 #endif
 	ClassDB::bind_method(D_METHOD("get_base_control"), &EditorInterface::get_base_control);
diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h
index 13d2dde4c..3b121ac33 100644
--- a/editor/editor_plugin.h
+++ b/editor/editor_plugin.h
@@ -110,7 +110,7 @@ public:
 
 	Node *get_edited_scene_root();
 	Array get_open_scenes() const;
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	ScriptEditor *get_script_editor();
 #endif
 
diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp
index f94e12529..95288d589 100644
--- a/editor/editor_resource_picker.cpp
+++ b/editor/editor_resource_picker.cpp
@@ -71,9 +71,9 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
-#include "modules/code_editor/script_editor_base.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
+#include "modules/editor_code_editor/script_editor_base.h"
 #endif
 
 HashMap<StringName, List<StringName>> EditorResourcePicker::allowed_types_cache;
@@ -584,7 +584,7 @@ bool EditorResourcePicker::_is_drop_valid(const Dictionary &p_drag_data) const {
 
 	Ref<Resource> res;
 	if (drag_data.has("type") && String(drag_data["type"]) == "script_list_element") {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]);
 		if (se) {
 			res = se->get_edited_resource();
@@ -655,7 +655,7 @@ void EditorResourcePicker::drop_data_fw(const Point2 &p_point, const Variant &p_
 
 	Ref<Resource> dropped_resource;
 	if (drag_data.has("type") && String(drag_data["type"]) == "script_list_element") {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]);
 		if (se) {
 			dropped_resource = se->get_edited_resource();
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp
index 121a17e11..ca38b1fa8 100644
--- a/editor/editor_run.cpp
+++ b/editor/editor_run.cpp
@@ -44,8 +44,8 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 EditorRun::Status EditorRun::get_status() const {
@@ -68,7 +68,7 @@ Error EditorRun::run(const String &p_scene, const String &p_custom_args, const L
 
 	args.push_back("--remote-debug");
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	const String conn_string = ScriptEditor::get_singleton()->get_debugger()->get_connection_string();
 	if (!conn_string.empty()) {
 		args.push_back(ScriptEditor::get_singleton()->get_debugger()->get_connection_string());
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index 37899961b..f621eb676 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -102,8 +102,8 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 // Min and Max are power of two in order to play nicely with successive increment.
@@ -3909,7 +3909,7 @@ void CanvasItemEditor::_notification(int p_what) {
 
 	if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {
 		if (!is_visible() && override_camera_button->is_pressed()) {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 			ScriptEditorDebugger *debugger = ScriptEditor::get_singleton()->get_debugger();
 
 			debugger->set_camera_override(ScriptEditorDebugger::OVERRIDE_NONE);
@@ -4326,7 +4326,7 @@ void CanvasItemEditor::_button_toggle_grid_snap(bool p_status) {
 	viewport->update();
 }
 void CanvasItemEditor::_button_override_camera(bool p_pressed) {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	ScriptEditorDebugger *debugger = ScriptEditor::get_singleton()->get_debugger();
 
 	if (p_pressed) {
@@ -5969,7 +5969,7 @@ void CanvasItemEditorViewport::_create_nodes(Node *parent, Node *child, String &
 	}
 
 	if (parent) {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 		String new_name = parent->validate_child_name(child);
 		ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
 		editor_data->get_undo_redo().add_do_method(sed, "live_debug_create_node", editor->get_edited_scene()->get_path_to(parent), child->get_class(), new_name);
@@ -6041,7 +6041,7 @@ bool CanvasItemEditorViewport::_create_instance(Node *parent, String &path, cons
 	editor_data->get_undo_redo().add_do_reference(instanced_scene);
 	editor_data->get_undo_redo().add_undo_method(parent, "remove_child", instanced_scene);
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	String new_name = parent->validate_child_name(instanced_scene);
 	ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
 	editor_data->get_undo_redo().add_do_method(sed, "live_debug_instance_node", editor->get_edited_scene()->get_path_to(parent), path, new_name);
diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
index 3b03e4e6c..ce7d9bb8e 100644
--- a/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -101,8 +101,8 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 #define DISTANCE_DEFAULT 4
@@ -4238,7 +4238,7 @@ bool SpatialEditorViewport::_create_instance(Node *parent, String &path, const P
 	editor_data->get_undo_redo().add_do_reference(instanced_scene);
 	editor_data->get_undo_redo().add_undo_method(parent, "remove_child", instanced_scene);
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	String new_name = parent->validate_child_name(instanced_scene);
 	ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
 	editor_data->get_undo_redo().add_do_method(sed, "live_debug_instance_node", editor->get_edited_scene()->get_path_to(parent), path, new_name);
@@ -5479,7 +5479,7 @@ void SpatialEditor::_menu_item_toggled(bool pressed, int p_option) {
 		} break;
 
 		case MENU_TOOL_OVERRIDE_CAMERA: {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 			ScriptEditorDebugger *const debugger = ScriptEditor::get_singleton()->get_debugger();
 
 			if (pressed) {
@@ -5537,7 +5537,7 @@ void SpatialEditor::_update_camera_override_viewport(Object *p_viewport) {
 		return;
 	}
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 	ScriptEditorDebugger *const debugger = ScriptEditor::get_singleton()->get_debugger();
 
 	camera_override_viewport_id = current_viewport->index;
@@ -6791,7 +6791,7 @@ void SpatialEditor::_notification(int p_what) {
 		_init_grid();
 	} else if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {
 		if (!is_visible() && tool_option_button[TOOL_OPT_OVERRIDE_CAMERA]->is_pressed()) {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 			ScriptEditorDebugger *debugger = ScriptEditor::get_singleton()->get_debugger();
 
 			debugger->set_camera_override(ScriptEditorDebugger::OVERRIDE_NONE);
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index 5f88af47c..dd02e3d96 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -98,8 +98,8 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 void SceneTreeDock::_nodes_drag_begin() {
@@ -281,7 +281,7 @@ void SceneTreeDock::_perform_instance_scenes(const Vector<String> &p_files, Node
 		editor_data->get_undo_redo().add_do_reference(instanced_scene);
 		editor_data->get_undo_redo().add_undo_method(parent, "remove_child", instanced_scene);
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 		String new_name = parent->validate_child_name(instanced_scene);
 		ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
 		editor_data->get_undo_redo().add_do_method(sed, "live_debug_instance_node", edited_scene->get_path_to(parent), p_files[i], new_name);
@@ -770,7 +770,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				editor_data->get_undo_redo().add_undo_method(parent, "remove_child", dup);
 				editor_data->get_undo_redo().add_do_reference(dup);
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 				ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
 				editor_data->get_undo_redo().add_do_method(sed, "live_debug_duplicate_node", edited_scene->get_path_to(node), dup->get_name());
 				editor_data->get_undo_redo().add_undo_method(sed, "live_debug_remove_node", NodePath(String(edited_scene->get_path_to(parent)).plus_file(dup->get_name())));
@@ -1004,7 +1004,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 		} break;
 		case TOOL_OPEN_DOCUMENTATION: {
 			List<Node *> selection = editor_selection->get_selected_node_list();
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 			for (int i = 0; i < selection.size(); i++) {
 				ScriptEditor::get_singleton()->goto_help("class_name:" + selection[i]->get_class());
 			}
@@ -1898,7 +1898,7 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V
 			editor_data->get_undo_redo().add_do_method(new_parent, "move_child", node, p_position_in_parent + inc);
 		}
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 		ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
 #endif
 		String old_name = former_names[ni];
@@ -1927,7 +1927,7 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V
 			}
 		}
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 		editor_data->get_undo_redo().add_do_method(sed, "live_debug_reparent_node", edited_scene->get_path_to(node), edited_scene->get_path_to(new_parent), new_name, p_position_in_parent + inc);
 		editor_data->get_undo_redo().add_undo_method(sed, "live_debug_reparent_node", NodePath(String(edited_scene->get_path_to(new_parent)).plus_file(new_name)), edited_scene->get_path_to(node->get_parent()), node->get_name(), node->get_index());
 #endif
@@ -2179,7 +2179,7 @@ void SceneTreeDock::_delete_confirm(bool p_cut) {
 			editor_data->get_undo_redo().add_undo_method(this, "_set_owners", edited_scene, owners);
 			editor_data->get_undo_redo().add_undo_reference(n);
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 			ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
 			editor_data->get_undo_redo().add_do_method(sed, "live_debug_remove_and_keep_node", edited_scene->get_path_to(n), n->get_instance_id());
 			editor_data->get_undo_redo().add_undo_method(sed, "live_debug_restore_node", n->get_instance_id(), edited_scene->get_path_to(n->get_parent()), n->get_index());
@@ -2276,7 +2276,7 @@ void SceneTreeDock::_do_create(Node *p_parent) {
 		editor_data->get_undo_redo().add_do_reference(child);
 		editor_data->get_undo_redo().add_undo_method(p_parent, "remove_child", child);
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 		String new_name = p_parent->validate_child_name(child);
 		ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
 		editor_data->get_undo_redo().add_do_method(sed, "live_debug_create_node", edited_scene->get_path_to(p_parent), child->get_class(), new_name);
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp
index 6591520f2..f49faaf7f 100644
--- a/editor/scene_tree_editor.cpp
+++ b/editor/scene_tree_editor.cpp
@@ -66,9 +66,9 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
-#include "modules/code_editor/script_editor_base.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
+#include "modules/editor_code_editor/script_editor_base.h"
 #endif
 
 Node *SceneTreeEditor::get_scene_node() {
@@ -1131,7 +1131,7 @@ bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_d
 	}
 
 	if (String(d["type"]) == "script_list_element") {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(d["script_list_element"]);
 		if (se) {
 			String sp = se->get_edited_resource()->get_path();
@@ -1184,7 +1184,7 @@ void SceneTreeEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data,
 	}
 
 	if (String(d["type"]) == "script_list_element") {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(d["script_list_element"]);
 		if (se) {
 			String sp = se->get_edited_resource()->get_path();
diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp
index 007694e92..152b9c629 100644
--- a/editor/settings_config_dialog.cpp
+++ b/editor/settings_config_dialog.cpp
@@ -69,8 +69,8 @@
 
 #include "modules/modules_enabled.gen.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 void EditorSettingsDialog::ok_pressed() {
@@ -148,7 +148,7 @@ void EditorSettingsDialog::_undo_redo_callback(void *p_self, const String &p_nam
 void EditorSettingsDialog::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_READY: {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 			ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
 			undo_redo->set_method_notify_callback(sed->_method_changeds, sed);
 			undo_redo->set_property_notify_callback(sed->_property_changeds, sed);
diff --git a/editor_modules/shader_editor/config.py b/editor_modules/shader_editor/config.py
index 7df830233..f6869b8f2 100644
--- a/editor_modules/shader_editor/config.py
+++ b/editor_modules/shader_editor/config.py
@@ -4,7 +4,7 @@ def can_build(env, platform):
   if not env["tools"]:
     return False
 
-  env.module_add_dependencies("shader_editor", ["code_editor"], False)
+  env.module_add_dependencies("shader_editor", ["editor_code_editor"], False)
 
   return True
 
diff --git a/editor_modules/shader_editor/shader_editor_plugin.cpp b/editor_modules/shader_editor/shader_editor_plugin.cpp
index 70cfc3df0..9c178237e 100644
--- a/editor_modules/shader_editor/shader_editor_plugin.cpp
+++ b/editor_modules/shader_editor/shader_editor_plugin.cpp
@@ -65,8 +65,8 @@
 #include "servers/rendering/shader_types.h"
 #include "servers/rendering_server.h"
 
-#include "modules/code_editor/goto_line_dialog.h"
-#include "modules/code_editor/find_replace_bar.h"
+#include "modules/editor_code_editor/goto_line_dialog.h"
+#include "modules/editor_code_editor/find_replace_bar.h"
 
 struct ScriptCodeCompletionOption;
 
diff --git a/editor_modules/shader_editor/shader_editor_plugin.h b/editor_modules/shader_editor/shader_editor_plugin.h
index 02c373077..b878d941c 100644
--- a/editor_modules/shader_editor/shader_editor_plugin.h
+++ b/editor_modules/shader_editor/shader_editor_plugin.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "modules/code_editor/code_text_editor.h"
+#include "modules/editor_code_editor/code_text_editor.h"
 #include "editor/editor_plugin.h"
 #include "scene/gui/margin_container.h"
 
diff --git a/editor_modules/text_editor/config.py b/editor_modules/text_editor/config.py
index 24b0d6483..a9d4ae744 100644
--- a/editor_modules/text_editor/config.py
+++ b/editor_modules/text_editor/config.py
@@ -5,7 +5,7 @@ def can_build(env, platform):
     return False
 
   env.module_add_dependencies("text_editor", ["freetype"], True)
-  env.module_add_dependencies("text_editor", ["code_editor"], False)
+  env.module_add_dependencies("text_editor", ["editor_code_editor"], False)
 
   return True
 
diff --git a/editor_modules/text_editor/text_editor_vanilla_editor.cpp b/editor_modules/text_editor/text_editor_vanilla_editor.cpp
index 4e62e5b7d..df7262402 100644
--- a/editor_modules/text_editor/text_editor_vanilla_editor.cpp
+++ b/editor_modules/text_editor/text_editor_vanilla_editor.cpp
@@ -14,8 +14,8 @@
 #include "scene/gui/text_edit.h"
 #include "scene/gui/texture_rect.h"
 
-#include "modules/code_editor/code_text_editor.h"
-#include "modules/code_editor/find_replace_bar.h"
+#include "modules/editor_code_editor/code_text_editor.h"
+#include "modules/editor_code_editor/find_replace_bar.h"
 
 #include "scene/resources/dynamic_font.h"
 
diff --git a/main/main.cpp b/main/main.cpp
index 962765fae..6caf0c8bf 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -85,8 +85,8 @@
 #endif
 
 #include "modules/modules_enabled.gen.h"
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 /* Static members */
@@ -2074,7 +2074,7 @@ bool Main::start() {
 
 				OS::get_singleton()->set_context(OS::CONTEXT_EDITOR);
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 				// Start debug server.
 				if (!debug_server_uri.empty()) {
 					int idx = debug_server_uri.rfind(":");
diff --git a/modules/code_editor/register_types.h b/modules/code_editor/register_types.h
deleted file mode 100644
index 69abe4bdc..000000000
--- a/modules/code_editor/register_types.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CODE_EDITOR_REGISTER_TYPES_H
-#define CODE_EDITOR_REGISTER_TYPES_H
-
-#include "modules/register_module_types.h"
-
-void register_code_editor_types(ModuleRegistrationLevel p_level);
-void unregister_code_editor_types(ModuleRegistrationLevel p_level);
-
-#endif
diff --git a/modules/cscript/register_types.cpp b/modules/cscript/register_types.cpp
index bf11f313f..44a35b77a 100644
--- a/modules/cscript/register_types.cpp
+++ b/modules/cscript/register_types.cpp
@@ -50,8 +50,8 @@ Ref<ResourceFormatSaverCScript> resource_saver_cscript;
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 class EditorExportCScript : public EditorExportPlugin {
@@ -160,7 +160,7 @@ void register_cscript_types(ModuleRegistrationLevel p_level) {
 
 #ifdef TOOLS_ENABLED
 	if (p_level == MODULE_REGISTRATION_LEVEL_EDITOR) {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 		ScriptEditor::register_create_syntax_highlighter_function(CScriptSyntaxHighlighter::create);
 #endif
 		EditorNode::add_init_callback(_editor_init);
diff --git a/modules/code_editor/SCsub b/modules/editor_code_editor/SCsub
similarity index 100%
rename from modules/code_editor/SCsub
rename to modules/editor_code_editor/SCsub
diff --git a/modules/code_editor/code_text_editor.cpp b/modules/editor_code_editor/code_text_editor.cpp
similarity index 100%
rename from modules/code_editor/code_text_editor.cpp
rename to modules/editor_code_editor/code_text_editor.cpp
diff --git a/modules/code_editor/code_text_editor.h b/modules/editor_code_editor/code_text_editor.h
similarity index 100%
rename from modules/code_editor/code_text_editor.h
rename to modules/editor_code_editor/code_text_editor.h
diff --git a/modules/code_editor/config.py b/modules/editor_code_editor/config.py
similarity index 100%
rename from modules/code_editor/config.py
rename to modules/editor_code_editor/config.py
diff --git a/modules/code_editor/connection_info_dialog.cpp b/modules/editor_code_editor/connection_info_dialog.cpp
similarity index 100%
rename from modules/code_editor/connection_info_dialog.cpp
rename to modules/editor_code_editor/connection_info_dialog.cpp
diff --git a/modules/code_editor/connection_info_dialog.h b/modules/editor_code_editor/connection_info_dialog.h
similarity index 100%
rename from modules/code_editor/connection_info_dialog.h
rename to modules/editor_code_editor/connection_info_dialog.h
diff --git a/modules/code_editor/find_replace_bar.cpp b/modules/editor_code_editor/find_replace_bar.cpp
similarity index 100%
rename from modules/code_editor/find_replace_bar.cpp
rename to modules/editor_code_editor/find_replace_bar.cpp
diff --git a/modules/code_editor/find_replace_bar.h b/modules/editor_code_editor/find_replace_bar.h
similarity index 100%
rename from modules/code_editor/find_replace_bar.h
rename to modules/editor_code_editor/find_replace_bar.h
diff --git a/modules/code_editor/goto_line_dialog.cpp b/modules/editor_code_editor/goto_line_dialog.cpp
similarity index 100%
rename from modules/code_editor/goto_line_dialog.cpp
rename to modules/editor_code_editor/goto_line_dialog.cpp
diff --git a/modules/code_editor/goto_line_dialog.h b/modules/editor_code_editor/goto_line_dialog.h
similarity index 100%
rename from modules/code_editor/goto_line_dialog.h
rename to modules/editor_code_editor/goto_line_dialog.h
diff --git a/modules/code_editor/register_types.cpp b/modules/editor_code_editor/register_types.cpp
similarity index 82%
rename from modules/code_editor/register_types.cpp
rename to modules/editor_code_editor/register_types.cpp
index 2b62b7a94..11c91c67f 100644
--- a/modules/code_editor/register_types.cpp
+++ b/modules/editor_code_editor/register_types.cpp
@@ -9,7 +9,7 @@
 //#include "text_editor.h"
 //#include "code_text_editor.h"
 
-void register_code_editor_types(ModuleRegistrationLevel p_level) {
+void register_editor_code_editor_types(ModuleRegistrationLevel p_level) {
 	if (p_level == MODULE_REGISTRATION_LEVEL_SCENE) {
 		//ClassDB::register_class<>();
 		ClassDB::register_virtual_class<ScriptEditor>();
@@ -28,5 +28,5 @@ void register_code_editor_types(ModuleRegistrationLevel p_level) {
 #endif
 }
 
-void unregister_code_editor_types(ModuleRegistrationLevel p_level) {
+void unregister_editor_code_editor_types(ModuleRegistrationLevel p_level) {
 }
diff --git a/modules/editor_code_editor/register_types.h b/modules/editor_code_editor/register_types.h
new file mode 100644
index 000000000..84cca0387
--- /dev/null
+++ b/modules/editor_code_editor/register_types.h
@@ -0,0 +1,9 @@
+#ifndef EDITOR_CODE_EDITOR_REGISTER_TYPES_H
+#define EDITOR_CODE_EDITOR_REGISTER_TYPES_H
+
+#include "modules/register_module_types.h"
+
+void register_editor_code_editor_types(ModuleRegistrationLevel p_level);
+void unregister_editor_code_editor_types(ModuleRegistrationLevel p_level);
+
+#endif
diff --git a/modules/code_editor/script_editor.cpp b/modules/editor_code_editor/script_editor.cpp
similarity index 100%
rename from modules/code_editor/script_editor.cpp
rename to modules/editor_code_editor/script_editor.cpp
diff --git a/modules/code_editor/script_editor.h b/modules/editor_code_editor/script_editor.h
similarity index 100%
rename from modules/code_editor/script_editor.h
rename to modules/editor_code_editor/script_editor.h
diff --git a/modules/code_editor/script_editor_base.cpp b/modules/editor_code_editor/script_editor_base.cpp
similarity index 100%
rename from modules/code_editor/script_editor_base.cpp
rename to modules/editor_code_editor/script_editor_base.cpp
diff --git a/modules/code_editor/script_editor_base.h b/modules/editor_code_editor/script_editor_base.h
similarity index 100%
rename from modules/code_editor/script_editor_base.h
rename to modules/editor_code_editor/script_editor_base.h
diff --git a/modules/code_editor/script_editor_plugin.cpp b/modules/editor_code_editor/script_editor_plugin.cpp
similarity index 100%
rename from modules/code_editor/script_editor_plugin.cpp
rename to modules/editor_code_editor/script_editor_plugin.cpp
diff --git a/modules/code_editor/script_editor_plugin.h b/modules/editor_code_editor/script_editor_plugin.h
similarity index 100%
rename from modules/code_editor/script_editor_plugin.h
rename to modules/editor_code_editor/script_editor_plugin.h
diff --git a/modules/code_editor/script_editor_quick_open.cpp b/modules/editor_code_editor/script_editor_quick_open.cpp
similarity index 100%
rename from modules/code_editor/script_editor_quick_open.cpp
rename to modules/editor_code_editor/script_editor_quick_open.cpp
diff --git a/modules/code_editor/script_editor_quick_open.h b/modules/editor_code_editor/script_editor_quick_open.h
similarity index 100%
rename from modules/code_editor/script_editor_quick_open.h
rename to modules/editor_code_editor/script_editor_quick_open.h
diff --git a/modules/code_editor/script_text_editor.cpp b/modules/editor_code_editor/script_text_editor.cpp
similarity index 100%
rename from modules/code_editor/script_text_editor.cpp
rename to modules/editor_code_editor/script_text_editor.cpp
diff --git a/modules/code_editor/script_text_editor.h b/modules/editor_code_editor/script_text_editor.h
similarity index 100%
rename from modules/code_editor/script_text_editor.h
rename to modules/editor_code_editor/script_text_editor.h
diff --git a/modules/code_editor/text_editor.cpp b/modules/editor_code_editor/text_editor.cpp
similarity index 100%
rename from modules/code_editor/text_editor.cpp
rename to modules/editor_code_editor/text_editor.cpp
diff --git a/modules/code_editor/text_editor.h b/modules/editor_code_editor/text_editor.h
similarity index 100%
rename from modules/code_editor/text_editor.h
rename to modules/editor_code_editor/text_editor.h
diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp
index c913f3149..d5644f631 100644
--- a/modules/gdscript/register_types.cpp
+++ b/modules/gdscript/register_types.cpp
@@ -50,8 +50,8 @@ Ref<ResourceFormatSaverGDScript> resource_saver_gd;
 #include "editor/editor_settings.h"
 #include "editor/gdscript_highlighter.h"
 
-#ifdef MODULE_CODE_EDITOR_ENABLED
-#include "modules/code_editor/script_editor.h"
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
+#include "modules/editor_code_editor/script_editor.h"
 #endif
 
 class EditorExportGDScript : public EditorExportPlugin {
@@ -161,7 +161,7 @@ void register_gdscript_types(ModuleRegistrationLevel p_level) {
 
 #ifdef TOOLS_ENABLED
 	if (p_level == MODULE_REGISTRATION_LEVEL_EDITOR) {
-#ifdef MODULE_CODE_EDITOR_ENABLED
+#ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED
 		ScriptEditor::register_create_syntax_highlighter_function(GDScriptSyntaxHighlighter::create);
 #endif
 		EditorNode::add_init_callback(_editor_init);