diff --git a/src/plugins/clangtools/clangstaticanalyzertool.cpp b/src/plugins/clangtools/clangstaticanalyzertool.cpp
index 7f57272daaf..57b8535b0f6 100644
--- a/src/plugins/clangtools/clangstaticanalyzertool.cpp
+++ b/src/plugins/clangtools/clangstaticanalyzertool.cpp
@@ -28,7 +28,7 @@
 #include "clangtoolsconstants.h"
 #include "clangtoolsdiagnosticmodel.h"
 #include "clangtoolslogfilereader.h"
-#include "clangstaticanalyzerdiagnosticview.h"
+#include "clangtoolsdiagnosticview.h"
 #include "clangstaticanalyzerruncontrol.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
@@ -62,10 +62,10 @@ ClangStaticAnalyzerTool::ClangStaticAnalyzerTool()
     setObjectName("ClangStaticAnalyzerTool");
     s_instance = this;
 
-    m_diagnosticFilterModel = new ClangStaticAnalyzerDiagnosticFilterModel(this);
+    m_diagnosticFilterModel = new DiagnosticFilterModel(this);
     m_diagnosticFilterModel->setSourceModel(m_diagnosticModel);
 
-    m_diagnosticView = new ClangStaticAnalyzerDiagnosticView;
+    m_diagnosticView = new DiagnosticView;
     initDiagnosticView();
     m_diagnosticView->setModel(m_diagnosticFilterModel);
     m_diagnosticView->setObjectName(QLatin1String("ClangStaticAnalyzerIssuesView"));
diff --git a/src/plugins/clangtools/clangstaticanalyzertool.h b/src/plugins/clangtools/clangstaticanalyzertool.h
index 9f4433a78fa..67fe43a47cb 100644
--- a/src/plugins/clangtools/clangstaticanalyzertool.h
+++ b/src/plugins/clangtools/clangstaticanalyzertool.h
@@ -30,9 +30,9 @@
 namespace ClangTools {
 namespace Internal {
 
-class ClangStaticAnalyzerDiagnosticFilterModel;
+class DiagnosticFilterModel;
 class ClangToolsDiagnosticModel;
-class ClangStaticAnalyzerDiagnosticView;
+class DiagnosticView;
 class Diagnostic;
 
 const char ClangStaticAnalyzerPerspectiveId[] = "ClangStaticAnalyzer.Perspective";
@@ -58,7 +58,7 @@ private:
 
     void updateRunActions();
 
-    ClangStaticAnalyzerDiagnosticFilterModel *m_diagnosticFilterModel = nullptr;
+    DiagnosticFilterModel *m_diagnosticFilterModel = nullptr;
 
     QAction *m_goBack = nullptr;
     QAction *m_goNext = nullptr;
diff --git a/src/plugins/clangtools/clangtidyclazytool.cpp b/src/plugins/clangtools/clangtidyclazytool.cpp
index a554b2c6b43..0b81bbfda7c 100644
--- a/src/plugins/clangtools/clangtidyclazytool.cpp
+++ b/src/plugins/clangtools/clangtidyclazytool.cpp
@@ -30,7 +30,7 @@
 #include "clangtoolsdiagnosticmodel.h"
 #include "clangtoolslogfilereader.h"
 #include "clangtidyclazyruncontrol.h"
-#include "clangstaticanalyzerdiagnosticview.h"
+#include "clangtoolsdiagnosticview.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -65,10 +65,10 @@ ClangTidyClazyTool::ClangTidyClazyTool()
     setObjectName("ClangTidyClazyTool");
     s_instance = this;
 
-    m_diagnosticFilterModel = new ClangStaticAnalyzerDiagnosticFilterModel(this);
+    m_diagnosticFilterModel = new DiagnosticFilterModel(this);
     m_diagnosticFilterModel->setSourceModel(m_diagnosticModel);
 
-    m_diagnosticView = new ClangStaticAnalyzerDiagnosticView;
+    m_diagnosticView = new DiagnosticView;
     initDiagnosticView();
     m_diagnosticView->setModel(m_diagnosticFilterModel);
     m_diagnosticView->setObjectName(QLatin1String("ClangTidyClazyIssuesView"));
diff --git a/src/plugins/clangtools/clangtidyclazytool.h b/src/plugins/clangtools/clangtidyclazytool.h
index ad72eb496d0..9da0352a28f 100644
--- a/src/plugins/clangtools/clangtidyclazytool.h
+++ b/src/plugins/clangtools/clangtidyclazytool.h
@@ -30,7 +30,7 @@
 namespace ClangTools {
 namespace Internal {
 
-class ClangStaticAnalyzerDiagnosticFilterModel;
+class DiagnosticFilterModel;
 
 const char ClangTidyClazyPerspectiveId[] = "ClangTidyClazy.Perspective";
 const char ClangTidyClazyDockId[]        = "ClangTidyClazy.Dock";
@@ -56,7 +56,7 @@ private:
 
     void updateRunActions();
 
-    ClangStaticAnalyzerDiagnosticFilterModel *m_diagnosticFilterModel = nullptr;
+    DiagnosticFilterModel *m_diagnosticFilterModel = nullptr;
 };
 
 } // namespace Internal
diff --git a/src/plugins/clangtools/clangtools.pro b/src/plugins/clangtools/clangtools.pro
index 431d48dd5f5..9b8cf2225fb 100644
--- a/src/plugins/clangtools/clangtools.pro
+++ b/src/plugins/clangtools/clangtools.pro
@@ -10,8 +10,8 @@ INCLUDEPATH += $$LLVM_INCLUDEPATH
 
 SOURCES += \
     clangselectablefilesdialog.cpp \
-    clangstaticanalyzerdiagnosticview.cpp \
-    clangstaticanalyzerprojectsettingswidget.cpp \
+    clangtoolsdiagnosticview.cpp \
+    clangtoolsprojectsettingswidget.cpp \
     clangstaticanalyzerruncontrol.cpp \
     clangstaticanalyzerrunner.cpp \
     clangstaticanalyzertool.cpp \
@@ -33,8 +33,8 @@ SOURCES += \
 HEADERS += \
     clangfileinfo.h \
     clangselectablefilesdialog.h \
-    clangstaticanalyzerdiagnosticview.h \
-    clangstaticanalyzerprojectsettingswidget.h \
+    clangtoolsdiagnosticview.h \
+    clangtoolsprojectsettingswidget.h \
     clangstaticanalyzerruncontrol.h \
     clangstaticanalyzerrunner.h \
     clangstaticanalyzertool.h \
@@ -56,17 +56,17 @@ HEADERS += \
     clangtoolsconfigwidget.h
 
 FORMS += \
-    clangstaticanalyzerprojectsettingswidget.ui \
+    clangtoolsprojectsettingswidget.ui \
     clangtoolsconfigwidget.ui
     clangselectablefilesdialog.ui
 
 equals(TEST, 1) {
     HEADERS += \
-        clangstaticanalyzerpreconfiguredsessiontests.h \
+        clangtoolspreconfiguredsessiontests.h \
         clangtoolsunittests.h
 
     SOURCES += \
-        clangstaticanalyzerpreconfiguredsessiontests.cpp \
+        clangtoolspreconfiguredsessiontests.cpp \
         clangtoolsunittests.cpp
 
     RESOURCES += clangtoolsunittests.qrc
diff --git a/src/plugins/clangtools/clangtools.qbs b/src/plugins/clangtools/clangtools.qbs
index 1a086aed40d..d6054751ee4 100644
--- a/src/plugins/clangtools/clangtools.qbs
+++ b/src/plugins/clangtools/clangtools.qbs
@@ -45,11 +45,11 @@ QtcPlugin {
         "clangselectablefilesdialog.cpp",
         "clangselectablefilesdialog.h",
         "clangselectablefilesdialog.ui",
-        "clangstaticanalyzerdiagnosticview.cpp",
-        "clangstaticanalyzerdiagnosticview.h",
-        "clangstaticanalyzerprojectsettingswidget.cpp",
-        "clangstaticanalyzerprojectsettingswidget.h",
-        "clangstaticanalyzerprojectsettingswidget.ui",
+        "clangtoolsdiagnosticview.cpp",
+        "clangtoolsdiagnosticview.h",
+        "clangtoolsprojectsettingswidget.cpp",
+        "clangtoolsprojectsettingswidget.h",
+        "clangtoolsprojectsettingswidget.ui",
         "clangstaticanalyzerruncontrol.cpp",
         "clangstaticanalyzerruncontrol.h",
         "clangstaticanalyzerrunner.cpp",
@@ -93,8 +93,8 @@ QtcPlugin {
         name: "Unit tests"
         condition: qtc.testsEnabled
         files: [
-            "clangstaticanalyzerpreconfiguredsessiontests.cpp",
-            "clangstaticanalyzerpreconfiguredsessiontests.h",
+            "clangtoolspreconfiguredsessiontests.cpp",
+            "clangtoolspreconfiguredsessiontests.h",
             "clangtoolsunittests.cpp",
             "clangtoolsunittests.h",
             "clangtoolsunittests.qrc",
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
index 5df854e239e..fb174b1f3f9 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
@@ -25,7 +25,7 @@
 
 #include "clangtoolsdiagnosticmodel.h"
 
-#include "clangstaticanalyzerdiagnosticview.h"
+#include "clangtoolsdiagnosticview.h"
 #include "clangtoolsprojectsettings.h"
 #include "clangtoolsutils.h"
 
@@ -306,7 +306,7 @@ QVariant ExplainingStepItem::data(int column, int role) const
 }
 
 
-ClangStaticAnalyzerDiagnosticFilterModel::ClangStaticAnalyzerDiagnosticFilterModel(QObject *parent)
+DiagnosticFilterModel::DiagnosticFilterModel(QObject *parent)
     : QSortFilterProxyModel(parent)
 {
     // So that when a user closes and re-opens a project and *then* clicks "Suppress",
@@ -319,23 +319,23 @@ ClangStaticAnalyzerDiagnosticFilterModel::ClangStaticAnalyzerDiagnosticFilterMod
             });
 }
 
-void ClangStaticAnalyzerDiagnosticFilterModel::setProject(ProjectExplorer::Project *project)
+void DiagnosticFilterModel::setProject(ProjectExplorer::Project *project)
 {
     QTC_ASSERT(project, return);
     if (m_project) {
         disconnect(ClangToolsProjectSettingsManager::getSettings(m_project),
                    &ClangToolsProjectSettings::suppressedDiagnosticsChanged, this,
-                   &ClangStaticAnalyzerDiagnosticFilterModel::handleSuppressedDiagnosticsChanged);
+                   &DiagnosticFilterModel::handleSuppressedDiagnosticsChanged);
     }
     m_project = project;
     m_lastProjectDirectory = m_project->projectDirectory();
     connect(ClangToolsProjectSettingsManager::getSettings(m_project),
             &ClangToolsProjectSettings::suppressedDiagnosticsChanged,
-            this, &ClangStaticAnalyzerDiagnosticFilterModel::handleSuppressedDiagnosticsChanged);
+            this, &DiagnosticFilterModel::handleSuppressedDiagnosticsChanged);
     handleSuppressedDiagnosticsChanged();
 }
 
-void ClangStaticAnalyzerDiagnosticFilterModel::addSuppressedDiagnostic(
+void DiagnosticFilterModel::addSuppressedDiagnostic(
         const SuppressedDiagnostic &diag)
 {
     QTC_ASSERT(!m_project, return);
@@ -343,7 +343,7 @@ void ClangStaticAnalyzerDiagnosticFilterModel::addSuppressedDiagnostic(
     invalidate();
 }
 
-bool ClangStaticAnalyzerDiagnosticFilterModel::filterAcceptsRow(int sourceRow,
+bool DiagnosticFilterModel::filterAcceptsRow(int sourceRow,
         const QModelIndex &sourceParent) const
 {
     if (sourceParent.isValid())
@@ -363,7 +363,7 @@ bool ClangStaticAnalyzerDiagnosticFilterModel::filterAcceptsRow(int sourceRow,
     return true;
 }
 
-void ClangStaticAnalyzerDiagnosticFilterModel::handleSuppressedDiagnosticsChanged()
+void DiagnosticFilterModel::handleSuppressedDiagnosticsChanged()
 {
     QTC_ASSERT(m_project, return);
     m_suppressedDiagnostics
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h
index 178e7748a54..11a7caf652c 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h
+++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h
@@ -55,12 +55,12 @@ public:
     };
 };
 
-class ClangStaticAnalyzerDiagnosticFilterModel : public QSortFilterProxyModel
+class DiagnosticFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 
 public:
-    ClangStaticAnalyzerDiagnosticFilterModel(QObject *parent = nullptr);
+    DiagnosticFilterModel(QObject *parent = nullptr);
 
     void setProject(ProjectExplorer::Project *project);
     void addSuppressedDiagnostic(const SuppressedDiagnostic &diag);
diff --git a/src/plugins/clangtools/clangstaticanalyzerdiagnosticview.cpp b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
similarity index 86%
rename from src/plugins/clangtools/clangstaticanalyzerdiagnosticview.cpp
rename to src/plugins/clangtools/clangtoolsdiagnosticview.cpp
index ac464d29b4b..4758546f349 100644
--- a/src/plugins/clangtools/clangstaticanalyzerdiagnosticview.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "clangstaticanalyzerdiagnosticview.h"
+#include "clangtoolsdiagnosticview.h"
 
 #include "clangtoolsdiagnosticmodel.h"
 #include "clangtoolsprojectsettings.h"
@@ -40,15 +40,15 @@ using namespace Debugger;
 namespace ClangTools {
 namespace Internal {
 
-ClangStaticAnalyzerDiagnosticView::ClangStaticAnalyzerDiagnosticView(QWidget *parent)
+DiagnosticView::DiagnosticView(QWidget *parent)
     : Debugger::DetailedErrorView(parent)
 {
     m_suppressAction = new QAction(tr("Suppress This Diagnostic"), this);
     connect(m_suppressAction, &QAction::triggered,
-            this, &ClangStaticAnalyzerDiagnosticView::suppressCurrentDiagnostic);
+            this, &DiagnosticView::suppressCurrentDiagnostic);
 }
 
-void ClangStaticAnalyzerDiagnosticView::suppressCurrentDiagnostic()
+void DiagnosticView::suppressCurrentDiagnostic()
 {
     const QModelIndexList indexes = selectionModel()->selectedRows();
     QTC_ASSERT(indexes.count() == 1, return);
@@ -59,7 +59,7 @@ void ClangStaticAnalyzerDiagnosticView::suppressCurrentDiagnostic()
 
     // If the original project was closed, we work directly on the filter model, otherwise
     // we go via the project settings.
-    auto * const filterModel = static_cast<ClangStaticAnalyzerDiagnosticFilterModel *>(model());
+    auto * const filterModel = static_cast<DiagnosticFilterModel *>(model());
     ProjectExplorer::Project * const project = filterModel->project();
     if (project) {
         Utils::FileName filePath = Utils::FileName::fromString(diag.location.filePath);
@@ -75,7 +75,7 @@ void ClangStaticAnalyzerDiagnosticView::suppressCurrentDiagnostic()
     }
 }
 
-QList<QAction *> ClangStaticAnalyzerDiagnosticView::customActions() const
+QList<QAction *> DiagnosticView::customActions() const
 {
     return QList<QAction *>() << m_suppressAction;
 }
diff --git a/src/plugins/clangtools/clangstaticanalyzerdiagnosticview.h b/src/plugins/clangtools/clangtoolsdiagnosticview.h
similarity index 91%
rename from src/plugins/clangtools/clangstaticanalyzerdiagnosticview.h
rename to src/plugins/clangtools/clangtoolsdiagnosticview.h
index 319bea251a5..bd18f9b451e 100644
--- a/src/plugins/clangtools/clangstaticanalyzerdiagnosticview.h
+++ b/src/plugins/clangtools/clangtoolsdiagnosticview.h
@@ -30,12 +30,12 @@
 namespace ClangTools {
 namespace Internal {
 
-class ClangStaticAnalyzerDiagnosticView : public Debugger::DetailedErrorView
+class DiagnosticView : public Debugger::DetailedErrorView
 {
     Q_OBJECT
 
 public:
-    ClangStaticAnalyzerDiagnosticView(QWidget *parent = 0);
+    DiagnosticView(QWidget *parent = 0);
 
 private:
     void suppressCurrentDiagnostic();
diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp
index 23d34c38168..9e63600fef4 100644
--- a/src/plugins/clangtools/clangtoolsplugin.cpp
+++ b/src/plugins/clangtools/clangtoolsplugin.cpp
@@ -27,14 +27,14 @@
 
 #include "clangtoolsconfigwidget.h"
 #include "clangtoolsconstants.h"
-#include "clangstaticanalyzerprojectsettingswidget.h"
+#include "clangtoolsprojectsettingswidget.h"
 #include "clangstaticanalyzerruncontrol.h"
 #include "clangstaticanalyzertool.h"
 #include "clangtidyclazytool.h"
 #include "clangtoolsprojectsettings.h"
 
 #ifdef WITH_TESTS
-#include "clangstaticanalyzerpreconfiguredsessiontests.h"
+#include "clangtoolspreconfiguredsessiontests.h"
 #include "clangtoolsunittests.h"
 #endif
 
@@ -136,7 +136,7 @@ QList<QObject *> ClangToolsPlugin::createTestObjects() const
 {
     QList<QObject *> tests;
 #ifdef WITH_TESTS
-    tests << new ClangStaticAnalyzerPreconfiguredSessionTests;
+    tests << new PreconfiguredSessionTests;
     tests << new ClangToolsUnitTests;
 #endif
     return tests;
diff --git a/src/plugins/clangtools/clangstaticanalyzerpreconfiguredsessiontests.cpp b/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp
similarity index 93%
rename from src/plugins/clangtools/clangstaticanalyzerpreconfiguredsessiontests.cpp
rename to src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp
index 4e8cb876015..288c9908839 100644
--- a/src/plugins/clangtools/clangstaticanalyzerpreconfiguredsessiontests.cpp
+++ b/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "clangstaticanalyzerpreconfiguredsessiontests.h"
+#include "clangtoolspreconfiguredsessiontests.h"
 
 #include "clangtoolsdiagnostic.h"
 #include "clangstaticanalyzertool.h"
@@ -97,11 +97,11 @@ private:
 namespace ClangTools {
 namespace Internal {
 
-void ClangStaticAnalyzerPreconfiguredSessionTests::initTestCase()
+void PreconfiguredSessionTests::initTestCase()
 {
-    const QString preconfiguredSessionName = QLatin1String("ClangStaticAnalyzerPreconfiguredSession");
+    const QString preconfiguredSessionName = QLatin1String("ClangToolsTest");
     if (!SessionManager::sessions().contains(preconfiguredSessionName))
-        QSKIP("Manually preconfigured session 'ClangStaticAnalyzerPreconfiguredSession' needed.");
+        QSKIP("Manually preconfigured session 'ClangToolsTest' needed.");
 
     if (SessionManager::activeSession() == preconfiguredSessionName)
         QSKIP("Session must not be already active.");
@@ -113,7 +113,7 @@ void ClangStaticAnalyzerPreconfiguredSessionTests::initTestCase()
     QVERIFY(waitForParsedProjects.wait());
 }
 
-void ClangStaticAnalyzerPreconfiguredSessionTests::testPreconfiguredSession()
+void PreconfiguredSessionTests::testPreconfiguredSession()
 {
     QFETCH(Project *, project);
     QFETCH(Target *, target);
@@ -188,7 +188,7 @@ static QByteArray dataTagName(Project *project, Target *target)
     return dataTagAsString.toUtf8();
 }
 
-void ClangStaticAnalyzerPreconfiguredSessionTests::testPreconfiguredSession_data()
+void PreconfiguredSessionTests::testPreconfiguredSession_data()
 {
     QTest::addColumn<Project *>("project");
     QTest::addColumn<Target *>("target");
@@ -206,7 +206,7 @@ void ClangStaticAnalyzerPreconfiguredSessionTests::testPreconfiguredSession_data
         QSKIP("Session has no valid projects/targets to test.");
 }
 
-bool ClangStaticAnalyzerPreconfiguredSessionTests::switchToProjectAndTarget(Project *project,
+bool PreconfiguredSessionTests::switchToProjectAndTarget(Project *project,
                                                                             Target *target)
 {
     Project * const activeProject = SessionManager::startupProject();
diff --git a/src/plugins/clangtools/clangstaticanalyzerpreconfiguredsessiontests.h b/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.h
similarity index 96%
rename from src/plugins/clangtools/clangstaticanalyzerpreconfiguredsessiontests.h
rename to src/plugins/clangtools/clangtoolspreconfiguredsessiontests.h
index 654ab79a6b8..29ee336c869 100644
--- a/src/plugins/clangtools/clangstaticanalyzerpreconfiguredsessiontests.h
+++ b/src/plugins/clangtools/clangtoolspreconfiguredsessiontests.h
@@ -36,7 +36,7 @@ class Target;
 namespace ClangTools {
 namespace Internal {
 
-class ClangStaticAnalyzerPreconfiguredSessionTests: public QObject
+class PreconfiguredSessionTests: public QObject
 {
     Q_OBJECT
 
diff --git a/src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.cpp b/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp
similarity index 97%
rename from src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.cpp
rename to src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp
index 894c6019d98..19b648fac01 100644
--- a/src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.cpp
+++ b/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#include "clangstaticanalyzerprojectsettingswidget.h"
-#include "ui_clangstaticanalyzerprojectsettingswidget.h"
+#include "clangtoolsprojectsettingswidget.h"
+#include "ui_clangtoolsprojectsettingswidget.h"
 
 #include "clangtoolsprojectsettings.h"
 
@@ -164,4 +164,4 @@ QVariant SuppressedDiagnosticsModel::data(const QModelIndex &index, int role) co
 } // namespace Internal
 } // namespace ClangTools
 
-#include "clangstaticanalyzerprojectsettingswidget.moc"
+#include "clangtoolsprojectsettingswidget.moc"
diff --git a/src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.h b/src/plugins/clangtools/clangtoolsprojectsettingswidget.h
similarity index 100%
rename from src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.h
rename to src/plugins/clangtools/clangtoolsprojectsettingswidget.h
diff --git a/src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.ui b/src/plugins/clangtools/clangtoolsprojectsettingswidget.ui
similarity index 100%
rename from src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.ui
rename to src/plugins/clangtools/clangtoolsprojectsettingswidget.ui