diff --git a/modules/gdscript/gdscript_highlighter.cpp b/modules/gdscript/gdscript_highlighter.cpp
index 1e9f602d86..5b8b652c29 100644
--- a/modules/gdscript/gdscript_highlighter.cpp
+++ b/modules/gdscript/gdscript_highlighter.cpp
@@ -58,7 +58,7 @@ static bool _is_hex_symbol(CharType c) {
 	return ((c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'));
 }
 
-Map<int, TextEdit::HighlighterInfo> GDSyntaxHighlighter::_get_line_syntax_highlighting(int p_line) {
+Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_highlighting(int p_line) {
 	Map<int, TextEdit::HighlighterInfo> color_map;
 
 	bool prev_is_char = false;
@@ -255,17 +255,17 @@ Map<int, TextEdit::HighlighterInfo> GDSyntaxHighlighter::_get_line_syntax_highli
 	return color_map;
 }
 
-String GDSyntaxHighlighter::get_name() {
+String GDScriptSyntaxHighlighter::get_name() {
 	return "GDScript";
 }
 
-List<String> GDSyntaxHighlighter::get_supported_languages() {
+List<String> GDScriptSyntaxHighlighter::get_supported_languages() {
 	List<String> languages;
 	languages.push_back("GDScript");
 	return languages;
 }
 
-void GDSyntaxHighlighter::_update_cache() {
+void GDScriptSyntaxHighlighter::_update_cache() {
 	font_color = text_editor->get_color("font_color");
 	symbol_color = text_editor->get_color("symbol_color");
 	function_color = text_editor->get_color("function_color");
@@ -273,6 +273,6 @@ void GDSyntaxHighlighter::_update_cache() {
 	member_color = text_editor->get_color("member_variable_color");
 }
 
-SyntaxHighlighter *GDSyntaxHighlighter::create() {
-	return memnew(GDSyntaxHighlighter);
+SyntaxHighlighter *GDScriptSyntaxHighlighter::create() {
+	return memnew(GDScriptSyntaxHighlighter);
 }
diff --git a/modules/gdscript/gdscript_highlighter.h b/modules/gdscript/gdscript_highlighter.h
index 0148e6ac1b..ef1bdd4103 100644
--- a/modules/gdscript/gdscript_highlighter.h
+++ b/modules/gdscript/gdscript_highlighter.h
@@ -33,7 +33,7 @@
 
 #include "scene/gui/text_edit.h"
 
-class GDSyntaxHighlighter : public SyntaxHighlighter {
+class GDScriptSyntaxHighlighter : public SyntaxHighlighter {
 private:
 	// colours
 	Color font_color;
diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp
index 4cf13e3b71..85c94c3596 100644
--- a/modules/gdscript/register_types.cpp
+++ b/modules/gdscript/register_types.cpp
@@ -93,7 +93,7 @@ void register_gdscript_types() {
 	ResourceSaver::add_resource_format_saver(resource_saver_gd);
 
 #ifdef TOOLS_ENABLED
-	ScriptEditor::register_create_syntax_highlighter_function(GDSyntaxHighlighter::create);
+	ScriptEditor::register_create_syntax_highlighter_function(GDScriptSyntaxHighlighter::create);
 	EditorNode::add_init_callback(_editor_init);
 #endif
 }