diff --git a/src/plugins/clangcodemodel/clangbackendcommunicator.cpp b/src/plugins/clangcodemodel/clangbackendcommunicator.cpp
index 4e0c08b6724..34a363407a8 100644
--- a/src/plugins/clangcodemodel/clangbackendcommunicator.cpp
+++ b/src/plugins/clangcodemodel/clangbackendcommunicator.cpp
@@ -253,7 +253,7 @@ void BackendCommunicator::unsavedFilesUpdatedForUiHeaders()
     const auto editorSupports = CppModelManager::instance()->abstractEditorSupports();
     foreach (const AbstractEditorSupport *es, editorSupports) {
         const QString mappedPath
-                = ModelManagerSupportClang::instance()->dummyUiHeaderOnDiskPath(es->fileName());
+                = ClangModelManagerSupport::instance()->dummyUiHeaderOnDiskPath(es->fileName());
         unsavedFilesUpdated(mappedPath, es->contents(), es->revision());
     }
 }
diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.h b/src/plugins/clangcodemodel/clangcodemodelplugin.h
index 5e24352a763..ad2b556400f 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.h
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.h
@@ -53,7 +53,7 @@ private:
     void generateCompilationDB();
     void createCompilationDBButton();
 
-    ModelManagerSupportProviderClang m_modelManagerSupportProvider;
+    ClangModelManagerSupportProvider m_modelManagerSupportProvider;
     Utils::ParameterAction *m_generateCompilationDBAction = nullptr;
     QFutureWatcher<void> m_generatorWatcher;
 #ifdef WITH_TESTS
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 7a185bb8213..959e90d22cc 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -70,7 +70,7 @@ namespace Internal {
 static ClangProjectSettings &getProjectSettings(ProjectExplorer::Project *project)
 {
     QTC_CHECK(project);
-    return ModelManagerSupportClang::instance()->projectSettings(project);
+    return ClangModelManagerSupport::instance()->projectSettings(project);
 }
 
 ClangEditorDocumentProcessor::ClangEditorDocumentProcessor(
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index 66abc7913b0..b3ac6005dfc 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -60,14 +60,14 @@
 using namespace ClangCodeModel;
 using namespace ClangCodeModel::Internal;
 
-static ModelManagerSupportClang *m_instance = 0;
+static ClangModelManagerSupport *m_instance = 0;
 
 static CppTools::CppModelManager *cppModelManager()
 {
     return CppTools::CppModelManager::instance();
 }
 
-ModelManagerSupportClang::ModelManagerSupportClang()
+ClangModelManagerSupport::ClangModelManagerSupport()
     : m_completionAssistProvider(m_communicator)
     , m_followSymbol(new ClangFollowSymbol)
     , m_refactoringEngine(new RefactoringEngine)
@@ -82,76 +82,76 @@ ModelManagerSupportClang::ModelManagerSupportClang()
 
     Core::EditorManager *editorManager = Core::EditorManager::instance();
     connect(editorManager, &Core::EditorManager::editorOpened,
-            this, &ModelManagerSupportClang::onEditorOpened);
+            this, &ClangModelManagerSupport::onEditorOpened);
     connect(editorManager, &Core::EditorManager::currentEditorChanged,
-            this, &ModelManagerSupportClang::onCurrentEditorChanged);
+            this, &ClangModelManagerSupport::onCurrentEditorChanged);
     connect(editorManager, &Core::EditorManager::editorsClosed,
-            this, &ModelManagerSupportClang::onEditorClosed);
+            this, &ClangModelManagerSupport::onEditorClosed);
 
     CppTools::CppModelManager *modelManager = cppModelManager();
     connect(modelManager, &CppTools::CppModelManager::abstractEditorSupportContentsUpdated,
-            this, &ModelManagerSupportClang::onAbstractEditorSupportContentsUpdated);
+            this, &ClangModelManagerSupport::onAbstractEditorSupportContentsUpdated);
     connect(modelManager, &CppTools::CppModelManager::abstractEditorSupportRemoved,
-            this, &ModelManagerSupportClang::onAbstractEditorSupportRemoved);
+            this, &ClangModelManagerSupport::onAbstractEditorSupportRemoved);
     connect(modelManager, &CppTools::CppModelManager::projectPartsUpdated,
-            this, &ModelManagerSupportClang::onProjectPartsUpdated);
+            this, &ClangModelManagerSupport::onProjectPartsUpdated);
     connect(modelManager, &CppTools::CppModelManager::projectPartsRemoved,
-            this, &ModelManagerSupportClang::onProjectPartsRemoved);
+            this, &ClangModelManagerSupport::onProjectPartsRemoved);
 
     auto *sessionManager = ProjectExplorer::SessionManager::instance();
     connect(sessionManager, &ProjectExplorer::SessionManager::projectAdded,
-            this, &ModelManagerSupportClang::onProjectAdded);
+            this, &ClangModelManagerSupport::onProjectAdded);
     connect(sessionManager, &ProjectExplorer::SessionManager::aboutToRemoveProject,
-            this, &ModelManagerSupportClang::onAboutToRemoveProject);
+            this, &ClangModelManagerSupport::onAboutToRemoveProject);
 
     CppTools::CppCodeModelSettings *settings = CppTools::codeModelSettings().data();
     connect(settings, &CppTools::CppCodeModelSettings::clangDiagnosticConfigsInvalidated,
-            this, &ModelManagerSupportClang::onDiagnosticConfigsInvalidated);
+            this, &ClangModelManagerSupport::onDiagnosticConfigsInvalidated);
 }
 
-ModelManagerSupportClang::~ModelManagerSupportClang()
+ClangModelManagerSupport::~ClangModelManagerSupport()
 {
     QTC_CHECK(m_projectSettings.isEmpty());
     m_instance = 0;
 }
 
-CppTools::CppCompletionAssistProvider *ModelManagerSupportClang::completionAssistProvider()
+CppTools::CppCompletionAssistProvider *ClangModelManagerSupport::completionAssistProvider()
 {
     return &m_completionAssistProvider;
 }
 
-TextEditor::BaseHoverHandler *ModelManagerSupportClang::createHoverHandler()
+TextEditor::BaseHoverHandler *ClangModelManagerSupport::createHoverHandler()
 {
     return new Internal::ClangHoverHandler;
 }
 
-CppTools::FollowSymbolInterface &ModelManagerSupportClang::followSymbolInterface()
+CppTools::FollowSymbolInterface &ClangModelManagerSupport::followSymbolInterface()
 {
     return *m_followSymbol;
 }
 
-CppTools::RefactoringEngineInterface &ModelManagerSupportClang::refactoringEngineInterface()
+CppTools::RefactoringEngineInterface &ClangModelManagerSupport::refactoringEngineInterface()
 {
     return *m_refactoringEngine;
 }
 
-std::unique_ptr<CppTools::AbstractOverviewModel> ModelManagerSupportClang::createOverviewModel()
+std::unique_ptr<CppTools::AbstractOverviewModel> ClangModelManagerSupport::createOverviewModel()
 {
     return std::make_unique<OverviewModel>();
 }
 
-void ModelManagerSupportClang::setBackendJobsPostponed(bool postponed)
+void ClangModelManagerSupport::setBackendJobsPostponed(bool postponed)
 {
     m_communicator.setBackendJobsPostponed(postponed);
 }
 
-CppTools::BaseEditorDocumentProcessor *ModelManagerSupportClang::createEditorDocumentProcessor(
+CppTools::BaseEditorDocumentProcessor *ClangModelManagerSupport::createEditorDocumentProcessor(
         TextEditor::TextDocument *baseTextDocument)
 {
     return new ClangEditorDocumentProcessor(m_communicator, baseTextDocument);
 }
 
-void ModelManagerSupportClang::onCurrentEditorChanged(Core::IEditor *editor)
+void ClangModelManagerSupport::onCurrentEditorChanged(Core::IEditor *editor)
 {
     m_communicator.documentVisibilityChanged();
 
@@ -165,60 +165,60 @@ void ModelManagerSupportClang::onCurrentEditorChanged(Core::IEditor *editor)
         processor->generateTaskHubIssues();
 }
 
-void ModelManagerSupportClang::connectTextDocumentToTranslationUnit(TextEditor::TextDocument *textDocument)
+void ClangModelManagerSupport::connectTextDocumentToTranslationUnit(TextEditor::TextDocument *textDocument)
 {
     // Handle externally changed documents
     connect(textDocument, &Core::IDocument::aboutToReload,
-            this, &ModelManagerSupportClang::onCppDocumentAboutToReloadOnTranslationUnit,
+            this, &ClangModelManagerSupport::onCppDocumentAboutToReloadOnTranslationUnit,
             Qt::UniqueConnection);
     connect(textDocument, &Core::IDocument::reloadFinished,
-            this, &ModelManagerSupportClang::onCppDocumentReloadFinishedOnTranslationUnit,
+            this, &ClangModelManagerSupport::onCppDocumentReloadFinishedOnTranslationUnit,
             Qt::UniqueConnection);
 
     // Handle changes from e.g. refactoring actions
     connectToTextDocumentContentsChangedForTranslationUnit(textDocument);
 }
 
-void ModelManagerSupportClang::connectTextDocumentToUnsavedFiles(TextEditor::TextDocument *textDocument)
+void ClangModelManagerSupport::connectTextDocumentToUnsavedFiles(TextEditor::TextDocument *textDocument)
 {
     // Handle externally changed documents
     connect(textDocument, &Core::IDocument::aboutToReload,
-            this, &ModelManagerSupportClang::onCppDocumentAboutToReloadOnUnsavedFile,
+            this, &ClangModelManagerSupport::onCppDocumentAboutToReloadOnUnsavedFile,
             Qt::UniqueConnection);
     connect(textDocument, &Core::IDocument::reloadFinished,
-            this, &ModelManagerSupportClang::onCppDocumentReloadFinishedOnUnsavedFile,
+            this, &ClangModelManagerSupport::onCppDocumentReloadFinishedOnUnsavedFile,
             Qt::UniqueConnection);
 
     // Handle changes from e.g. refactoring actions
     connectToTextDocumentContentsChangedForUnsavedFile(textDocument);
 }
 
-void ModelManagerSupportClang::connectToTextDocumentContentsChangedForTranslationUnit(
+void ClangModelManagerSupport::connectToTextDocumentContentsChangedForTranslationUnit(
         TextEditor::TextDocument *textDocument)
 {
     connect(textDocument, &TextEditor::TextDocument::contentsChangedWithPosition,
-            this, &ModelManagerSupportClang::onCppDocumentContentsChangedOnTranslationUnit,
+            this, &ClangModelManagerSupport::onCppDocumentContentsChangedOnTranslationUnit,
             Qt::UniqueConnection);
 }
 
-void ModelManagerSupportClang::connectToTextDocumentContentsChangedForUnsavedFile(
+void ClangModelManagerSupport::connectToTextDocumentContentsChangedForUnsavedFile(
         TextEditor::TextDocument *textDocument)
 {
     connect(textDocument, &TextEditor::TextDocument::contentsChangedWithPosition,
-            this, &ModelManagerSupportClang::onCppDocumentContentsChangedOnUnsavedFile,
+            this, &ClangModelManagerSupport::onCppDocumentContentsChangedOnUnsavedFile,
             Qt::UniqueConnection);
 }
 
-void ModelManagerSupportClang::connectToWidgetsMarkContextMenuRequested(QWidget *editorWidget)
+void ClangModelManagerSupport::connectToWidgetsMarkContextMenuRequested(QWidget *editorWidget)
 {
     const auto widget = qobject_cast<TextEditor::TextEditorWidget *>(editorWidget);
     if (widget) {
         connect(widget, &TextEditor::TextEditorWidget::markContextMenuRequested,
-                this, &ModelManagerSupportClang::onTextMarkContextMenuRequested);
+                this, &ClangModelManagerSupport::onTextMarkContextMenuRequested);
     }
 }
 
-bool ModelManagerSupportClang::eventFilter(QObject *obj, QEvent *e)
+bool ClangModelManagerSupport::eventFilter(QObject *obj, QEvent *e)
 {
     if (obj == QApplication::instance() && e->type() == QEvent::ApplicationStateChange) {
         switch (QApplication::applicationState()) {
@@ -232,7 +232,7 @@ bool ModelManagerSupportClang::eventFilter(QObject *obj, QEvent *e)
     return false;
 }
 
-void ModelManagerSupportClang::onEditorOpened(Core::IEditor *editor)
+void ClangModelManagerSupport::onEditorOpened(Core::IEditor *editor)
 {
     QTC_ASSERT(editor, return);
     Core::IDocument *document = editor->document();
@@ -247,19 +247,19 @@ void ModelManagerSupportClang::onEditorOpened(Core::IEditor *editor)
     }
 }
 
-void ModelManagerSupportClang::onEditorClosed(const QList<Core::IEditor *> &)
+void ClangModelManagerSupport::onEditorClosed(const QList<Core::IEditor *> &)
 {
     m_communicator.documentVisibilityChanged();
 }
 
-void ModelManagerSupportClang::onCppDocumentAboutToReloadOnTranslationUnit()
+void ClangModelManagerSupport::onCppDocumentAboutToReloadOnTranslationUnit()
 {
     TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(sender());
     disconnect(textDocument, &TextEditor::TextDocument::contentsChangedWithPosition,
-               this, &ModelManagerSupportClang::onCppDocumentContentsChangedOnTranslationUnit);
+               this, &ClangModelManagerSupport::onCppDocumentContentsChangedOnTranslationUnit);
 }
 
-void ModelManagerSupportClang::onCppDocumentReloadFinishedOnTranslationUnit(bool success)
+void ClangModelManagerSupport::onCppDocumentReloadFinishedOnTranslationUnit(bool success)
 {
     if (success) {
         TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(sender());
@@ -277,7 +277,7 @@ void clearDiagnosticFixIts(const QString &filePath)
 }
 }
 
-void ModelManagerSupportClang::onCppDocumentContentsChangedOnTranslationUnit(int position,
+void ClangModelManagerSupport::onCppDocumentContentsChangedOnTranslationUnit(int position,
                                                                              int /*charsRemoved*/,
                                                                              int /*charsAdded*/)
 {
@@ -290,14 +290,14 @@ void ModelManagerSupportClang::onCppDocumentContentsChangedOnTranslationUnit(int
     clearDiagnosticFixIts(document->filePath().toString());
 }
 
-void ModelManagerSupportClang::onCppDocumentAboutToReloadOnUnsavedFile()
+void ClangModelManagerSupport::onCppDocumentAboutToReloadOnUnsavedFile()
 {
     TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(sender());
     disconnect(textDocument, &TextEditor::TextDocument::contentsChangedWithPosition,
-               this, &ModelManagerSupportClang::onCppDocumentContentsChangedOnUnsavedFile);
+               this, &ClangModelManagerSupport::onCppDocumentContentsChangedOnUnsavedFile);
 }
 
-void ModelManagerSupportClang::onCppDocumentReloadFinishedOnUnsavedFile(bool success)
+void ClangModelManagerSupport::onCppDocumentReloadFinishedOnUnsavedFile(bool success)
 {
     if (success) {
         TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(sender());
@@ -306,13 +306,13 @@ void ModelManagerSupportClang::onCppDocumentReloadFinishedOnUnsavedFile(bool suc
     }
 }
 
-void ModelManagerSupportClang::onCppDocumentContentsChangedOnUnsavedFile()
+void ClangModelManagerSupport::onCppDocumentContentsChangedOnUnsavedFile()
 {
     Core::IDocument *document = qobject_cast<Core::IDocument *>(sender());
     m_communicator.unsavedFilesUpdated(document);
 }
 
-void ModelManagerSupportClang::onAbstractEditorSupportContentsUpdated(const QString &filePath,
+void ClangModelManagerSupport::onAbstractEditorSupportContentsUpdated(const QString &filePath,
                                                                       const QByteArray &content)
 {
     QTC_ASSERT(!filePath.isEmpty(), return);
@@ -321,7 +321,7 @@ void ModelManagerSupportClang::onAbstractEditorSupportContentsUpdated(const QStr
     m_communicator.unsavedFilesUpdated(mappedPath, content, 0);
 }
 
-void ModelManagerSupportClang::onAbstractEditorSupportRemoved(const QString &filePath)
+void ClangModelManagerSupport::onAbstractEditorSupportRemoved(const QString &filePath)
 {
     QTC_ASSERT(!filePath.isEmpty(), return);
 
@@ -358,7 +358,7 @@ static TextEditor::AssistInterface createAssistInterface(TextEditor::TextEditorW
                                        TextEditor::IdleEditor);
 }
 
-void ModelManagerSupportClang::onTextMarkContextMenuRequested(TextEditor::TextEditorWidget *widget,
+void ClangModelManagerSupport::onTextMarkContextMenuRequested(TextEditor::TextEditorWidget *widget,
                                                               int lineNumber,
                                                               QMenu *menu)
 {
@@ -402,7 +402,7 @@ static void updateProcessors(const ClangEditorDocumentProcessors &processors)
     modelManager->updateCppEditorDocuments(/*projectsUpdated=*/ false);
 }
 
-void ModelManagerSupportClang::onProjectAdded(ProjectExplorer::Project *project)
+void ClangModelManagerSupport::onProjectAdded(ProjectExplorer::Project *project)
 {
     QTC_ASSERT(!m_projectSettings.value(project), return);
 
@@ -414,7 +414,7 @@ void ModelManagerSupportClang::onProjectAdded(ProjectExplorer::Project *project)
     m_projectSettings.insert(project, settings);
 }
 
-void ModelManagerSupportClang::onAboutToRemoveProject(ProjectExplorer::Project *project)
+void ClangModelManagerSupport::onAboutToRemoveProject(ProjectExplorer::Project *project)
 {
     ClangProjectSettings * const settings = m_projectSettings.value(project);
     QTC_ASSERT(settings, return);
@@ -422,7 +422,7 @@ void ModelManagerSupportClang::onAboutToRemoveProject(ProjectExplorer::Project *
     delete settings;
 }
 
-void ModelManagerSupportClang::onProjectPartsUpdated(ProjectExplorer::Project *project)
+void ClangModelManagerSupport::onProjectPartsUpdated(ProjectExplorer::Project *project)
 {
     QTC_ASSERT(project, return);
     const CppTools::ProjectInfo projectInfo = cppModelManager()->projectInfo(project);
@@ -434,7 +434,7 @@ void ModelManagerSupportClang::onProjectPartsUpdated(ProjectExplorer::Project *p
     onProjectPartsRemoved(projectPartIds);
 }
 
-void ModelManagerSupportClang::onProjectPartsRemoved(const QStringList &projectPartIds)
+void ClangModelManagerSupport::onProjectPartsRemoved(const QStringList &projectPartIds)
 {
     if (!projectPartIds.isEmpty())
         reinitializeBackendDocuments(projectPartIds);
@@ -448,7 +448,7 @@ static ClangEditorDocumentProcessors clangProcessorsWithDiagnosticConfig(
     });
 }
 
-void ModelManagerSupportClang::onDiagnosticConfigsInvalidated(const QVector<Core::Id> &configIds)
+void ClangModelManagerSupport::onDiagnosticConfigsInvalidated(const QVector<Core::Id> &configIds)
 {
     updateProcessors(clangProcessorsWithDiagnosticConfig(configIds));
 }
@@ -461,7 +461,7 @@ clangProcessorsWithProjectParts(const QStringList &projectPartIds)
     });
 }
 
-void ModelManagerSupportClang::reinitializeBackendDocuments(const QStringList &projectPartIds)
+void ClangModelManagerSupport::reinitializeBackendDocuments(const QStringList &projectPartIds)
 {
     const auto processors = clangProcessorsWithProjectParts(projectPartIds);
     foreach (ClangEditorDocumentProcessor *processor, processors) {
@@ -471,45 +471,45 @@ void ModelManagerSupportClang::reinitializeBackendDocuments(const QStringList &p
     }
 }
 
-ModelManagerSupportClang *ModelManagerSupportClang::instance()
+ClangModelManagerSupport *ClangModelManagerSupport::instance()
 {
     return m_instance;
 }
 
-BackendCommunicator &ModelManagerSupportClang::communicator()
+BackendCommunicator &ClangModelManagerSupport::communicator()
 {
     return m_communicator;
 }
 
-QString ModelManagerSupportClang::dummyUiHeaderOnDiskPath(const QString &filePath) const
+QString ClangModelManagerSupport::dummyUiHeaderOnDiskPath(const QString &filePath) const
 {
     return m_uiHeaderOnDiskManager.mapPath(filePath);
 }
 
-ClangProjectSettings &ModelManagerSupportClang::projectSettings(
+ClangProjectSettings &ClangModelManagerSupport::projectSettings(
     ProjectExplorer::Project *project) const
 {
     return *m_projectSettings.value(project);
 }
 
-QString ModelManagerSupportClang::dummyUiHeaderOnDiskDirPath() const
+QString ClangModelManagerSupport::dummyUiHeaderOnDiskDirPath() const
 {
     return m_uiHeaderOnDiskManager.directoryPath();
 }
 
-QString ModelManagerSupportProviderClang::id() const
+QString ClangModelManagerSupportProvider::id() const
 {
     return QLatin1String(Constants::CLANG_MODELMANAGERSUPPORT_ID);
 }
 
-QString ModelManagerSupportProviderClang::displayName() const
+QString ClangModelManagerSupportProvider::displayName() const
 {
     //: Display name
     return QCoreApplication::translate("ClangCodeModel::Internal::ModelManagerSupport",
                                        "Clang");
 }
 
-CppTools::ModelManagerSupport::Ptr ModelManagerSupportProviderClang::createModelManagerSupport()
+CppTools::ModelManagerSupport::Ptr ClangModelManagerSupportProvider::createModelManagerSupport()
 {
-    return CppTools::ModelManagerSupport::Ptr(new ModelManagerSupportClang);
+    return CppTools::ModelManagerSupport::Ptr(new ClangModelManagerSupport);
 }
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.h b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
index 9578804ebb6..90570402cc7 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.h
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
@@ -55,15 +55,15 @@ namespace Internal {
 
 class ClangProjectSettings;
 
-class ModelManagerSupportClang:
+class ClangModelManagerSupport:
         public QObject,
         public CppTools::ModelManagerSupport
 {
     Q_OBJECT
 
 public:
-    ModelManagerSupportClang();
-    ~ModelManagerSupportClang() override;
+    ClangModelManagerSupport();
+    ~ClangModelManagerSupport() override;
 
     CppTools::CppCompletionAssistProvider *completionAssistProvider() override;
     TextEditor::BaseHoverHandler *createHoverHandler() override;
@@ -80,7 +80,7 @@ public:
 
     ClangProjectSettings &projectSettings(ProjectExplorer::Project *project) const;
 
-    static ModelManagerSupportClang *instance();
+    static ClangModelManagerSupport *instance();
 
 private:
     bool eventFilter(QObject *obj, QEvent *e) override;
@@ -131,7 +131,7 @@ private:
     QHash<ProjectExplorer::Project *, ClangProjectSettings *> m_projectSettings;
 };
 
-class ModelManagerSupportProviderClang : public CppTools::ModelManagerSupportProvider
+class ClangModelManagerSupportProvider : public CppTools::ModelManagerSupportProvider
 {
 public:
     QString id() const override;
diff --git a/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp b/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp
index f8fcd68babe..2e0db6b6bcb 100644
--- a/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp
+++ b/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp
@@ -53,7 +53,7 @@ static Core::Id configIdForProject(ClangProjectSettings &projectSettings)
 }
 
 ClangProjectSettingsWidget::ClangProjectSettingsWidget(ProjectExplorer::Project *project)
-    : m_projectSettings(ModelManagerSupportClang::instance()->projectSettings(project))
+    : m_projectSettings(ClangModelManagerSupport::instance()->projectSettings(project))
 {
     m_ui.setupUi(this);
 
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp
index 62c78f8c6d0..9ae6ea7d595 100644
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -95,7 +95,7 @@ public:
 private:
     void addDummyUiHeaderOnDiskIncludePath()
     {
-        const QString path = ModelManagerSupportClang::instance()->dummyUiHeaderOnDiskDirPath();
+        const QString path = ClangModelManagerSupport::instance()->dummyUiHeaderOnDiskDirPath();
         if (!path.isEmpty()) {
             add("-I");
             add(QDir::toNativeSeparators(path));
diff --git a/src/plugins/cpptools/cppmodelmanagersupportinternal.cpp b/src/plugins/cpptools/cppbuiltinmodelmanagersupport.cpp
similarity index 70%
rename from src/plugins/cpptools/cppmodelmanagersupportinternal.cpp
rename to src/plugins/cpptools/cppbuiltinmodelmanagersupport.cpp
index 2bf4ac27009..8aead44395f 100644
--- a/src/plugins/cpptools/cppmodelmanagersupportinternal.cpp
+++ b/src/plugins/cpptools/cppbuiltinmodelmanagersupport.cpp
@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 #include "cppcompletionassist.h"
-#include "cppmodelmanagersupportinternal.h"
+#include "cppbuiltinmodelmanagersupport.h"
 #include "cppfollowsymbolundercursor.h"
 #include "cpphoverhandler.h"
 #include "cppoverviewmodel.h"
@@ -38,60 +38,60 @@
 using namespace CppTools;
 using namespace CppTools::Internal;
 
-QString ModelManagerSupportProviderInternal::id() const
+QString BuiltinModelManagerSupportProvider::id() const
 {
     return QLatin1String("CppTools.BuiltinCodeModel");
 }
 
-QString ModelManagerSupportProviderInternal::displayName() const
+QString BuiltinModelManagerSupportProvider::displayName() const
 {
     return QCoreApplication::translate("ModelManagerSupportInternal::displayName",
                                        "%1 Built-in").arg(Core::Constants::IDE_DISPLAY_NAME);
 }
 
-ModelManagerSupport::Ptr ModelManagerSupportProviderInternal::createModelManagerSupport()
+ModelManagerSupport::Ptr BuiltinModelManagerSupportProvider::createModelManagerSupport()
 {
-    return ModelManagerSupport::Ptr(new ModelManagerSupportInternal);
+    return ModelManagerSupport::Ptr(new BuiltinModelManagerSupport);
 }
 
-ModelManagerSupportInternal::ModelManagerSupportInternal()
+BuiltinModelManagerSupport::BuiltinModelManagerSupport()
     : m_completionAssistProvider(new InternalCompletionAssistProvider),
       m_followSymbol(new FollowSymbolUnderCursor),
       m_refactoringEngine(new CppRefactoringEngine)
 {
 }
 
-ModelManagerSupportInternal::~ModelManagerSupportInternal()
+BuiltinModelManagerSupport::~BuiltinModelManagerSupport()
 {
 }
 
-BaseEditorDocumentProcessor *ModelManagerSupportInternal::createEditorDocumentProcessor(
+BaseEditorDocumentProcessor *BuiltinModelManagerSupport::createEditorDocumentProcessor(
         TextEditor::TextDocument *baseTextDocument)
 {
     return new BuiltinEditorDocumentProcessor(baseTextDocument);
 }
 
-CppCompletionAssistProvider *ModelManagerSupportInternal::completionAssistProvider()
+CppCompletionAssistProvider *BuiltinModelManagerSupport::completionAssistProvider()
 {
     return m_completionAssistProvider.data();
 }
 
-TextEditor::BaseHoverHandler *ModelManagerSupportInternal::createHoverHandler()
+TextEditor::BaseHoverHandler *BuiltinModelManagerSupport::createHoverHandler()
 {
     return new CppHoverHandler;
 }
 
-FollowSymbolInterface &ModelManagerSupportInternal::followSymbolInterface()
+FollowSymbolInterface &BuiltinModelManagerSupport::followSymbolInterface()
 {
     return *m_followSymbol;
 }
 
-RefactoringEngineInterface &ModelManagerSupportInternal::refactoringEngineInterface()
+RefactoringEngineInterface &BuiltinModelManagerSupport::refactoringEngineInterface()
 {
     return *m_refactoringEngine;
 }
 
-std::unique_ptr<AbstractOverviewModel> ModelManagerSupportInternal::createOverviewModel()
+std::unique_ptr<AbstractOverviewModel> BuiltinModelManagerSupport::createOverviewModel()
 {
     return std::make_unique<CppTools::OverviewModel>();
 }
diff --git a/src/plugins/cpptools/cppmodelmanagersupportinternal.h b/src/plugins/cpptools/cppbuiltinmodelmanagersupport.h
similarity index 89%
rename from src/plugins/cpptools/cppmodelmanagersupportinternal.h
rename to src/plugins/cpptools/cppbuiltinmodelmanagersupport.h
index b01f38f4b88..93707d465a1 100644
--- a/src/plugins/cpptools/cppmodelmanagersupportinternal.h
+++ b/src/plugins/cpptools/cppbuiltinmodelmanagersupport.h
@@ -32,13 +32,13 @@
 namespace CppTools {
 namespace Internal {
 
-class ModelManagerSupportInternal: public ModelManagerSupport
+class BuiltinModelManagerSupport: public ModelManagerSupport
 {
-    Q_DISABLE_COPY(ModelManagerSupportInternal)
+    Q_DISABLE_COPY(BuiltinModelManagerSupport)
 
 public:
-    ModelManagerSupportInternal();
-    virtual ~ModelManagerSupportInternal();
+    BuiltinModelManagerSupport();
+    virtual ~BuiltinModelManagerSupport();
 
     CppCompletionAssistProvider *completionAssistProvider() final;
     TextEditor::BaseHoverHandler *createHoverHandler() final;
@@ -55,7 +55,7 @@ private:
     QScopedPointer<RefactoringEngineInterface> m_refactoringEngine;
 };
 
-class ModelManagerSupportProviderInternal : public ModelManagerSupportProvider
+class BuiltinModelManagerSupportProvider : public ModelManagerSupportProvider
 {
 public:
     QString id() const override;
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 603ff3174b9..10fbbcf11e9 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -38,7 +38,7 @@
 #include "cppindexingsupport.h"
 #include "cpplocatordata.h"
 #include "cpplocatorfilter.h"
-#include "cppmodelmanagersupportinternal.h"
+#include "cppbuiltinmodelmanagersupport.h"
 #include "cppqtstyleindenter.h"
 #include "cpprefactoringchanges.h"
 #include "cpprefactoringengine.h"
@@ -502,7 +502,7 @@ void CppModelManager::initCppTools()
 void CppModelManager::initializeBuiltinModelManagerSupport()
 {
     d->m_builtinModelManagerSupport
-            = ModelManagerSupportProviderInternal().createModelManagerSupport();
+            = BuiltinModelManagerSupportProvider().createModelManagerSupport();
     d->m_activeModelManagerSupport = d->m_builtinModelManagerSupport;
     d->m_refactoringEngines[RefactoringEngineType::BuiltIn] =
             &d->m_activeModelManagerSupport->refactoringEngineInterface();
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index c73fba75f36..32c65b02040 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -48,7 +48,6 @@ HEADERS += \
     cpplocatorfilter.h \
     cppmodelmanager.h \
     cppmodelmanagersupport.h \
-    cppmodelmanagersupportinternal.h \
     cppoverviewmodel.h \
     cpppointerdeclarationformatter.h \
     cppprojectfile.h \
@@ -101,7 +100,8 @@ HEADERS += \
     wrappablelineedit.h \
     usages.h \
     cpptools_clangtidychecks.h \
-    cppmodelmanagerinterface.h
+    cppmodelmanagerinterface.h \
+    cppbuiltinmodelmanagersupport.h
 
 SOURCES += \
     abstracteditorsupport.cpp \
@@ -146,7 +146,6 @@ SOURCES += \
     cpplocatorfilter.cpp \
     cppmodelmanager.cpp \
     cppmodelmanagersupport.cpp \
-    cppmodelmanagersupportinternal.cpp \
     cppoverviewmodel.cpp \
     cpppointerdeclarationformatter.cpp \
     cppprojectfile.cpp \
@@ -187,7 +186,8 @@ SOURCES += \
     compileroptionsbuilder.cpp \
     cppprojectfilecategorizer.cpp \
     cppprojectpartchooser.cpp \
-    wrappablelineedit.cpp
+    wrappablelineedit.cpp \
+    cppbuiltinmodelmanagersupport.cpp
 
 FORMS += \
     clangdiagnosticconfigswidget.ui \
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 9020ce2e5e6..6659ddf922b 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -56,6 +56,8 @@ Project {
             "clazychecks.ui",
             "compileroptionsbuilder.cpp",
             "compileroptionsbuilder.h",
+            "cppbuiltinmodelmanagersupport.cpp",
+            "cppbuiltinmodelmanagersupport.h",
             "cppcanonicalsymbol.cpp",
             "cppcanonicalsymbol.h",
             "cppchecksymbols.cpp",
@@ -123,8 +125,6 @@ Project {
             "cppmodelmanager.h",
             "cppmodelmanagersupport.cpp",
             "cppmodelmanagersupport.h",
-            "cppmodelmanagersupportinternal.cpp",
-            "cppmodelmanagersupportinternal.h",
             "cppoverviewmodel.cpp",
             "cppoverviewmodel.h",
             "cpppointerdeclarationformatter.cpp",
@@ -215,7 +215,7 @@ Project {
             "tidychecks.ui",
             "typehierarchybuilder.cpp",
             "typehierarchybuilder.h",
-            "usages.h"
+            "usages.h",
         ]
 
         Group {