diff --git a/src/plugins/cpaster/protocol.cpp b/src/plugins/cpaster/protocol.cpp
index abaaba8a01de30267ccfd66f6b7f7714d575dd15..deb09e3c8605f44177138211f5f5ca968c008e43 100644
--- a/src/plugins/cpaster/protocol.cpp
+++ b/src/plugins/cpaster/protocol.cpp
@@ -84,11 +84,11 @@ Protocol::ContentType Protocol::contentType(const QString &mt)
 {
     if (mt == QLatin1String(CppTools::Constants::C_SOURCE_MIMETYPE)
         || mt == QLatin1String(CppTools::Constants::C_HEADER_MIMETYPE)
-        || mt == QLatin1String(GLSLEditor::Constants::GLSL_MIMETYPE)
-        || mt == QLatin1String(GLSLEditor::Constants::GLSL_MIMETYPE_VERT)
-        || mt == QLatin1String(GLSLEditor::Constants::GLSL_MIMETYPE_FRAG)
-        || mt == QLatin1String(GLSLEditor::Constants::GLSL_MIMETYPE_VERT_ES)
-        || mt == QLatin1String(GLSLEditor::Constants::GLSL_MIMETYPE_FRAG_ES))
+        || mt == QLatin1String(GlslEditor::Constants::GLSL_MIMETYPE)
+        || mt == QLatin1String(GlslEditor::Constants::GLSL_MIMETYPE_VERT)
+        || mt == QLatin1String(GlslEditor::Constants::GLSL_MIMETYPE_FRAG)
+        || mt == QLatin1String(GlslEditor::Constants::GLSL_MIMETYPE_VERT_ES)
+        || mt == QLatin1String(GlslEditor::Constants::GLSL_MIMETYPE_FRAG_ES))
         return C;
     if (mt == QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE)
         || mt == QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE)
diff --git a/src/plugins/glsleditor/glslautocompleter.cpp b/src/plugins/glsleditor/glslautocompleter.cpp
index 5d5fb11dd0431d288b73b641b8655699595f1e30..9c7cf99f5454d9fc3caa836fd7a523368362fcdb 100644
--- a/src/plugins/glsleditor/glslautocompleter.cpp
+++ b/src/plugins/glsleditor/glslautocompleter.cpp
@@ -39,7 +39,7 @@
 
 using namespace CPlusPlus;
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 GlslCompleter::GlslCompleter()
@@ -135,4 +135,4 @@ QString GlslCompleter::insertParagraphSeparator(const QTextCursor &cursor) const
 }
 
 } // namespace Internal
-} // namespace GLSLEditor
+} // namespace GlslEditor
diff --git a/src/plugins/glsleditor/glslautocompleter.h b/src/plugins/glsleditor/glslautocompleter.h
index 8e33095f100891703c43392861feea1f7f5196db..a4cc7536178bc206f17e79ba2057c9fc1c1ee8c3 100644
--- a/src/plugins/glsleditor/glslautocompleter.h
+++ b/src/plugins/glsleditor/glslautocompleter.h
@@ -32,7 +32,7 @@
 
 #include <texteditor/autocompleter.h>
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 class GlslCompleter : public TextEditor::AutoCompleter
@@ -53,6 +53,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace GLSLEditor
+} // namespace GlslEditor
 
 #endif // GLSLAUTOCOMPLETER_H
diff --git a/src/plugins/glsleditor/glslcompletionassist.cpp b/src/plugins/glsleditor/glslcompletionassist.cpp
index 621005dea2dafed955272620dec31560af2db7ca..28a79349627243f9f825dd761b2ffaba3d93387c 100644
--- a/src/plugins/glsleditor/glslcompletionassist.cpp
+++ b/src/plugins/glsleditor/glslcompletionassist.cpp
@@ -61,7 +61,7 @@
 
 using namespace TextEditor;
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 enum CompletionOrder {
@@ -472,4 +472,4 @@ GlslCompletionAssistInterface::GlslCompletionAssistInterface(QTextDocument *text
 }
 
 } // namespace Internal
-} // namespace GLSLEditor
+} // namespace GlslEditor
diff --git a/src/plugins/glsleditor/glslcompletionassist.h b/src/plugins/glsleditor/glslcompletionassist.h
index 4e80f676c4533127284b0760beac71ddaa860c59..4ab56aa9463473e4073c5a50c7217238b34ade3d 100644
--- a/src/plugins/glsleditor/glslcompletionassist.h
+++ b/src/plugins/glsleditor/glslcompletionassist.h
@@ -46,7 +46,7 @@ namespace GLSL { class Function; }
 
 namespace TextEditor { class BasicProposalItem; }
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 class GlslCompletionAssistInterface;
@@ -110,6 +110,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace GLSLEditor
+} // namespace GlslEditor
 
 #endif // GLSLCOMPLETIONASSIST_H
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index aef9b5a94f263afd8159485d8617c8ea6a6c3221..67dbbb0b0c2b8ac2e283c98b1e2e177f2fb0e2dd 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -75,9 +75,9 @@
 
 using namespace TextEditor;
 using namespace GLSL;
-using namespace GLSLEditor::Constants;
+using namespace GlslEditor::Constants;
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 enum {
@@ -395,4 +395,4 @@ Core::IEditor *GlslEditorFactory::createEditor()
 }
 
 } // namespace Internal
-} // namespace GLSLEditor
+} // namespace GlslEditor
diff --git a/src/plugins/glsleditor/glsleditor.h b/src/plugins/glsleditor/glsleditor.h
index 35140e5bd64b990b49b4177543d679c50b02613d..59605bd430863e39803577b1b0530d5c65e64816 100644
--- a/src/plugins/glsleditor/glsleditor.h
+++ b/src/plugins/glsleditor/glsleditor.h
@@ -47,7 +47,7 @@ class TranslationUnitAST;
 class Scope;
 } // namespace GLSL
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 class GlslEditor;
@@ -132,6 +132,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace GLSLEditor
+} // namespace GlslEditor
 
 #endif // GLSLEDITOR_H
diff --git a/src/plugins/glsleditor/glsleditorconstants.h b/src/plugins/glsleditor/glsleditorconstants.h
index cd7a94ea4c59336c99e710dcee2014b64bb2431f..b59086d561afa9ecf3407f5cbae30b494d6ce0de 100644
--- a/src/plugins/glsleditor/glsleditorconstants.h
+++ b/src/plugins/glsleditor/glsleditorconstants.h
@@ -32,7 +32,7 @@
 
 #include <QtGlobal>
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Constants {
 
 const char M_CONTEXT[] = "GLSL Editor.ContextMenu";
@@ -53,6 +53,6 @@ const char WIZARD_CATEGORY_GLSL[] = "U.GLSL";
 const char WIZARD_TR_CATEGORY_GLSL[] = QT_TRANSLATE_NOOP("GLSLEditor", "GLSL");
 
 } // namespace Constants
-} // namespace GLSLEditor
+} // namespace GlslEditor
 
 #endif // GLSLEDITOR_CONSTANTS_H
diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp
index f1a5b4fc2899cca2b5c5d38b390e5298143d765a..2973c0a5bc9840d6aa1ca7252dc30bd812c59436 100644
--- a/src/plugins/glsleditor/glsleditorplugin.cpp
+++ b/src/plugins/glsleditor/glsleditorplugin.cpp
@@ -68,7 +68,7 @@
 using namespace Core;
 using namespace TextEditor;
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 class GlslEditorPluginPrivate
@@ -132,7 +132,7 @@ bool GlslEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er
     addAutoReleasedObject(new GlslEditorFactory);
     addAutoReleasedObject(new GlslCompletionAssistProvider);
 
-    ActionContainer *contextMenu = ActionManager::createMenu(GLSLEditor::Constants::M_CONTEXT);
+    ActionContainer *contextMenu = ActionManager::createMenu(Constants::M_CONTEXT);
     ActionContainer *glslToolsMenu = ActionManager::createMenu(Id(Constants::M_TOOLS_GLSL));
     glslToolsMenu->setOnAllDisabledBehavior(ActionContainer::Hide);
     QMenu *menu = glslToolsMenu->menu();
@@ -213,12 +213,12 @@ bool GlslEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er
 
     auto hf = new HighlighterFactory;
     hf->setProductType<Highlighter>();
-    hf->setId(GLSLEditor::Constants::C_GLSLEDITOR_ID);
-    hf->addMimeType(GLSLEditor::Constants::GLSL_MIMETYPE);
-    hf->addMimeType(GLSLEditor::Constants::GLSL_MIMETYPE_VERT);
-    hf->addMimeType(GLSLEditor::Constants::GLSL_MIMETYPE_FRAG);
-    hf->addMimeType(GLSLEditor::Constants::GLSL_MIMETYPE_VERT_ES);
-    hf->addMimeType(GLSLEditor::Constants::GLSL_MIMETYPE_FRAG_ES);
+    hf->setId(Constants::C_GLSLEDITOR_ID);
+    hf->addMimeType(Constants::GLSL_MIMETYPE);
+    hf->addMimeType(Constants::GLSL_MIMETYPE_VERT);
+    hf->addMimeType(Constants::GLSL_MIMETYPE_FRAG);
+    hf->addMimeType(Constants::GLSL_MIMETYPE_VERT_ES);
+    hf->addMimeType(Constants::GLSL_MIMETYPE_FRAG_ES);
     addAutoReleasedObject(hf);
 
     return true;
@@ -287,6 +287,6 @@ const GlslEditorPlugin::InitFile *GlslEditorPlugin::shaderInit(int variant)
 }
 
 } // namespace Internal
-} // namespace GLSLEditor
+} // namespace GlslEditor
 
-Q_EXPORT_PLUGIN(GLSLEditor::Internal::GLSLEditorPlugin)
+Q_EXPORT_PLUGIN(GlslEditor::Internal::GlslEditorPlugin)
diff --git a/src/plugins/glsleditor/glsleditorplugin.h b/src/plugins/glsleditor/glsleditorplugin.h
index 3a40f07844a8bd8942843d218a2f2aba251373de..b1299fa729719ade412232b109f45f8f286eb1ee 100644
--- a/src/plugins/glsleditor/glsleditorplugin.h
+++ b/src/plugins/glsleditor/glsleditorplugin.h
@@ -33,7 +33,7 @@
 #include <extensionsystem/iplugin.h>
 #include <glsl/glsl.h>
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 class GlslEditorWidget;
@@ -70,6 +70,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace GLSLEditor
+} // namespace GlslEditor
 
 #endif // GLSLEDITORPLUGIN_H
diff --git a/src/plugins/glsleditor/glslfilewizard.cpp b/src/plugins/glsleditor/glslfilewizard.cpp
index d987ab30e1dae2251b79c0cf1363234b7043dbe8..05514157eb883bd4545164cfe3efad8f0d0a3384 100644
--- a/src/plugins/glsleditor/glslfilewizard.cpp
+++ b/src/plugins/glsleditor/glslfilewizard.cpp
@@ -43,7 +43,7 @@
 using namespace Core;
 using namespace Utils;
 
-namespace GLSLEditor {
+namespace GlslEditor {
 
 GlslFileWizard::GlslFileWizard(ShaderType shaderType)
     : m_shaderType(shaderType)
diff --git a/src/plugins/glsleditor/glslfilewizard.h b/src/plugins/glsleditor/glslfilewizard.h
index a7ea98bfc7b85d29a7b1149ef3ebbc63fbb18a8c..ca4c50f263438a467e103cf0571ad2f9b7d75b85 100644
--- a/src/plugins/glsleditor/glslfilewizard.h
+++ b/src/plugins/glsleditor/glslfilewizard.h
@@ -32,7 +32,7 @@
 
 #include <coreplugin/basefilewizardfactory.h>
 
-namespace GLSLEditor {
+namespace GlslEditor {
 
 class GlslFileWizard: public Core::BaseFileWizardFactory
 {
@@ -63,6 +63,6 @@ private:
     ShaderType m_shaderType;
 };
 
-} // namespace GLSLEditor
+} // namespace GlslEditor
 
 #endif // GLSLFILEWIZARD_H
diff --git a/src/plugins/glsleditor/glslhighlighter.cpp b/src/plugins/glsleditor/glslhighlighter.cpp
index e54527240dbfda69bd2387df89f49284b303532a..4b98fa9493a15b02afb33869d4bc32de08a17085 100644
--- a/src/plugins/glsleditor/glslhighlighter.cpp
+++ b/src/plugins/glsleditor/glslhighlighter.cpp
@@ -35,8 +35,8 @@
 
 #include <QDebug>
 
-using namespace GLSLEditor;
-using namespace GLSLEditor::Internal;
+using namespace GlslEditor;
+using namespace GlslEditor::Internal;
 using namespace TextEditor;
 
 Highlighter::Highlighter(QTextDocument *parent)
diff --git a/src/plugins/glsleditor/glslhighlighter.h b/src/plugins/glsleditor/glslhighlighter.h
index 5e85c50e1bb530cf78d2df7673e29d8dd9c22df7..d979bc639f4b2454b0c076fc5b207c94102908e7 100644
--- a/src/plugins/glsleditor/glslhighlighter.h
+++ b/src/plugins/glsleditor/glslhighlighter.h
@@ -31,7 +31,7 @@
 
 #include <texteditor/syntaxhighlighter.h>
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 class GlslEditorWidget;
@@ -71,6 +71,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace GLSLEditor
+} // namespace GlslEditor
 
 #endif // GLSLHIGHLIGHTER_H
diff --git a/src/plugins/glsleditor/glslhoverhandler.cpp b/src/plugins/glsleditor/glslhoverhandler.cpp
index 410831e341647e3f02cad77d2f11b63354c48af1..4fa4a114af0d7db1948bf5292d1461a5f0c0badb 100644
--- a/src/plugins/glsleditor/glslhoverhandler.cpp
+++ b/src/plugins/glsleditor/glslhoverhandler.cpp
@@ -40,7 +40,7 @@
 
 using namespace Core;
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 GlslHoverHandler::GlslHoverHandler(QObject *parent) : BaseHoverHandler(parent)
@@ -69,4 +69,4 @@ void GlslHoverHandler::decorateToolTip()
 }
 
 } // namespace Internal
-} // namespace GLSLEditor
+} // namespace GlslEditor
diff --git a/src/plugins/glsleditor/glslhoverhandler.h b/src/plugins/glsleditor/glslhoverhandler.h
index 2f5059095369b30de15e14f8b3852809a56019dd..6f56c584b9763d7a510b8966adbaef066c67ac4d 100644
--- a/src/plugins/glsleditor/glslhoverhandler.h
+++ b/src/plugins/glsleditor/glslhoverhandler.h
@@ -38,7 +38,7 @@ namespace Core { class IEditor; }
 
 namespace TextEditor { class BaseTextEditor; }
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 class GlslHoverHandler : public TextEditor::BaseHoverHandler
@@ -55,6 +55,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace GLSLEditor
+} // namespace GlslEditor
 
 #endif // GLSLHOVERHANDLER_H
diff --git a/src/plugins/glsleditor/glslindenter.cpp b/src/plugins/glsleditor/glslindenter.cpp
index a14cd6e3f1c2ef2d2fc070a5b76fb36770fd4ccd..19f404e9b005d0a4abbde3d4c377e14dbc5ef8f8 100644
--- a/src/plugins/glsleditor/glslindenter.cpp
+++ b/src/plugins/glsleditor/glslindenter.cpp
@@ -39,7 +39,7 @@
 #include <QTextBlock>
 #include <QTextCursor>
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 GlslIndenter::GlslIndenter()
@@ -116,4 +116,4 @@ void GlslIndenter::indent(QTextDocument *doc,
 }
 
 } // namespace Internal
-} // namespace GLSLEditor
+} // namespace GlslEditor
diff --git a/src/plugins/glsleditor/glslindenter.h b/src/plugins/glsleditor/glslindenter.h
index 234bf872596d5688bf27699fc096e6cc544167b2..faba05557c3bfb35a5605f29253a2b0b8f5b32b9 100644
--- a/src/plugins/glsleditor/glslindenter.h
+++ b/src/plugins/glsleditor/glslindenter.h
@@ -32,7 +32,7 @@
 
 #include <texteditor/indenter.h>
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 class GlslIndenter : public TextEditor::Indenter
@@ -53,7 +53,7 @@ public:
                         const TextEditor::TabSettings &tabSettings);
 };
 
-} // Internal
-} // GLSLEditor
+} // namespace Internal
+} // namespace GlslEditor
 
 #endif // GLSLINDENTER_H
diff --git a/src/plugins/glsleditor/reuse.cpp b/src/plugins/glsleditor/reuse.cpp
index c1f118341e8bfeb2939b7b954da6a1eed98ab078..5d6266bc2167a3ff06b6679323d538d71eb86d39 100644
--- a/src/plugins/glsleditor/reuse.cpp
+++ b/src/plugins/glsleditor/reuse.cpp
@@ -35,7 +35,7 @@
 
 using namespace GLSL;
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 int languageVariant(const QString &mimeType)
@@ -75,6 +75,6 @@ int languageVariant(const QString &mimeType)
     return variant;
 }
 
-} // Internal
-} // GLSLEditor
+} // namespace Internal
+} // namespace GlslEditor
 
diff --git a/src/plugins/glsleditor/reuse.h b/src/plugins/glsleditor/reuse.h
index 247c0020ca6f0af47f921f2ed3d62d8589162096..e0f88973cde6e1ab114e0c493cc34f0a9c6796fc 100644
--- a/src/plugins/glsleditor/reuse.h
+++ b/src/plugins/glsleditor/reuse.h
@@ -32,12 +32,12 @@
 
 #include <QtGlobal>
 
-namespace GLSLEditor {
+namespace GlslEditor {
 namespace Internal {
 
 int languageVariant(const QString &mimeType);
 
-} // Internal
-} // GLSLEditor
+} // namespace Internal
+} // namespace GlslEditor
 
 #endif // REUSE_H