diff --git a/share/qtcreator/templates/wizards/projects/consoleapp/wizard.json b/share/qtcreator/templates/wizards/projects/consoleapp/wizard.json
index aa64d12bed2..b54e769d662 100644
--- a/share/qtcreator/templates/wizards/projects/consoleapp/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/consoleapp/wizard.json
@@ -2,10 +2,10 @@
     "version": 1,
     "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qbs.QbsProject", "Qt4ProjectManager.Qt4Project" ],
     "id": "E.QtCore",
-    "category": "F.Application",
+    "category": "D.ApplicationQt",
     "trDescription": "Creates a project containing a single main.cpp file with a stub implementation.\n\nPreselects a desktop Qt for building the application if available.",
     "trDisplayName": "Qt Console Application",
-    "trDisplayCategory": "Application",
+    "trDisplayCategory": "Application (Qt)",
     "icon": "../../global/consoleapplication.png",
     "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ],
     "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0}",
diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/wizard.json
index 33fe0b0abb9..c4aa5421a98 100644
--- a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/wizard.json
@@ -2,10 +2,10 @@
     "version": 1,
     "supportedProjectTypes": [ "PythonProject" ],
     "id": "F.QtForPythonApplicationEmpty",
-    "category": "F.Application",
+    "category": "F.ApplicationPySide",
     "trDescription": "Creates a Qt for Python application that contains only the main code for a QApplication.",
     "trDisplayName": "Qt for Python - Empty",
-    "trDisplayCategory": "Application",
+    "trDisplayCategory": "Application (Qt for Python)",
     "icon": "icon.png",
     "enabled": "%{JS: value('Plugins').indexOf('Python') >= 0}",
 
diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json
index cdbe2bf53f3..cbc85f90674 100644
--- a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json
@@ -2,10 +2,10 @@
     "version": 1,
     "supportedProjectTypes": [ "PythonProject" ],
     "id": "F.QtForPythonApplicationWindow",
-    "category": "F.Application",
+    "category": "F.ApplicationPySide",
     "trDescription": "Creates a Qt for Python application that contains an empty window.",
     "trDisplayName": "Qt for Python - Window",
-    "trDisplayCategory": "Application",
+    "trDisplayCategory": "Application (Qt for Python)",
     "icon": "../icons/icon.png",
     "enabled": "%{JS: value('Plugins').indexOf('Python') >= 0}",
 
diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/qtquickapplication/wizard.json
index a0e7fcef02d..83a34364622 100644
--- a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/qtquickapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/qtquickapplication/wizard.json
@@ -2,10 +2,10 @@
     "version": 1,
     "supportedProjectTypes": [ "PythonProject" ],
     "id": "F.QtQuickQtForPythonApplicationEmpty",
-    "category": "F.Application",
+    "category": "F.ApplicationPySide",
     "trDescription": "Creates a Qt Quick application that contains an empty window.",
     "trDisplayName": "Qt for Python - Qt Quick Application - Empty",
-    "trDisplayCategory": "Application",
+    "trDisplayCategory": "Application (Qt for Python)",
     "icon": "../icons/icon.png",
     "enabled": "%{JS: value('Plugins').indexOf('Python') >= 0}",
 
diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/widget/wizard.json b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/widget/wizard.json
index 3bdfa8459aa..d7b03f0831d 100644
--- a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/widget/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/widget/wizard.json
@@ -2,10 +2,10 @@
     "version": 1,
     "supportedProjectTypes": [ "PythonProject" ],
     "id": "F.QtForPythonApplicationWindowWidget",
-    "category": "F.Application",
+    "category": "F.ApplicationPySide",
     "trDescription": "Creates a Qt for Python application that includes a Qt Designer-based widget (ui file)",
     "trDisplayName": "Qt for Python - Window (UI file)",
-    "trDisplayCategory": "Application",
+    "trDisplayCategory": "Application (Qt for Python)",
     "icon": "../icons/icon.png",
     "enabled": "%{JS: value('Plugins').indexOf('Python') >= 0}",
 
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
index 20feee368c2..38f68550882 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
@@ -2,10 +2,10 @@
     "version": 1,
     "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qbs.QbsProject", "Qt4ProjectManager.Qt4Project" ],
     "id": "U.QtQuickApplicationEmpty",
-    "category": "F.Application",
+    "category": "E.ApplicationQtQuick",
     "trDescription": "Creates a Qt Quick application that contains an empty window.",
     "trDisplayName": "Qt Quick Application - Empty",
-    "trDisplayCategory": "Application",
+    "trDisplayCategory": "Application (Qt Quick)",
     "icon": "icon.png",
     "featuresRequired": [ "QtSupport.Wizards.FeatureQt.5.6" ],
     "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0}",
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
index 0b9a23b714d..576e47d3e8a 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
@@ -2,10 +2,10 @@
     "version": 1,
     "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qbs.QbsProject", "Qt4ProjectManager.Qt4Project" ],
     "id": "V.QtQuickApplicationScroll",
-    "category": "F.Application",
+    "category": "E.ApplicationQtQuick",
     "trDescription": "Creates a Qt Quick Controls application with a ScrollView.",
     "trDisplayName": "Qt Quick Application - Scroll",
-    "trDisplayCategory": "Application",
+    "trDisplayCategory": "Application (Qt Quick)",
     "icon": "icon.png",
     "featuresRequired": [ "QtSupport.Wizards.FeatureQt.5.9" ],
     "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0}",
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
index 012cc1530bd..34eca289d58 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
@@ -2,10 +2,10 @@
     "version": 1,
     "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qbs.QbsProject", "Qt4ProjectManager.Qt4Project" ],
     "id": "V.QtQuickApplicationStack",
-    "category": "F.Application",
+    "category": "E.ApplicationQtQuick",
     "trDescription": "Creates a Qt Quick Controls application with a StackView to display content, and a Drawer and ToolBar for navigation.",
     "trDisplayName": "Qt Quick Application - Stack",
-    "trDisplayCategory": "Application",
+    "trDisplayCategory": "Application (Qt Quick)",
     "icon": "icon.png",
     "featuresRequired": [ "QtSupport.Wizards.FeatureQt.5.7" ],
     "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0}",
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
index 2b8c3f74ee1..5f9a544cfc8 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
@@ -2,10 +2,10 @@
     "version": 1,
     "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qbs.QbsProject", "Qt4ProjectManager.Qt4Project" ],
     "id": "V.QtQuickApplicationSwipe",
-    "category": "F.Application",
+    "category": "E.ApplicationQtQuick",
     "trDescription": "Creates a Qt Quick Controls application with a SwipeView for navigation.",
     "trDisplayName": "Qt Quick Application - Swipe",
-    "trDisplayCategory": "Application",
+    "trDisplayCategory": "Application (Qt Quick)",
     "icon": "icon.png",
     "featuresRequired": [ "QtSupport.Wizards.FeatureQt.5.7" ],
     "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0}",
diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json
index 055299f94dc..a33f0cb563c 100644
--- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json
@@ -2,10 +2,10 @@
     "version": 1,
     "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qt4ProjectManager.Qt4Project", "Qbs.QbsProject" ],
     "id": "C.QtWidgets",
-    "category": "F.Application",
+    "category": "D.ApplicationQt",
     "trDescription": "Creates a Qt application for the desktop. Includes a Qt Designer-based main window.\n\nPreselects a desktop Qt for building the application if available.",
     "trDisplayName": "Qt Widgets Application",
-    "trDisplayCategory": "Application",
+    "trDisplayCategory": "Application (Qt)",
     "icon": "../../global/guiapplication.png",
     "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ],
     "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0}",
diff --git a/src/plugins/mcusupport/wizards/application/wizard.json b/src/plugins/mcusupport/wizards/application/wizard.json
index 5e512f420a4..4e16d17e937 100644
--- a/src/plugins/mcusupport/wizards/application/wizard.json
+++ b/src/plugins/mcusupport/wizards/application/wizard.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
     "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject" ],
-    "id": "A.McuSupportApplication",
-    "category": "F.Application",
+    "id": "M.McuSupportApplication",
+    "category": "D.ApplicationMCU",
     "trDescription": "Creates an Mcu Support application with an empty UI.",
     "trDisplayName": "Mcu Support Application",
-    "trDisplayCategory": "Application",
+    "trDisplayCategory": "Application (Qt for MCU)",
     "icon": "../icon.png",
     "enabled": true,