diff --git a/src/libs/utils/mimeconstants.h b/src/libs/utils/mimeconstants.h
index 949c76938d7..a6c0b0cc6fa 100644
--- a/src/libs/utils/mimeconstants.h
+++ b/src/libs/utils/mimeconstants.h
@@ -32,10 +32,10 @@ const char CPP_SOURCE_MIMETYPE[] = "text/x-c++src";
 const char CUDA_SOURCE_MIMETYPE[] = "text/vnd.nvidia.cuda.csrc";
 const char C_HEADER_MIMETYPE[] = "text/x-chdr";
 const char C_SOURCE_MIMETYPE[] = "text/x-csrc";
-const char GLSL_MIMETYPE_FRAG[] = "text/x-glsl-frag";
-const char GLSL_MIMETYPE_FRAG_ES[] = "text/x-glsl-es-frag";
-const char GLSL_MIMETYPE_VERT[] = "text/x-glsl-vert";
-const char GLSL_MIMETYPE_VERT_ES[] = "text/x-glsl-es-vert";
+const char GLSL_FRAG_MIMETYPE[] = "text/x-glsl-frag";
+const char GLSL_ES_FRAG_MIMETYPE[] = "text/x-glsl-es-frag";
+const char GLSL_VERT_MIMETYPE[] = "text/x-glsl-vert";
+const char GLSL_ES_VERT_MIMETYPE[] = "text/x-glsl-es-vert";
 const char JAVA_MIMETYPE[] = "text/x-java";
 const char LINGUIST_MIMETYPE[] = "text/vnd.qt.linguist";
 const char MAKEFILE_MIMETYPE[] = "text/x-makefile";
diff --git a/src/plugins/cpaster/protocol.cpp b/src/plugins/cpaster/protocol.cpp
index dcc3af47c18..01a9c5b621d 100644
--- a/src/plugins/cpaster/protocol.cpp
+++ b/src/plugins/cpaster/protocol.cpp
@@ -59,10 +59,10 @@ Protocol::ContentType Protocol::contentType(const QString &mt)
     if (mt == QLatin1String(C_SOURCE_MIMETYPE)
         || mt == QLatin1String(C_HEADER_MIMETYPE)
         || mt == QLatin1String(GLSL_MIMETYPE)
-        || mt == QLatin1String(GLSL_MIMETYPE_VERT)
-        || mt == QLatin1String(GLSL_MIMETYPE_FRAG)
-        || mt == QLatin1String(GLSL_MIMETYPE_VERT_ES)
-        || mt == QLatin1String(GLSL_MIMETYPE_FRAG_ES))
+        || mt == QLatin1String(GLSL_VERT_MIMETYPE)
+        || mt == QLatin1String(GLSL_FRAG_MIMETYPE)
+        || mt == QLatin1String(GLSL_ES_VERT_MIMETYPE)
+        || mt == QLatin1String(GLSL_ES_FRAG_MIMETYPE))
         return C;
     if (mt == QLatin1String(CPP_SOURCE_MIMETYPE)
         || mt == QLatin1String(CPP_HEADER_MIMETYPE)
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index 60420839f26..46c83bb196e 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -366,10 +366,10 @@ GlslEditorFactory::GlslEditorFactory()
     setId(Constants::C_GLSLEDITOR_ID);
     setDisplayName(::Core::Tr::tr(Constants::C_GLSLEDITOR_DISPLAY_NAME));
     addMimeType(Utils::Constants::GLSL_MIMETYPE);
-    addMimeType(Utils::Constants::GLSL_MIMETYPE_VERT);
-    addMimeType(Utils::Constants::GLSL_MIMETYPE_FRAG);
-    addMimeType(Utils::Constants::GLSL_MIMETYPE_VERT_ES);
-    addMimeType(Utils::Constants::GLSL_MIMETYPE_FRAG_ES);
+    addMimeType(Utils::Constants::GLSL_VERT_MIMETYPE);
+    addMimeType(Utils::Constants::GLSL_FRAG_MIMETYPE);
+    addMimeType(Utils::Constants::GLSL_ES_VERT_MIMETYPE);
+    addMimeType(Utils::Constants::GLSL_ES_FRAG_MIMETYPE);
 
     setDocumentCreator([]() { return new TextDocument(Constants::C_GLSLEDITOR_ID); });
     setEditorWidgetCreator([]() { return new GlslEditorWidget; });
diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp
index 537ec7a30a0..e84605f19cf 100644
--- a/src/plugins/glsleditor/glsleditorplugin.cpp
+++ b/src/plugins/glsleditor/glsleditorplugin.cpp
@@ -119,11 +119,16 @@ void GlslEditorPlugin::initialize()
 void GlslEditorPlugin::extensionsInitialized()
 {
     using namespace Utils::Constants;
-    FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", GLSL_MIMETYPE);
-    FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", GLSL_MIMETYPE_VERT);
-    FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", GLSL_MIMETYPE_FRAG);
-    FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", GLSL_MIMETYPE_VERT_ES);
-    FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", GLSL_MIMETYPE_FRAG_ES);
+    FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png",
+                                                     GLSL_MIMETYPE);
+    FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png",
+                                                     GLSL_VERT_MIMETYPE);
+    FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png",
+                                                     GLSL_FRAG_MIMETYPE);
+    FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png",
+                                                     GLSL_ES_VERT_MIMETYPE);
+    FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png",
+                                                     GLSL_ES_FRAG_MIMETYPE);
 }
 
 const GlslEditorPlugin::InitFile *GlslEditorPlugin::fragmentShaderInit(int variant)