diff --git a/share/qtcreator/templates/wizards/qml-extension/wizard.xml b/share/qtcreator/templates/wizards/qml-extension/wizard.xml
index 3cef198b3e3a08be39fa091435fb185d1a70d953..d5239ec5842a5daab36075af455fe2f1d97bee7c 100644
--- a/share/qtcreator/templates/wizards/qml-extension/wizard.xml
+++ b/share/qtcreator/templates/wizards/qml-extension/wizard.xml
@@ -40,7 +40,7 @@ leave room for the Qt 4 target page.
 -->
 <wizard version="1" kind="project"
         class="qt4project" firstpage="10"
-        id="QmlExtensionPlugin" category="F.Projects">
+        id="QmlExtensionPlugin" category="C.Projects">
     <icon>lib.png</icon>
     <description>Creates a C++ plugin that makes it possible to offer extensions that can be loaded dynamically into applications using the QDeclarativeEngine class.</description>
     <displayname>Custom QML Extension Plugin</displayname>
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
index cfab8ca3d6a6f0063dd9cf622ff4c02eaf1508aa..20891aea8b5106a16fd106554e7b1d99093f359c 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -70,7 +70,7 @@ Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters()
     Core::BaseFileWizardParameters parameters(ProjectWizard);
     parameters.setIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::QML_WIZARD_ICON)));
     parameters.setDisplayName(tr("Qt Quick UI"));
-    parameters.setId(QLatin1String("QA.QML Application"));
+    parameters.setId(QLatin1String("QB.QML Application"));
 
     parameters.setDescription(tr("Creates a  Qt Quick UI project with a single "
         "QML file that contains the main view.\n\n"
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
index 8a39b1fd3f27c0dfaffaa03fd863a02fcb1c5fcf..3e10a6b80ffbec0e7cdd2b7f748fda6fb533dfe6 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
@@ -97,12 +97,12 @@ const char * const QTVERSION_SETTINGS_PAGE_ID = "Qt Versions";
 const char * const QTVERSION_SETTINGS_PAGE_NAME = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt Versions");
 
 // C++ wizard categories
-const char * const QT_APP_WIZARD_CATEGORY = "C.QtApplicationProjects";
+const char * const QT_APP_WIZARD_CATEGORY = "F.QtApplicationProjects";
 const char * const QT_APP_WIZARD_TR_SCOPE = "Qt4ProjectManager";
-const char * const QT_APP_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt C++ Project");
+const char * const QT_APP_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt QWidget Project");
 
 // QML wizard categories
-const char * const QML_WIZARD_CATEGORY = "F.Projects"; // (after Qt)
+const char * const QML_WIZARD_CATEGORY = "C.Projects"; // (before Qt)
 const char * const QML_WIZARD_TR_SCOPE = "QmlProjectManager";
 const char * const QML_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("QmlProjectManager", "Qt Quick Project");
 const char * const QML_WIZARD_ICON = ":/qmlproject/images/qml_wizard.png";
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
index d5e0257b3e03b81ab495e5dfae519ae059e0f3ed..6a4f8589207a79c2ff964e07bd4f3710d5453ae9 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
@@ -36,6 +36,7 @@
 #include "consoleappwizarddialog.h"
 #include "qt4projectmanagerconstants.h"
 
+#include <projectexplorer/projectexplorerconstants.h>
 #include <cpptools/abstracteditorsupport.h>
 
 #include <QtGui/QIcon>
@@ -57,9 +58,9 @@ namespace Internal {
 
 ConsoleAppWizard::ConsoleAppWizard()
   : QtWizard(QLatin1String("E.Qt4Core"),
-             QLatin1String(Constants::QT_APP_WIZARD_CATEGORY),
-             QLatin1String(Constants::QT_APP_WIZARD_TR_SCOPE),
-             QLatin1String(Constants::QT_APP_WIZARD_TR_CATEGORY),
+             QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY),
+             QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_SCOPE),
+             QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_TR_CATEGORY),
              tr("Qt Console Application"),
              tr("Creates a project containing a single main.cpp file with a stub implementation.\n\n"
                 "Preselects a desktop Qt for building the application if available."),