diff --git a/src/plugins/bookmarks/Bookmarks.json.in b/src/plugins/bookmarks/Bookmarks.json.in
index 77e026727a7..32ccf2418b5 100644
--- a/src/plugins/bookmarks/Bookmarks.json.in
+++ b/src/plugins/bookmarks/Bookmarks.json.in
@@ -12,7 +12,7 @@
                   \"\",
                   \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
     ],
-    \"Category\" : \"Qt Creator\",
+    \"Category\" : \"Core\",
     \"Description\" : \"Bookmarks in text editors.\",
     \"Url\" : \"http://www.qt.io\",
     $$dependencyList
diff --git a/src/plugins/coreplugin/Core.json.in b/src/plugins/coreplugin/Core.json.in
index f3f7d0152b5..8d99923900e 100644
--- a/src/plugins/coreplugin/Core.json.in
+++ b/src/plugins/coreplugin/Core.json.in
@@ -14,7 +14,7 @@
                   \"\",
                   \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
     ],
-    \"Category\" : \"Qt Creator\",
+    \"Category\" : \"Core\",
     \"Description\" : \"The core plugin for the Qt IDE.\",
     \"Url\" : \"http://www.qt.io\",
     \"Arguments\" : [
diff --git a/src/plugins/diffeditor/DiffEditor.json.in b/src/plugins/diffeditor/DiffEditor.json.in
index 76431f02391..0dbbfbd6106 100644
--- a/src/plugins/diffeditor/DiffEditor.json.in
+++ b/src/plugins/diffeditor/DiffEditor.json.in
@@ -12,7 +12,6 @@
                   \"\",
                   \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
     ],
-    \"Category\" : \"Qt Creator\",
     \"Description\" : \"Diff editor component.\",
     \"Url\" : \"http://www.qt.io\",
     $$dependencyList
diff --git a/src/plugins/help/Help.json.in b/src/plugins/help/Help.json.in
index d91c9163ff9..98f79b0b3f0 100644
--- a/src/plugins/help/Help.json.in
+++ b/src/plugins/help/Help.json.in
@@ -12,7 +12,7 @@
                   \"\",
                   \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
     ],
-    \"Category\" : \"Qt Creator\",
+    \"Category\" : \"Core\",
     \"Description\" : \"Help system.\",
     \"Url\" : \"http://www.qt.io\",
     $$dependencyList
diff --git a/src/plugins/imageviewer/ImageViewer.json.in b/src/plugins/imageviewer/ImageViewer.json.in
index e9d0881cafe..239ed0b0fdf 100644
--- a/src/plugins/imageviewer/ImageViewer.json.in
+++ b/src/plugins/imageviewer/ImageViewer.json.in
@@ -12,7 +12,6 @@
                   \"\",
                   \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
     ],
-    \"Category\" : \"Qt Creator\",
     \"Description\" : \"Image Viewer component.\",
     \"Url\" : \"http://www.qt.io\",
     $$dependencyList,
diff --git a/src/plugins/macros/Macros.json.in b/src/plugins/macros/Macros.json.in
index d8cc84ddc5c..cac1bdf1871 100644
--- a/src/plugins/macros/Macros.json.in
+++ b/src/plugins/macros/Macros.json.in
@@ -12,7 +12,6 @@
                   \"\",
                   \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
     ],
-    \"Category\" : \"Qt Creator\",
     \"Description\" : \"Macros in text editors.\",
     \"Url\" : \"http://www.qt.io\",
     $$dependencyList
diff --git a/src/plugins/projectexplorer/ProjectExplorer.json.in b/src/plugins/projectexplorer/ProjectExplorer.json.in
index c94a2b4d44b..6b87ce64a61 100644
--- a/src/plugins/projectexplorer/ProjectExplorer.json.in
+++ b/src/plugins/projectexplorer/ProjectExplorer.json.in
@@ -13,7 +13,7 @@
                   \"\",
                   \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
     ],
-    \"Category\" : \"Qt Creator\",
+    \"Category\" : \"Core\",
     \"Description\" : \"ProjectExplorer framework that can be extended with different kind of project types.\",
     \"Url\" : \"http://www.qt.io\",
     \"Arguments\" : [
diff --git a/src/plugins/texteditor/TextEditor.json.in b/src/plugins/texteditor/TextEditor.json.in
index b91a33fee36..a2aefaf146f 100644
--- a/src/plugins/texteditor/TextEditor.json.in
+++ b/src/plugins/texteditor/TextEditor.json.in
@@ -12,7 +12,7 @@
                   \"\",
                   \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
     ],
-    \"Category\" : \"Qt Creator\",
+    \"Category\" : \"Core\",
     \"Description\" : \"Text editor framework and the implementation of the basic text editor.\",
     \"Url\" : \"http://www.qt.io\",
     $$dependencyList
diff --git a/src/plugins/updateinfo/UpdateInfo.json.in b/src/plugins/updateinfo/UpdateInfo.json.in
index 9b5f3bbf93d..5331281feaf 100644
--- a/src/plugins/updateinfo/UpdateInfo.json.in
+++ b/src/plugins/updateinfo/UpdateInfo.json.in
@@ -13,7 +13,6 @@
                   \"\",
                   \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
     ],
-    \"Category\" : \"Qt Creator\",
     \"Description\" : \"Displays Update-Infos for Qt Installer Framework-based Updaters.\",
     \"Url\" : \"http://www.qt.io\",
     $$dependencyList
diff --git a/src/plugins/welcome/Welcome.json.in b/src/plugins/welcome/Welcome.json.in
index fe9b17c73b1..993c09f983a 100644
--- a/src/plugins/welcome/Welcome.json.in
+++ b/src/plugins/welcome/Welcome.json.in
@@ -12,7 +12,7 @@
                   \"\",
                   \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
     ],
-    \"Category\" : \"Qt Creator\",
+    \"Category\" : \"Core\",
     \"Description\" : \"Secondary Welcome Screen Plugin.\",
     \"Url\" : \"http://www.qt.io\",
     $$dependencyList