diff --git a/src/plugins/clangtools/clangtools.qbs b/src/plugins/clangtools/clangtools.qbs
index d2c1e724fca..5466393d046 100644
--- a/src/plugins/clangtools/clangtools.qbs
+++ b/src/plugins/clangtools/clangtools.qbs
@@ -1,7 +1,7 @@
 import qbs
 
 QtcPlugin {
-    name: "ClangStaticAnalyzer"
+    name: "ClangTools"
 
     Depends { name: "Debugger" }
     Depends { name: "Core" }
@@ -19,6 +19,7 @@ QtcPlugin {
     ]
 
     files: [
+        "clangstaticanalyzer_global.h",
         "clangstaticanalyzerconfigwidget.cpp",
         "clangstaticanalyzerconfigwidget.h",
         "clangstaticanalyzerconfigwidget.ui",
@@ -31,8 +32,6 @@ QtcPlugin {
         "clangstaticanalyzerdiagnosticview.h",
         "clangstaticanalyzerlogfilereader.cpp",
         "clangstaticanalyzerlogfilereader.h",
-        "clangstaticanalyzerplugin.cpp",
-        "clangstaticanalyzerplugin.h",
         "clangstaticanalyzerprojectsettings.cpp",
         "clangstaticanalyzerprojectsettings.h",
         "clangstaticanalyzerprojectsettingsmanager.cpp",
@@ -50,7 +49,8 @@ QtcPlugin {
         "clangstaticanalyzertool.h",
         "clangstaticanalyzerutils.cpp",
         "clangstaticanalyzerutils.h",
-        "clangstaticanalyzer_global.h",
+        "clangtoolsplugin.cpp",
+        "clangtoolsplugin.h",
     ]
 
     Group {
diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs
index 2387ecd3ec4..17af43d2ba9 100644
--- a/src/plugins/plugins.qbs
+++ b/src/plugins/plugins.qbs
@@ -15,7 +15,7 @@ Project {
         "clangcodemodel/clangcodemodel.qbs",
         "clangpchmanager/clangpchmanager.qbs",
         "clangrefactoring/clangrefactoring.qbs",
-        "clangstaticanalyzer/clangstaticanalyzer.qbs",
+        "clangtools/clangtools.qbs",
         "classview/classview.qbs",
         "clearcase/clearcase.qbs",
         "cmakeprojectmanager/cmakeprojectmanager.qbs",
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index d5a129dd0f4..2a9abfc538b 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -4,7 +4,7 @@ SUBDIRS += \
     algorithm \
     aggregation \
     changeset \
-    clangstaticanalyzer \
+    clangtools \
     cplusplus \
     debugger \
     diff \
diff --git a/tests/auto/auto.qbs b/tests/auto/auto.qbs
index 26c08fec8eb..a61bacaa5cd 100644
--- a/tests/auto/auto.qbs
+++ b/tests/auto/auto.qbs
@@ -7,7 +7,7 @@ Project {
         "aggregation/aggregation.qbs",
         "algorithm/algorithm.qbs",
         "changeset/changeset.qbs",
-        "clangstaticanalyzer/clangstaticanalyzer.qbs",
+        "clangtools/clangtools.qbs",
         "cplusplus/cplusplus.qbs",
         "debugger/debugger.qbs",
         "diff/diff.qbs",
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs b/tests/auto/clangtools/clangstaticanalyzerautotest.qbs
similarity index 90%
rename from tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
rename to tests/auto/clangtools/clangstaticanalyzerautotest.qbs
index 5ec34efb84b..fd444596ccd 100644
--- a/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
+++ b/tests/auto/clangtools/clangstaticanalyzerautotest.qbs
@@ -5,6 +5,6 @@ QtcAutotest {
     Depends { name: "Debugger" }
     Depends { name: "Utils" }
 
-    property path pluginDir: project.ide_source_tree + "/src/plugins/clangstaticanalyzer"
+    property path pluginDir: project.ide_source_tree + "/src/plugins/clangtools"
     cpp.includePaths: base.concat(pluginDir + "/..")
 }
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro b/tests/auto/clangtools/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
similarity index 100%
rename from tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
rename to tests/auto/clangtools/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs b/tests/auto/clangtools/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs
similarity index 100%
rename from tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs
rename to tests/auto/clangtools/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist b/tests/auto/clangtools/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist
similarity index 100%
rename from tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist
rename to tests/auto/clangtools/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist b/tests/auto/clangtools/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist
similarity index 100%
rename from tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist
rename to tests/auto/clangtools/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp b/tests/auto/clangtools/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp
similarity index 100%
rename from tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp
rename to tests/auto/clangtools/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro b/tests/auto/clangtools/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
similarity index 100%
rename from tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
rename to tests/auto/clangtools/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs b/tests/auto/clangtools/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs
similarity index 100%
rename from tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs
rename to tests/auto/clangtools/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp b/tests/auto/clangtools/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp
similarity index 100%
rename from tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp
rename to tests/auto/clangtools/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzertest.pri b/tests/auto/clangtools/clangstaticanalyzertest.pri
similarity index 57%
rename from tests/auto/clangstaticanalyzer/clangstaticanalyzertest.pri
rename to tests/auto/clangtools/clangstaticanalyzertest.pri
index 4f4c74ff30d..8d194121e9e 100644
--- a/tests/auto/clangstaticanalyzer/clangstaticanalyzertest.pri
+++ b/tests/auto/clangtools/clangstaticanalyzertest.pri
@@ -2,4 +2,4 @@ QTC_LIB_DEPENDS += utils
 QTC_PLUGIN_DEPENDS += debugger
 include(../qttest.pri)
 
-PLUGINDIR=$$IDE_SOURCE_TREE/src/plugins/clangstaticanalyzer
+PLUGINDIR=$$IDE_SOURCE_TREE/src/plugins/clangtools
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzer.pro b/tests/auto/clangtools/clangtools.pro
similarity index 100%
rename from tests/auto/clangstaticanalyzer/clangstaticanalyzer.pro
rename to tests/auto/clangtools/clangtools.pro
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzer.qbs b/tests/auto/clangtools/clangtools.qbs
similarity index 100%
rename from tests/auto/clangstaticanalyzer/clangstaticanalyzer.qbs
rename to tests/auto/clangtools/clangtools.qbs