Qt4ProjectManager: Rename the "normal" qt4* files to qmake*

Change-Id: I5e173900a4008c72c67a30eaa9c101027c1b43af
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>

75 files changed, 205 insertions, 205 deletions

diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index bc56c6f688..f623b7e1b6 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -43,9 +43,9 @@
 
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4nodes.h>
-#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
+#include <qt4projectmanager/qmakenodes.h>
+#include <qt4projectmanager/qmakeproject.h>
 #include <qtsupport/qtkitinformation.h>
 
 #include <QDir>
diff --git a/src/plugins/android/androiddeployconfiguration.cpp b/src/plugins/android/androiddeployconfiguration.cpp
index 01577311fd..1dfac6e0d8 100644
--- a/src/plugins/android/androiddeployconfiguration.cpp
+++ b/src/plugins/android/androiddeployconfiguration.cpp
@@ -39,7 +39,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
 
-#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qmakeproject.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
 
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index ecd3a95d2f..f4df82f528 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -45,9 +45,9 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/project.h>
 #include <qtsupport/qtkitinformation.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 #include <QInputDialog>
 #include <QMessageBox>
 
diff --git a/src/plugins/android/androiddeployqtwidget.cpp b/src/plugins/android/androiddeployqtwidget.cpp
index bf760dc7c4..d7c4c3885b 100644
--- a/src/plugins/android/androiddeployqtwidget.cpp
+++ b/src/plugins/android/androiddeployqtwidget.cpp
@@ -38,9 +38,9 @@
 #include "androidextralibrarylistmodel.h"
 
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 
 #include <QFileDialog>
 
diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp
index 446207da85..3fadfce5fe 100644
--- a/src/plugins/android/androiddeploystep.cpp
+++ b/src/plugins/android/androiddeploystep.cpp
@@ -44,9 +44,9 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 
 #include <qtsupport/qtkitinformation.h>
 
diff --git a/src/plugins/android/androidextralibrarylistmodel.cpp b/src/plugins/android/androidextralibrarylistmodel.cpp
index c0912fd317..8d51017866 100644
--- a/src/plugins/android/androidextralibrarylistmodel.cpp
+++ b/src/plugins/android/androidextralibrarylistmodel.cpp
@@ -29,8 +29,8 @@
 ****************************************************************************/
 
 #include "androidextralibrarylistmodel.h"
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 
 using namespace Android;
 using namespace Internal;
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index b6f2359eb4..75888288a7 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -42,10 +42,10 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4nodes.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qmakenodes.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakeprojectmanagerconstants.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
 #include <qtsupport/customexecutablerunconfiguration.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index db4af083ee..35cfc45153 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -44,7 +44,7 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/kitinformation.h>
 #include <texteditor/texteditoractionhandler.h>
-#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qmakeproject.h>
 
 #include <QLineEdit>
 #include <QFileInfo>
diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp
index 7b14cb38aa..285f7b3ee5 100644
--- a/src/plugins/android/androidpackagecreationstep.cpp
+++ b/src/plugins/android/androidpackagecreationstep.cpp
@@ -42,9 +42,9 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 #include <qtsupport/qtkitinformation.h>
 
 #include <coreplugin/icore.h>
diff --git a/src/plugins/android/androidpackagecreationwidget.cpp b/src/plugins/android/androidpackagecreationwidget.cpp
index 529b581f23..57f885e8c5 100644
--- a/src/plugins/android/androidpackagecreationwidget.cpp
+++ b/src/plugins/android/androidpackagecreationwidget.cpp
@@ -41,7 +41,7 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
 #include <qt4projectmanager/qmakestep.h>
 
 #include <QTimer>
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp
index a9bc897e22..b31af28d3c 100644
--- a/src/plugins/android/androidqtversion.cpp
+++ b/src/plugins/android/androidqtversion.cpp
@@ -35,8 +35,8 @@
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
 
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakeprojectmanagerconstants.h>
 
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp
index c1064d85b0..5625358d84 100644
--- a/src/plugins/android/androidrunconfiguration.cpp
+++ b/src/plugins/android/androidrunconfiguration.cpp
@@ -37,8 +37,8 @@
 #include <projectexplorer/target.h>
 #include <qtsupport/qtoutputformatter.h>
 #include <qtsupport/qtkitinformation.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/android/androidrunfactories.cpp b/src/plugins/android/androidrunfactories.cpp
index f278ce3225..170b860318 100644
--- a/src/plugins/android/androidrunfactories.cpp
+++ b/src/plugins/android/androidrunfactories.cpp
@@ -40,8 +40,8 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <debugger/debuggerconstants.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 #include <qtsupport/customexecutablerunconfiguration.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp
index 928879e621..6a7912b6db 100644
--- a/src/plugins/android/createandroidmanifestwizard.cpp
+++ b/src/plugins/android/createandroidmanifestwizard.cpp
@@ -30,8 +30,8 @@
 #include "createandroidmanifestwizard.h"
 
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 #include <proparser/prowriter.h>
 #include <QComboBox>
 #include <QFormLayout>
diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp
index 04b35f7a64..c20006a0ad 100644
--- a/src/plugins/ios/iosbuildstep.cpp
+++ b/src/plugins/ios/iosbuildstep.cpp
@@ -43,11 +43,11 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/gcctoolchain.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
-#include <qt4projectmanager/qt4projectmanager.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
+#include <qt4projectmanager/qmakeprojectmanagerconstants.h>
+#include <qt4projectmanager/qmakeprojectmanager.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtparser.h>
 #include <coreplugin/variablemanager.h>
diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp
index 580095be0c..a2890c84ef 100644
--- a/src/plugins/ios/iosdebugsupport.cpp
+++ b/src/plugins/ios/iosdebugsupport.cpp
@@ -39,9 +39,9 @@
 #include <debugger/debuggerstartparameters.h>
 
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4nodes.h>
-#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
+#include <qt4projectmanager/qmakenodes.h>
+#include <qt4projectmanager/qmakeproject.h>
 #include <qtsupport/qtkitinformation.h>
 
 #include <QDir>
diff --git a/src/plugins/ios/iosdeployconfiguration.cpp b/src/plugins/ios/iosdeployconfiguration.cpp
index c87b9f04f9..ef54b45ac4 100644
--- a/src/plugins/ios/iosdeployconfiguration.cpp
+++ b/src/plugins/ios/iosdeployconfiguration.cpp
@@ -35,7 +35,7 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/target.h>
 
-#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qmakeproject.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
 
diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp
index b58fff46ce..7c6e201f9f 100644
--- a/src/plugins/ios/iosdeploystep.cpp
+++ b/src/plugins/ios/iosdeploystep.cpp
@@ -39,9 +39,9 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 
 #include <qtsupport/qtkitinformation.h>
 
diff --git a/src/plugins/ios/iosmanager.cpp b/src/plugins/ios/iosmanager.cpp
index f8a95b1346..263aa13798 100644
--- a/src/plugins/ios/iosmanager.cpp
+++ b/src/plugins/ios/iosmanager.cpp
@@ -35,10 +35,10 @@
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
-#include <qt4projectmanager/qt4nodes.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qmakenodes.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakeprojectmanagerconstants.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
 #include <qtsupport/customexecutablerunconfiguration.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp
index cbefa20a78..352a7c8b69 100644
--- a/src/plugins/ios/iosqtversion.cpp
+++ b/src/plugins/ios/iosqtversion.cpp
@@ -35,8 +35,8 @@
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
 
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakeprojectmanagerconstants.h>
 
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index cb6b574348..5c07d65594 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -36,9 +36,9 @@
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/buildstep.h>
 #include <projectexplorer/buildsteplist.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 #include <qtsupport/qtoutputformatter.h>
 #include <qtsupport/qtkitinformation.h>
 #include "ui_iosrunconfiguration.h"
diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp
index 3b46b3e7f3..5f9acfb5e3 100644
--- a/src/plugins/ios/iosrunfactories.cpp
+++ b/src/plugins/ios/iosrunfactories.cpp
@@ -39,8 +39,8 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <debugger/debuggerconstants.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 #include <qtsupport/customexecutablerunconfiguration.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
diff --git a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
index 2640728043..da2ab6750e 100644
--- a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
@@ -35,8 +35,8 @@
 #include <projectexplorer/customwizard/customwizard.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakeprojectmanagerconstants.h>
 #include <qtsupport/qtkitinformation.h>
 
 #include "qmlprojectmanager.h"
diff --git a/src/plugins/qnx/blackberryapplicationrunner.cpp b/src/plugins/qnx/blackberryapplicationrunner.cpp
index a85d6db371..7e2ed84025 100644
--- a/src/plugins/qnx/blackberryapplicationrunner.cpp
+++ b/src/plugins/qnx/blackberryapplicationrunner.cpp
@@ -37,7 +37,7 @@
 #include "qnxconstants.h"
 
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
 #include <ssh/sshremoteprocessrunner.h>
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/qnx/blackberrycreatepackagestep.cpp b/src/plugins/qnx/blackberrycreatepackagestep.cpp
index 644c1f7c1f..09b5bd24d1 100644
--- a/src/plugins/qnx/blackberrycreatepackagestep.cpp
+++ b/src/plugins/qnx/blackberrycreatepackagestep.cpp
@@ -44,9 +44,9 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/runconfiguration.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4nodes.h>
-#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
+#include <qt4projectmanager/qmakenodes.h>
+#include <qt4projectmanager/qmakeproject.h>
 #include <qtsupport/qtkitinformation.h>
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/qnx/blackberrydeployconfiguration.cpp b/src/plugins/qnx/blackberrydeployconfiguration.cpp
index e927c508c3..64f3f8ceaa 100644
--- a/src/plugins/qnx/blackberrydeployconfiguration.cpp
+++ b/src/plugins/qnx/blackberrydeployconfiguration.cpp
@@ -38,9 +38,9 @@
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/projectexplorer.h>
-#include <qt4projectmanager/qt4nodes.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qmakenodes.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
 #include <qtsupport/qtkitinformation.h>
 #include <coreplugin/icore.h>
 #include <ssh/sshconnection.h>
diff --git a/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp b/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp
index e671cc0eef..03e51a24d7 100644
--- a/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp
+++ b/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp
@@ -41,7 +41,7 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qmakeproject.h>
 #include <remotelinux/genericdirectuploadstep.h>
 
 using namespace Qnx;
diff --git a/src/plugins/qnx/blackberrydeployinformation.cpp b/src/plugins/qnx/blackberrydeployinformation.cpp
index 61176fa995..b02a44fc1a 100644
--- a/src/plugins/qnx/blackberrydeployinformation.cpp
+++ b/src/plugins/qnx/blackberrydeployinformation.cpp
@@ -34,8 +34,8 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakenodes.h>
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
 
diff --git a/src/plugins/qnx/blackberrydeploystep.cpp b/src/plugins/qnx/blackberrydeploystep.cpp
index b9b0509cb6..286fdd7c51 100644
--- a/src/plugins/qnx/blackberrydeploystep.cpp
+++ b/src/plugins/qnx/blackberrydeploystep.cpp
@@ -39,7 +39,7 @@
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
 #include <utils/qtcassert.h>
 #include <ssh/sshconnection.h>
 
diff --git a/src/plugins/qnx/blackberryrunconfigurationfactory.cpp b/src/plugins/qnx/blackberryrunconfigurationfactory.cpp
index a1a493f125..2f18cad99a 100644
--- a/src/plugins/qnx/blackberryrunconfigurationfactory.cpp
+++ b/src/plugins/qnx/blackberryrunconfigurationfactory.cpp
@@ -36,7 +36,7 @@
 
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qmakeproject.h>
 
 using namespace Qnx;
 using namespace Qnx::Internal;
diff --git a/src/plugins/qnx/blackberryruncontrolfactory.cpp b/src/plugins/qnx/blackberryruncontrolfactory.cpp
index a48482bc70..9060d9ce33 100644
--- a/src/plugins/qnx/blackberryruncontrolfactory.cpp
+++ b/src/plugins/qnx/blackberryruncontrolfactory.cpp
@@ -46,7 +46,7 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qmakebuildconfiguration.h>
 #include <qtsupport/qtkitinformation.h>
 
 using namespace Qnx;
diff --git a/src/plugins/qnx/qnxrunconfigurationfactory.cpp b/src/plugins/qnx/qnxrunconfigurationfactory.cpp
index c723bc2228..ad85c5146d 100644
--- a/src/plugins/qnx/qnxrunconfigurationfactory.cpp
+++ b/src/plugins/qnx/qnxrunconfigurationfactory.cpp
@@ -37,7 +37,7 @@
 
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qmakeproject.h>
 
 using namespace Qnx;
 using namespace Qnx::Internal;
diff --git a/src/plugins/qt4projectmanager/externaleditors.cpp b/src/plugins/qt4projectmanager/externaleditors.cpp
index 78f10f3844..0915056bd6 100644
--- a/src/plugins/qt4projectmanager/externaleditors.cpp
+++ b/src/plugins/qt4projectmanager/externaleditors.cpp
@@ -28,8 +28,8 @@
 ****************************************************************************/
 
 #include "externaleditors.h"
-#include "qt4project.h"
-#include "qt4projectmanagerconstants.h"
+#include "qmakeproject.h"
+#include "qmakeprojectmanagerconstants.h"
 
 #include <utils/hostosinfo.h>
 #include <utils/synchronousprocess.h>
diff --git a/src/plugins/qt4projectmanager/findqt4profiles.cpp b/src/plugins/qt4projectmanager/findqmakeprofiles.cpp
index 89f4f30177..286c1030b1 100644
--- a/src/plugins/qt4projectmanager/findqt4profiles.cpp
+++ b/src/plugins/qt4projectmanager/findqmakeprofiles.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "findqt4profiles.h"
-#include "qt4nodes.h"
+#include "findqmakeprofiles.h"
+#include "qmakenodes.h"
 
 using namespace QmakeProjectManager;
 using namespace QmakeProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/findqt4profiles.h b/src/plugins/qt4projectmanager/findqmakeprofiles.h
index a9defa62f1..a9defa62f1 100644
--- a/src/plugins/qt4projectmanager/findqt4profiles.h
+++ b/src/plugins/qt4projectmanager/findqmakeprofiles.h
diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
index 61d3434529..ab0a59d5d4 100644
--- a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
+++ b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
@@ -29,9 +29,9 @@
 
 #include "librarydetailscontroller.h"
 #include "ui_librarydetailswidget.h"
-#include "findqt4profiles.h"
-#include "qt4nodes.h"
-#include "qt4buildconfiguration.h"
+#include "findqmakeprofiles.h"
+#include "qmakenodes.h"
+#include "qmakebuildconfiguration.h"
 
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index ce30d6a902..edc86073f5 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -31,10 +31,10 @@
 #include "ui_makestep.h"
 
 #include "qmakeparser.h"
-#include "qt4project.h"
-#include "qt4nodes.h"
-#include "qt4buildconfiguration.h"
-#include "qt4projectmanagerconstants.h"
+#include "qmakeproject.h"
+#include "qmakenodes.h"
+#include "qmakebuildconfiguration.h"
+#include "qmakeprojectmanagerconstants.h"
 
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index 059e07563a..e0b5e657b3 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -30,7 +30,7 @@
 #ifndef MAKESTEP_H
 #define MAKESTEP_H
 
-#include "qt4projectmanager_global.h"
+#include "qmakeprojectmanager_global.h"
 
 #include <projectexplorer/abstractprocessstep.h>
 
diff --git a/src/plugins/qt4projectmanager/profilecompletionassist.cpp b/src/plugins/qt4projectmanager/profilecompletionassist.cpp
index b1a4773adb..1c822c239e 100644
--- a/src/plugins/qt4projectmanager/profilecompletionassist.cpp
+++ b/src/plugins/qt4projectmanager/profilecompletionassist.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "profilecompletionassist.h"
-#include "qt4projectmanagerconstants.h"
+#include "qmakeprojectmanagerconstants.h"
 
 #include <texteditor/codeassist/keywordscompletionassist.h>
 
diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp
index fafa799ce8..230cff4440 100644
--- a/src/plugins/qt4projectmanager/profileeditor.cpp
+++ b/src/plugins/qt4projectmanager/profileeditor.cpp
@@ -30,7 +30,7 @@
 #include "profileeditor.h"
 
 #include "profilehighlighter.h"
-#include "qt4projectmanagerconstants.h"
+#include "qmakeprojectmanagerconstants.h"
 #include "profileeditorfactory.h"
 #include "profilecompletionassist.h"
 
diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
index 5867dc6c32..fa6d37c264 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
@@ -29,8 +29,8 @@
 
 #include "profileeditorfactory.h"
 
-#include "qt4projectmanager.h"
-#include "qt4projectmanagerconstants.h"
+#include "qmakeprojectmanager.h"
+#include "qmakeprojectmanagerconstants.h"
 #include "profileeditor.h"
 
 #include <qtsupport/qtsupportconstants.h>
diff --git a/src/plugins/qt4projectmanager/profilehighlighterfactory.cpp b/src/plugins/qt4projectmanager/profilehighlighterfactory.cpp
index 3ca96d15a2..04544b5592 100644
--- a/src/plugins/qt4projectmanager/profilehighlighterfactory.cpp
+++ b/src/plugins/qt4projectmanager/profilehighlighterfactory.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "profilehighlighterfactory.h"
-#include "qt4projectmanagerconstants.h"
+#include "qmakeprojectmanagerconstants.h"
 #include "profilehighlighter.h"
 
 using namespace QmakeProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qmakebuildconfiguration.cpp
index c9cd53f544..fd4304005a 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qmakebuildconfiguration.cpp
@@ -27,14 +27,14 @@
 **
 ****************************************************************************/
 
-#include "qt4buildconfiguration.h"
+#include "qmakebuildconfiguration.h"
 
 #include "qmakebuildinfo.h"
 #include "qmakekitinformation.h"
-#include "qt4project.h"
-#include "qt4projectconfigwidget.h"
-#include "qt4projectmanagerconstants.h"
-#include "qt4nodes.h"
+#include "qmakeproject.h"
+#include "qmakeprojectconfigwidget.h"
+#include "qmakeprojectmanagerconstants.h"
+#include "qmakenodes.h"
 #include "qmakestep.h"
 #include "makestep.h"
 
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qmakebuildconfiguration.h
index f7458bfbc0..1a7bcd5e1c 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qmakebuildconfiguration.h
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
-#ifndef QT4BUILDCONFIGURATION_H
-#define QT4BUILDCONFIGURATION_H
+#ifndef QMAKEBUILDCONFIGURATION_H
+#define QMAKEBUILDCONFIGURATION_H
 
-#include "qt4projectmanager_global.h"
+#include "qmakeprojectmanager_global.h"
 
 #include <projectexplorer/buildconfiguration.h>
 #include <qtsupport/baseqtversion.h>
@@ -187,4 +187,4 @@ private:
 
 } // namespace QmakeProjectManager
 
-#endif // QT4BUILDCONFIGURATION_H
+#endif // QMAKEBUILDCONFIGURATION_H
diff --git a/src/plugins/qt4projectmanager/qmakebuildinfo.h b/src/plugins/qt4projectmanager/qmakebuildinfo.h
index e3803d1411..9dab7ab528 100644
--- a/src/plugins/qt4projectmanager/qmakebuildinfo.h
+++ b/src/plugins/qt4projectmanager/qmakebuildinfo.h
@@ -30,7 +30,7 @@
 #ifndef QMAKEBUILDINFO_H
 #define QMAKEBUILDINFO_H
 
-#include "qt4buildconfiguration.h"
+#include "qmakebuildconfiguration.h"
 
 #include <projectexplorer/buildinfo.h>
 #include <projectexplorer/kitmanager.h>
diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.h b/src/plugins/qt4projectmanager/qmakekitinformation.h
index 6bd695c68f..25d91bc4f7 100644
--- a/src/plugins/qt4projectmanager/qmakekitinformation.h
+++ b/src/plugins/qt4projectmanager/qmakekitinformation.h
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
-#ifndef QT4PM_QMAKEKITINFORMATION_H
-#define QT4PM_QMAKEKITINFORMATION_H
+#ifndef QMAKEKITINFORMATION_H
+#define QMAKEKITINFORMATION_H
 
-#include "qt4projectmanager_global.h"
+#include "qmakeprojectmanager_global.h"
 
 #include <projectexplorer/kitmanager.h>
 
@@ -61,4 +61,4 @@ public:
 
 } // namespace QmakeProjectManager
 
-#endif // QT4PM_QMAKEKITINFORMATION_H
+#endif // QMAKEKITINFORMATION_H
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qmakenodes.cpp
index e44f0b56ac..95ed6dca2b 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qmakenodes.cpp
@@ -27,11 +27,11 @@
 **
 ****************************************************************************/
 
-#include "qt4nodes.h"
-#include "qt4project.h"
-#include "qt4projectmanager.h"
-#include "qt4projectmanagerconstants.h"
-#include "qt4buildconfiguration.h"
+#include "qmakenodes.h"
+#include "qmakeproject.h"
+#include "qmakeprojectmanager.h"
+#include "qmakeprojectmanagerconstants.h"
+#include "qmakebuildconfiguration.h"
 #include "qmakerunconfigurationfactory.h"
 
 #include <projectexplorer/nodesvisitor.h>
@@ -82,10 +82,10 @@ struct FileTypeDataStorage {
 static const FileTypeDataStorage fileTypeDataStorage[] = {
     { ProjectExplorer::HeaderType,
       QT_TRANSLATE_NOOP("QmakeProjectManager::Qt4PriFileNode", "Headers"),
-      ":/qt4projectmanager/images/headers.png" },
+      ":/qmakeprojectmanager/images/headers.png" },
     { ProjectExplorer::SourceType,
       QT_TRANSLATE_NOOP("QmakeProjectManager::Qt4PriFileNode", "Sources"),
-      ":/qt4projectmanager/images/sources.png" },
+      ":/qmakeprojectmanager/images/sources.png" },
     { ProjectExplorer::FormType,
       QT_TRANSLATE_NOOP("QmakeProjectManager::Qt4PriFileNode", "Forms"),
       ":/qtsupport/images/forms.png" },
@@ -97,7 +97,7 @@ static const FileTypeDataStorage fileTypeDataStorage[] = {
       ":/qtsupport/images/qml.png" },
     { ProjectExplorer::UnknownFileType,
       QT_TRANSLATE_NOOP("QmakeProjectManager::Qt4PriFileNode", "Other files"),
-      ":/qt4projectmanager/images/unknown.png" }
+      ":/qmakeprojectmanager/images/unknown.png" }
 };
 
 bool sortNodesByPath(ProjectExplorer::Node *a, ProjectExplorer::Node *b)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qmakenodes.h
index a38d1f2573..3f83c72712 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qmakenodes.h
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
-#ifndef QT4NODES_H
-#define QT4NODES_H
+#ifndef QMAKENODES_H
+#define QMAKENODES_H
 
-#include "qt4projectmanager_global.h"
+#include "qmakeprojectmanager_global.h"
 
 #include <coreplugin/idocument.h>
 #include <projectexplorer/projectnodes.h>
@@ -464,4 +464,4 @@ private:
 
 } // namespace QmakeProjectManager
 
-#endif // QT4NODES_H
+#endif // QMAKENODES_H
diff --git a/src/plugins/qt4projectmanager/qmakeparser.cpp b/src/plugins/qt4projectmanager/qmakeparser.cpp
index 61fa3e872e..d049d3d3f8 100644
--- a/src/plugins/qt4projectmanager/qmakeparser.cpp
+++ b/src/plugins/qt4projectmanager/qmakeparser.cpp
@@ -88,7 +88,7 @@ void QMakeParser::stdError(const QString &line)
 #ifdef WITH_TESTS
 #   include <QTest>
 
-#   include "qt4projectmanagerplugin.h"
+#   include "qmakeprojectmanagerplugin.h"
 
 #   include "projectexplorer/outputparser_test.h"
 
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qmakeproject.cpp
index 3812a8e8b6..a14cad7f07 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qmakeproject.cpp
@@ -27,19 +27,19 @@
 **
 ****************************************************************************/
 
-#include "qt4project.h"
+#include "qmakeproject.h"
 
-#include "qt4projectmanager.h"
+#include "qmakeprojectmanager.h"
 #include "qmakeprojectimporter.h"
 #include "qmakebuildinfo.h"
 #include "qmakestep.h"
-#include "qt4nodes.h"
-#include "qt4projectmanagerconstants.h"
-#include "qt4buildconfiguration.h"
-#include "findqt4profiles.h"
-#include "qt4projectmanager/wizards/abstractmobileapp.h"
-#include "qt4projectmanager/wizards/qtquickapp.h"
-#include "qt4projectmanager/wizards/html5app.h"
+#include "qmakenodes.h"
+#include "qmakeprojectmanagerconstants.h"
+#include "qmakebuildconfiguration.h"
+#include "findqmakeprofiles.h"
+#include "wizards/abstractmobileapp.h"
+#include "wizards/qtquickapp.h"
+#include "wizards/html5app.h"
 
 #include <coreplugin/icontext.h>
 #include <coreplugin/progressmanager/progressmanager.h>
@@ -1637,4 +1637,4 @@ KitMatcher *Qt4Project::createRequiredKitMatcher() const
 
 } // namespace QmakeProjectManager
 
-#include "qt4project.moc"
+#include "qmakeproject.moc"
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qmakeproject.h
index ecd1d69a3c..8493ddfebe 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qmakeproject.h
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
-#ifndef QT4PROJECT_H
-#define QT4PROJECT_H
+#ifndef QMAKEPROJECT_H
+#define QMAKEPROJECT_H
 
-#include "qt4projectmanager_global.h"
+#include "qmakeprojectmanager_global.h"
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectnodes.h>
@@ -225,4 +225,4 @@ private:
 } // namespace QmakeProjectManager
 
 
-#endif // QT4PROJECT_H
+#endif // QMAKEPROJECT_H
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qmakeprojectconfigwidget.cpp
index aa70f654c5..228ea13d2c 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qmakeprojectconfigwidget.cpp
@@ -27,12 +27,12 @@
 **
 ****************************************************************************/
 
-#include "qt4projectconfigwidget.h"
+#include "qmakeprojectconfigwidget.h"
 
-#include "qt4project.h"
-#include "qt4buildconfiguration.h"
-#include "qt4nodes.h"
-#include "ui_qt4projectconfigwidget.h"
+#include "qmakeproject.h"
+#include "qmakebuildconfiguration.h"
+#include "qmakenodes.h"
+#include "ui_qmakeprojectconfigwidget.h"
 
 #include <projectexplorer/target.h>
 #include <qtsupport/qtkitinformation.h>
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h b/src/plugins/qt4projectmanager/qmakeprojectconfigwidget.h
index 90040f68b7..90040f68b7 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
+++ b/src/plugins/qt4projectmanager/qmakeprojectconfigwidget.h
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui b/src/plugins/qt4projectmanager/qmakeprojectconfigwidget.ui
index cef43d4129..cef43d4129 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
+++ b/src/plugins/qt4projectmanager/qmakeprojectconfigwidget.ui
diff --git a/src/plugins/qt4projectmanager/qmakeprojectimporter.cpp b/src/plugins/qt4projectmanager/qmakeprojectimporter.cpp
index 68d92d35f1..5426fcde27 100644
--- a/src/plugins/qt4projectmanager/qmakeprojectimporter.cpp
+++ b/src/plugins/qt4projectmanager/qmakeprojectimporter.cpp
@@ -31,8 +31,8 @@
 
 #include "qmakebuildinfo.h"
 #include "qmakekitinformation.h"
-#include "qt4buildconfiguration.h"
-#include "qt4project.h"
+#include "qmakebuildconfiguration.h"
+#include "qmakeproject.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qmakeprojectmanager.cpp
index bd8e07a112..54ffd30305 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp
+++ b/src/plugins/qt4projectmanager/qmakeprojectmanager.cpp
@@ -27,15 +27,15 @@
 **
 ****************************************************************************/
 
-#include "qt4projectmanager.h"
+#include "qmakeprojectmanager.h"
 
-#include "qt4projectmanagerconstants.h"
-#include "qt4projectmanagerplugin.h"
-#include "qt4nodes.h"
-#include "qt4project.h"
+#include "qmakeprojectmanagerconstants.h"
+#include "qmakeprojectmanagerplugin.h"
+#include "qmakenodes.h"
+#include "qmakeproject.h"
 #include "profileeditor.h"
 #include "qmakestep.h"
-#include "qt4buildconfiguration.h"
+#include "qmakebuildconfiguration.h"
 #include "addlibrarywizard.h"
 #include "wizards/qtquickapp.h"
 #include "wizards/html5app.h"
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.h b/src/plugins/qt4projectmanager/qmakeprojectmanager.h
index 82df6646b6..4e76d347fd 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.h
+++ b/src/plugins/qt4projectmanager/qmakeprojectmanager.h
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
-#ifndef QT4PROJECTMANAGER_H
-#define QT4PROJECTMANAGER_H
+#ifndef QMAKEPROJECTMANAGER_H
+#define QMAKEPROJECTMANAGER_H
 
-#include "qt4projectmanager_global.h"
+#include "qmakeprojectmanager_global.h"
 
 #include <projectexplorer/iprojectmanager.h>
 #include <projectexplorer/projectnodes.h>
@@ -111,4 +111,4 @@ private:
 
 } // namespace QmakeProjectManager
 
-#endif // QT4PROJECTMANAGER_H
+#endif // QMAKEPROJECTMANAGER_H
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qrc b/src/plugins/qt4projectmanager/qmakeprojectmanager.qrc
index da22ca50ec..1c1d74473e 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qrc
+++ b/src/plugins/qt4projectmanager/qmakeprojectmanager.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/qt4projectmanager">
+    <qresource prefix="/qmakeprojectmanager">
         <file>images/run_qmake.png</file>
         <file>images/run_qmake_small.png</file>
         <file>Qt4ProjectManager.mimetypes.xml</file>
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager_global.h b/src/plugins/qt4projectmanager/qmakeprojectmanager_global.h
index 8af5a6d3e8..8af5a6d3e8 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager_global.h
+++ b/src/plugins/qt4projectmanager/qmakeprojectmanager_global.h
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qmakeprojectmanagerconstants.h
index 09cbc7fc43..09cbc7fc43 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qmakeprojectmanagerconstants.h
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qmakeprojectmanagerplugin.cpp
index e8bd3f8e75..87332dc965 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qmakeprojectmanagerplugin.cpp
@@ -27,14 +27,14 @@
 **
 ****************************************************************************/
 
-#include "qt4projectmanagerplugin.h"
+#include "qmakeprojectmanagerplugin.h"
 
-#include "qt4projectmanager.h"
-#include "qt4nodes.h"
+#include "qmakeprojectmanager.h"
+#include "qmakenodes.h"
 #include "qmakestep.h"
 #include "makestep.h"
-#include "qt4buildconfiguration.h"
-#include "qt4runconfiguration.h"
+#include "qmakebuildconfiguration.h"
+#include "qmakerunconfiguration.h"
 #include "wizards/consoleappwizard.h"
 #include "wizards/guiappwizard.h"
 #include "wizards/librarywizard.h"
@@ -46,8 +46,8 @@
 #include "customwidgetwizard/customwidgetwizard.h"
 #include "profileeditorfactory.h"
 #include "profilehoverhandler.h"
-#include "qt4projectmanagerconstants.h"
-#include "qt4project.h"
+#include "qmakeprojectmanagerconstants.h"
+#include "qmakeproject.h"
 #include "externaleditors.h"
 #include "profilecompletionassist.h"
 #include "qmakekitinformation.h"
@@ -102,7 +102,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
     const Core::Context projectContext(QmakeProjectManager::Constants::PROJECT_ID);
     Core::Context projecTreeContext(ProjectExplorer::Constants::C_PROJECT_TREE);
 
-    if (!Core::MimeDatabase::addMimeTypes(QLatin1String(":qt4projectmanager/Qt4ProjectManager.mimetypes.xml"), errorMessage))
+    if (!Core::MimeDatabase::addMimeTypes(QLatin1String(":qmakeprojectmanager/Qt4ProjectManager.mimetypes.xml"), errorMessage))
         return false;
 
     m_projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance();
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qmakeprojectmanagerplugin.h
index 935bd9be84..935bd9be84 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
+++ b/src/plugins/qt4projectmanager/qmakeprojectmanagerplugin.h
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qmakerunconfiguration.cpp
index 1266a5425a..dc66e8e056 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qmakerunconfiguration.cpp
@@ -27,11 +27,11 @@
 **
 ****************************************************************************/
 
-#include "qt4runconfiguration.h"
+#include "qmakerunconfiguration.h"
 
-#include "qt4nodes.h"
-#include "qt4project.h"
-#include "qt4buildconfiguration.h"
+#include "qmakenodes.h"
+#include "qmakeproject.h"
+#include "qmakebuildconfiguration.h"
 
 #include <coreplugin/coreconstants.h>
 #include <projectexplorer/localenvironmentaspect.h>
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qmakerunconfiguration.h
index 6208cfc704..6208cfc704 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qmakerunconfiguration.h
diff --git a/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.h b/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.h
index ddbd99416d..6281cb8e07 100644
--- a/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.h
+++ b/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.h
@@ -30,7 +30,7 @@
 #ifndef QMAKERUNCONFIGURATIONFACTORY_H
 #define QMAKERUNCONFIGURATIONFACTORY_H
 
-#include "qt4projectmanager_global.h"
+#include "qmakeprojectmanager_global.h"
 
 #include <projectexplorer/runconfiguration.h>
 
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index c687291e14..5331ece972 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -31,11 +31,11 @@
 #include "ui_qmakestep.h"
 
 #include "qmakeparser.h"
-#include "qt4buildconfiguration.h"
-#include "qt4project.h"
-#include "qt4projectmanagerconstants.h"
+#include "qmakebuildconfiguration.h"
+#include "qmakeproject.h"
+#include "qmakeprojectmanagerconstants.h"
 #include "qmakekitinformation.h"
-#include "qt4nodes.h"
+#include "qmakenodes.h"
 
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/buildsteplist.h>
diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h
index 003258e4ce..e12a9cc7e7 100644
--- a/src/plugins/qt4projectmanager/qmakestep.h
+++ b/src/plugins/qt4projectmanager/qmakestep.h
@@ -30,7 +30,7 @@
 #ifndef QMAKESTEP_H
 #define QMAKESTEP_H
 
-#include "qt4projectmanager_global.h"
+#include "qmakeprojectmanager_global.h"
 #include <projectexplorer/abstractprocessstep.h>
 
 #include <QStringList>
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index 519b614302..aa2c2241dc 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -10,10 +10,10 @@ HEADERS += \
     qmakekitconfigwidget.h \
     qmakeprojectimporter.h \
     qmakerunconfigurationfactory.h \
-    qt4projectmanagerplugin.h \
-    qt4projectmanager.h \
-    qt4project.h \
-    qt4nodes.h \
+    qmakeprojectmanagerplugin.h \
+    qmakeprojectmanager.h \
+    qmakeproject.h \
+    qmakenodes.h \
     profileeditor.h \
     profilehighlighter.h \
     profilehighlighterfactory.h \
@@ -49,19 +49,19 @@ HEADERS += \
     wizards/abstractmobileappwizard.h \
     wizards/subdirsprojectwizard.h \
     wizards/subdirsprojectwizarddialog.h \
-    qt4projectmanagerconstants.h \
+    qmakeprojectmanagerconstants.h \
     makestep.h \
     qmakestep.h \
     qtmodulesinfo.h \
-    qt4projectconfigwidget.h \
+    qmakeprojectconfigwidget.h \
     externaleditors.h \
-    qt4buildconfiguration.h \
+    qmakebuildconfiguration.h \
     qmakeparser.h \
     addlibrarywizard.h \
     librarydetailscontroller.h \
-    findqt4profiles.h \
-    qt4projectmanager_global.h \
-    qt4runconfiguration.h \
+    findqmakeprofiles.h \
+    qmakeprojectmanager_global.h \
+    qmakerunconfiguration.h \
     profilecompletionassist.h
 
 SOURCES += \
@@ -69,10 +69,10 @@ SOURCES += \
     qmakekitinformation.cpp \
     qmakeprojectimporter.cpp \
     qmakerunconfigurationfactory.cpp \
-    qt4projectmanagerplugin.cpp \
-    qt4projectmanager.cpp \
-    qt4project.cpp \
-    qt4nodes.cpp \
+    qmakeprojectmanagerplugin.cpp \
+    qmakeprojectmanager.cpp \
+    qmakeproject.cpp \
+    qmakenodes.cpp \
     profileeditor.cpp \
     profilehighlighter.cpp \
     profilehighlighterfactory.cpp \
@@ -111,19 +111,19 @@ SOURCES += \
     makestep.cpp \
     qmakestep.cpp \
     qtmodulesinfo.cpp \
-    qt4projectconfigwidget.cpp \
+    qmakeprojectconfigwidget.cpp \
     externaleditors.cpp \
-    qt4buildconfiguration.cpp \
+    qmakebuildconfiguration.cpp \
     qmakeparser.cpp \
     addlibrarywizard.cpp \
     librarydetailscontroller.cpp \
-    findqt4profiles.cpp \
-    qt4runconfiguration.cpp \
+    findqmakeprofiles.cpp \
+    qmakerunconfiguration.cpp \
     profilecompletionassist.cpp
 
 FORMS += makestep.ui \
     qmakestep.ui \
-    qt4projectconfigwidget.ui \
+    qmakeprojectconfigwidget.ui \
     librarydetailswidget.ui \
     wizards/testwizardpage.ui \
     wizards/html5appwizardsourcespage.ui \
@@ -131,7 +131,7 @@ FORMS += makestep.ui \
     wizards/mobileappwizardgenericoptionspage.ui \
     wizards/qtquickcomponentsetoptionspage.ui
 
-RESOURCES += qt4projectmanager.qrc \
+RESOURCES += qmakeprojectmanager.qrc \
     wizards/wizards.qrc
 
 include(customwidgetwizard/customwidgetwizard.pri)
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index 88db16ce78..4d0f2f2fde 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -23,7 +23,7 @@ QtcPlugin {
         files: [
             "addlibrarywizard.cpp", "addlibrarywizard.h",
             "externaleditors.cpp", "externaleditors.h",
-            "findqt4profiles.cpp", "findqt4profiles.h",
+            "findqmakeprofiles.cpp", "findqmakeprofiles.h",
             "librarydetailscontroller.cpp", "librarydetailscontroller.h",
             "librarydetailswidget.ui",
             "makestep.cpp", "makestep.h", "makestep.ui",
@@ -41,17 +41,17 @@ QtcPlugin {
             "qmakeprojectimporter.cpp", "qmakeprojectimporter.h",
             "qmakerunconfigurationfactory.cpp", "qmakerunconfigurationfactory.h",
             "qmakestep.cpp", "qmakestep.h", "qmakestep.ui",
-            "qt4buildconfiguration.cpp", "qt4buildconfiguration.h",
-            "qt4nodes.cpp", "qt4nodes.h",
-            "qt4project.cpp", "qt4project.h",
-            "qt4projectconfigwidget.cpp", "qt4projectconfigwidget.h", "qt4projectconfigwidget.ui",
-            "qt4projectmanager.cpp", "qt4projectmanager.h",
-            "qt4projectmanager.qrc",
-            "qt4projectmanager_global.h",
-            "qt4projectmanagerconstants.h",
-            "qt4projectmanagerplugin.cpp", "qt4projectmanagerplugin.h",
+            "qmakebuildconfiguration.cpp", "qmakebuildconfiguration.h",
+            "qmakenodes.cpp", "qmakenodes.h",
+            "qmakeproject.cpp", "qmakeproject.h",
+            "qmakeprojectconfigwidget.cpp", "qmakeprojectconfigwidget.h", "qmakeprojectconfigwidget.ui",
+            "qmakeprojectmanager.cpp", "qmakeprojectmanager.h",
+            "qmakeprojectmanager.qrc",
+            "qmakeprojectmanager_global.h",
+            "qmakeprojectmanagerconstants.h",
+            "qmakeprojectmanagerplugin.cpp", "qmakeprojectmanagerplugin.h",
             "qtmodulesinfo.cpp", "qtmodulesinfo.h",
-            "qt4runconfiguration.cpp", "qt4runconfiguration.h",
+            "qmakerunconfiguration.cpp", "qmakerunconfiguration.h",
         ]
     }
 
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
index 7aa9d79b5b..e7e0dd1838 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
@@ -30,7 +30,7 @@
 #ifndef ABSTRACTMOBILEAPP_H
 #define ABSTRACTMOBILEAPP_H
 
-#include "../qt4projectmanager_global.h"
+#include "../qmakeprojectmanager_global.h"
 #include <QFileInfo>
 #include <QPair>
 
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
index 0e13164ce3..ffee57a04b 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
@@ -33,8 +33,8 @@
 #include "../qmakeprojectimporter.h"
 
 #include <extensionsystem/pluginmanager.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4projectmanager.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakeprojectmanager.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtkitinformation.h>
 #include <projectexplorer/projectexplorer.h>
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
index c5f6bb8141..dd0476770a 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
@@ -30,7 +30,7 @@
 #ifndef ABSTRACTMOBILEAPPWIZARD_H
 #define ABSTRACTMOBILEAPPWIZARD_H
 
-#include <qt4projectmanager/qt4projectmanager_global.h>
+#include <qt4projectmanager/qmakeprojectmanager_global.h>
 #include <projectexplorer/baseprojectwizarddialog.h>
 
 namespace ProjectExplorer { class TargetSetupPage; }
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
index 12cd8307af..4b002c9464 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
@@ -31,7 +31,7 @@
 
 #include "html5app.h"
 #include "html5appwizardpages.h"
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
+#include <qt4projectmanager/qmakeprojectmanagerconstants.h>
 
 #include <qtsupport/baseqtversion.h>
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index bdde5f4ac0..b5c7a3ae3d 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -31,7 +31,7 @@
 
 #include "qtquickapp.h"
 #include "qtquickappwizardpages.h"
-#include "../qt4projectmanagerconstants.h"
+#include "../qmakeprojectmanagerconstants.h"
 
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/baseqtversion.h>
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
index f6572cef4e..8d10bf02c9 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
@@ -31,9 +31,9 @@
 
 #include "modulespage.h"
 
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4projectmanager.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
+#include <qt4projectmanager/qmakeproject.h>
+#include <qt4projectmanager/qmakeprojectmanager.h>
+#include <qt4projectmanager/qmakeprojectmanagerconstants.h>
 
 #include <coreplugin/icore.h>