diff --git a/share/qtcreator/templates/wizards/cmakeplainc/CMakeLists.txt b/share/qtcreator/templates/wizards/plaincapp-cmake/CMakeLists.txt
similarity index 100%
rename from share/qtcreator/templates/wizards/cmakeplainc/CMakeLists.txt
rename to share/qtcreator/templates/wizards/plaincapp-cmake/CMakeLists.txt
diff --git a/share/qtcreator/templates/wizards/cmakeplainc/console.png b/share/qtcreator/templates/wizards/plaincapp-cmake/console.png
similarity index 100%
rename from share/qtcreator/templates/wizards/cmakeplainc/console.png
rename to share/qtcreator/templates/wizards/plaincapp-cmake/console.png
diff --git a/share/qtcreator/templates/wizards/cmakeplainc/main.c b/share/qtcreator/templates/wizards/plaincapp-cmake/main.c
similarity index 100%
rename from share/qtcreator/templates/wizards/cmakeplainc/main.c
rename to share/qtcreator/templates/wizards/plaincapp-cmake/main.c
diff --git a/share/qtcreator/templates/wizards/cmakeplainc/wizard.xml b/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
similarity index 92%
rename from share/qtcreator/templates/wizards/cmakeplainc/wizard.xml
rename to share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
index 374507dfe47..cb61d13d43d 100644
--- a/share/qtcreator/templates/wizards/cmakeplainc/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincapp-cmake/wizard.xml
@@ -37,10 +37,10 @@ the project file goes last.
 The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
 leave room for the Qt 4 target page.
 -->
-<wizard version="1" kind="project" firstpage="10" id="H.CMake Plain C" category="I.Projects">
+<wizard version="1" kind="project" firstpage="10" id="S.Plain C (CMake)" category="I.Projects">
     <icon>console.png</icon>
     <description>Creates a plain C project using CMake, not using the Qt library.</description>
-    <displayname>CMake Plain C Project</displayname>;
+    <displayname>Plain C Project (CMake Build)</displayname>;
     <displaycategory>Other Project</displaycategory>
     <files>
         <file source="main.c" openeditor="true"/>
diff --git a/share/qtcreator/templates/wizards/cmakeplaincpp/CMakeLists.txt b/share/qtcreator/templates/wizards/plaincppapp-cmake/CMakeLists.txt
similarity index 100%
rename from share/qtcreator/templates/wizards/cmakeplaincpp/CMakeLists.txt
rename to share/qtcreator/templates/wizards/plaincppapp-cmake/CMakeLists.txt
diff --git a/share/qtcreator/templates/wizards/cmakeplaincpp/console.png b/share/qtcreator/templates/wizards/plaincppapp-cmake/console.png
similarity index 100%
rename from share/qtcreator/templates/wizards/cmakeplaincpp/console.png
rename to share/qtcreator/templates/wizards/plaincppapp-cmake/console.png
diff --git a/share/qtcreator/templates/wizards/cmakeplaincpp/main.cpp b/share/qtcreator/templates/wizards/plaincppapp-cmake/main.cpp
similarity index 100%
rename from share/qtcreator/templates/wizards/cmakeplaincpp/main.cpp
rename to share/qtcreator/templates/wizards/plaincppapp-cmake/main.cpp
diff --git a/share/qtcreator/templates/wizards/cmakeplaincpp/wizard.xml b/share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml
similarity index 92%
rename from share/qtcreator/templates/wizards/cmakeplaincpp/wizard.xml
rename to share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml
index 7247004a5ee..c9dd5536515 100644
--- a/share/qtcreator/templates/wizards/cmakeplaincpp/wizard.xml
+++ b/share/qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml
@@ -37,10 +37,10 @@ the project file goes last.
 The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
 leave room for the Qt 4 target page.
 -->
-<wizard version="1" kind="project" firstpage="10" id="H.CMake Plain C++" category="I.Projects">
+<wizard version="1" kind="project" firstpage="10" id="S.Plain C++ (CMake)" category="I.Projects">
     <icon>console.png</icon>
     <description>Creates a plain C++ project using CMake, not using the Qt library.</description>
-    <displayname>CMake Plain C++ Project</displayname>;
+    <displayname>Plain C++ Project (CMake Build)</displayname>;
     <displaycategory>Other Project</displaycategory>
     <files>
         <file source="main.cpp" openeditor="true"/>