diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
index 3a27e79cf454c1783fee9756b990b17a86eb6095..8ee0ab73003d95c553fa4d11cbb4f830211f9190 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
@@ -62,7 +62,7 @@ CustomWidgetWizardDialog::CustomWidgetWizardDialog(const QString &templateName,
                                                    const QIcon &icon,
                                                    QWidget *parent,
                                                    const Core::WizardDialogParameters &parameters) :
-    BaseQt4ProjectWizardDialog(false, parent, parameters),
+    BaseQmakeProjectWizardDialog(false, parent, parameters),
     m_widgetsPage(new CustomWidgetWidgetsWizardPage),
     m_pluginPage(new CustomWidgetPluginWizardPage),
     m_widgetPageId(-1), m_pluginPageId(-1)
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h
index faa11b96d7ea0f95f12c7fda67cbfdb5778886e7..daf1ab8240f4dc1bf6fea0a760df212056bfc743 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h
@@ -42,7 +42,7 @@ class CustomWidgetPluginWizardPage;
 struct PluginOptions;
 struct FileNamingParameters;
 
-class CustomWidgetWizardDialog : public BaseQt4ProjectWizardDialog
+class CustomWidgetWizardDialog : public BaseQmakeProjectWizardDialog
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
index 5b5df1f691ab192415682e416965c283dcd2b710..973351514db3def0aa96ecb662f19ffa15c81de6 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
@@ -132,7 +132,7 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString
     addAutoReleasedObject(new TestWizard);
     addAutoReleasedObject(new CustomWidgetWizard);
 
-    CustomQt4ProjectWizard::registerSelf();
+    CustomQmakeProjectWizard::registerSelf();
 
     addAutoReleasedObject(new QMakeStepFactory);
     addAutoReleasedObject(new MakeStepFactory);
diff --git a/src/plugins/qmakeprojectmanager/wizards/consoleappwizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/consoleappwizarddialog.cpp
index b3c5db90863cc3e2b50fac6403eec5f439642adb..7b452b3d8b3d90c2cc0269a1b7e88f2874cc59a1 100644
--- a/src/plugins/qmakeprojectmanager/wizards/consoleappwizarddialog.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/consoleappwizarddialog.cpp
@@ -39,7 +39,7 @@ ConsoleAppWizardDialog::ConsoleAppWizardDialog(const QString &templateName,
                                                const QIcon &icon,
                                                bool showModulesPage,
                                                QWidget *parent, const Core::WizardDialogParameters &parameters) :
-    BaseQt4ProjectWizardDialog(showModulesPage, parent, parameters)
+    BaseQmakeProjectWizardDialog(showModulesPage, parent, parameters)
 {
     setWindowIcon(icon);
     setWindowTitle(templateName);
diff --git a/src/plugins/qmakeprojectmanager/wizards/consoleappwizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/consoleappwizarddialog.h
index 8c3bf3e9ef20a9f00b57182875d1eb5d20831cef..6e26095340edde347964d4f72f34c15d297a408d 100644
--- a/src/plugins/qmakeprojectmanager/wizards/consoleappwizarddialog.h
+++ b/src/plugins/qmakeprojectmanager/wizards/consoleappwizarddialog.h
@@ -37,7 +37,7 @@ namespace Internal {
 
 struct QtProjectParameters;
 
-class ConsoleAppWizardDialog : public BaseQt4ProjectWizardDialog
+class ConsoleAppWizardDialog : public BaseQmakeProjectWizardDialog
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizarddialog.cpp
index 574bc2e053ded1a68d2b1e543f227221c8d73c69..35830c7e2d2e9265aeeee865d9e947626e43b66d 100644
--- a/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizarddialog.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizarddialog.cpp
@@ -36,7 +36,7 @@ namespace Internal {
 EmptyProjectWizardDialog::EmptyProjectWizardDialog(const QString &templateName,
                                                const QIcon &icon,
                                                QWidget *parent, const Core::WizardDialogParameters &parameters) :
-    BaseQt4ProjectWizardDialog(false, parent, parameters)
+    BaseQmakeProjectWizardDialog(false, parent, parameters)
 {
     setWindowIcon(icon);
     setWindowTitle(templateName);
diff --git a/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizarddialog.h
index 05bfa502a3e508c406d0550cc04bdccea8bb4344..02fc69ca9d8f6219a15d11c17af6323039cd7395 100644
--- a/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizarddialog.h
+++ b/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizarddialog.h
@@ -37,7 +37,7 @@ namespace Internal {
 
 struct QtProjectParameters;
 
-class EmptyProjectWizardDialog : public BaseQt4ProjectWizardDialog
+class EmptyProjectWizardDialog : public BaseQmakeProjectWizardDialog
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp
index d6a1c534d56ad3971d8808e63a688924affcaf1d..bd201531c5aa4e4fc890d43cd9bf27bdec63e95f 100644
--- a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp
@@ -50,7 +50,7 @@ GuiAppWizardDialog::GuiAppWizardDialog(const QString &templateName,
                                        bool isMobile,
                                        QWidget *parent,
                                        const Core::WizardDialogParameters &parameters) :
-    BaseQt4ProjectWizardDialog(showModulesPage, parent, parameters),
+    BaseQmakeProjectWizardDialog(showModulesPage, parent, parameters),
     m_filesPage(new FilesPage)
 {
     setWindowIcon(icon);
diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.h
index 42a46a9b88ba698cb7d81a10bf5627186d6a0519..180e523f559f691746e01cacc9f26df92a55b0bf 100644
--- a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.h
+++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.h
@@ -53,7 +53,7 @@ struct GuiAppParameters
     bool isMobileApplication;
 };
 
-class GuiAppWizardDialog : public BaseQt4ProjectWizardDialog
+class GuiAppWizardDialog : public BaseQmakeProjectWizardDialog
 {
     Q_OBJECT
 
diff --git a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp
index 1d978acdc9db964d3411aa6f3ee9c5969b7a8fe2..95707ef85dd2558387c14eadc5b9a6ae116331b9 100644
--- a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp
@@ -135,7 +135,7 @@ LibraryWizardDialog::LibraryWizardDialog(const QString &templateName,
                                          bool showModulesPage,
                                          QWidget *parent,
                                          const Core::WizardDialogParameters &parameters) :
-    BaseQt4ProjectWizardDialog(showModulesPage, new LibraryIntroPage, -1, parent, parameters),
+    BaseQmakeProjectWizardDialog(showModulesPage, new LibraryIntroPage, -1, parent, parameters),
     m_filesPage(new FilesPage),
     m_mobilePage(new MobileLibraryWizardOptionPage),
     m_pluginBaseClassesInitialized(false),
@@ -247,7 +247,7 @@ int LibraryWizardDialog::nextId() const
         return skipModulesPageIfNeeded();
     }
 
-    return BaseQt4ProjectWizardDialog::nextId();
+    return BaseQmakeProjectWizardDialog::nextId();
 }
 
 void LibraryWizardDialog::initializePage(int id)
@@ -262,7 +262,7 @@ void LibraryWizardDialog::initializePage(int id)
             mobileItem->setNextShownItem(modulesItem);
 
     }
-    BaseQt4ProjectWizardDialog::initializePage(id);
+    BaseQmakeProjectWizardDialog::initializePage(id);
 }
 
 void LibraryWizardDialog::cleanupPage(int id)
@@ -271,7 +271,7 @@ void LibraryWizardDialog::cleanupPage(int id)
         Utils::WizardProgressItem *mobileItem = wizardProgress()->item(m_mobilePageId);
         mobileItem->setNextShownItem(0);
     }
-    BaseQt4ProjectWizardDialog::cleanupPage(id);
+    BaseQmakeProjectWizardDialog::cleanupPage(id);
 }
 
 QtProjectParameters LibraryWizardDialog::parameters() const
diff --git a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.h
index 3cab4b1b855ade4dbc69444bf812b4612d5cf00c..34b8817dc3d2d5de8aa2119e26e29bf8aa2c8eda 100644
--- a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.h
+++ b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.h
@@ -42,7 +42,7 @@ struct LibraryParameters;
 struct MobileLibraryParameters;
 
 // Library wizard dialog.
-class LibraryWizardDialog : public BaseQt4ProjectWizardDialog
+class LibraryWizardDialog : public BaseQmakeProjectWizardDialog
 {
     Q_OBJECT
 
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
index 97127414f423a5bd9b8887c3f85c118a61cc198d..ccd2c08e06b257c79e48e1ec541cd9348de81f2d 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
@@ -88,7 +88,7 @@ bool QtWizard::qt4ProjectPostGenerateFiles(const QWizard *w,
                                            const Core::GeneratedFiles &generatedFiles,
                                            QString *errorMessage)
 {
-    const BaseQt4ProjectWizardDialog *dialog = qobject_cast<const BaseQt4ProjectWizardDialog *>(w);
+    const BaseQmakeProjectWizardDialog *dialog = qobject_cast<const BaseQmakeProjectWizardDialog *>(w);
 
     // Generate user settings
     foreach (const Core::GeneratedFile &file, generatedFiles)
@@ -127,15 +127,15 @@ bool QtWizard::showModulesPageForLibraries()
     return true;
 }
 
-// ------------ CustomQt4ProjectWizard
-CustomQt4ProjectWizard::CustomQt4ProjectWizard()
+// ------------ CustomQmakeProjectWizard
+CustomQmakeProjectWizard::CustomQmakeProjectWizard()
 {
 }
 
-QWizard *CustomQt4ProjectWizard::createWizardDialog
+QWizard *CustomQmakeProjectWizard::createWizardDialog
     (QWidget *parent, const Core::WizardDialogParameters &wizardDialogParameters) const
 {
-    BaseQt4ProjectWizardDialog *wizard = new BaseQt4ProjectWizardDialog(false, parent, wizardDialogParameters);
+    BaseQmakeProjectWizardDialog *wizard = new BaseQmakeProjectWizardDialog(false, parent, wizardDialogParameters);
 
     if (!wizardDialogParameters.extraValues().contains(QLatin1String(ProjectExplorer::Constants::PROJECT_KIT_IDS)))
         wizard->addTargetSetupPage(false, targetPageId);
@@ -145,18 +145,18 @@ QWizard *CustomQt4ProjectWizard::createWizardDialog
     return wizard;
 }
 
-bool CustomQt4ProjectWizard::postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage)
+bool CustomQmakeProjectWizard::postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage)
 {
     return QtWizard::qt4ProjectPostGenerateFiles(w, l, errorMessage);
 }
 
-void CustomQt4ProjectWizard::registerSelf()
+void CustomQmakeProjectWizard::registerSelf()
 {
-    ProjectExplorer::CustomWizard::registerFactory<CustomQt4ProjectWizard>(QLatin1String("qt4project"));
+    ProjectExplorer::CustomWizard::registerFactory<CustomQmakeProjectWizard>(QLatin1String("qt4project"));
 }
 
-// ----------------- BaseQt4ProjectWizardDialog
-BaseQt4ProjectWizardDialog::BaseQt4ProjectWizardDialog(bool showModulesPage, QWidget *parent,
+// ----------------- BaseQmakeProjectWizardDialog
+BaseQmakeProjectWizardDialog::BaseQmakeProjectWizardDialog(bool showModulesPage, QWidget *parent,
                                                        const Core::WizardDialogParameters &parameters) :
     ProjectExplorer::BaseProjectWizardDialog(parent, parameters),
     m_modulesPage(0),
@@ -167,7 +167,7 @@ BaseQt4ProjectWizardDialog::BaseQt4ProjectWizardDialog(bool showModulesPage, QWi
     init(showModulesPage);
 }
 
-BaseQt4ProjectWizardDialog::BaseQt4ProjectWizardDialog(bool showModulesPage,
+BaseQmakeProjectWizardDialog::BaseQmakeProjectWizardDialog(bool showModulesPage,
                                                        Utils::ProjectIntroPage *introPage,
                                                        int introId, QWidget *parent,
                                                        const Core::WizardDialogParameters &parameters) :
@@ -180,7 +180,7 @@ BaseQt4ProjectWizardDialog::BaseQt4ProjectWizardDialog(bool showModulesPage,
     init(showModulesPage);
 }
 
-BaseQt4ProjectWizardDialog::~BaseQt4ProjectWizardDialog()
+BaseQmakeProjectWizardDialog::~BaseQmakeProjectWizardDialog()
 {
     if (m_targetSetupPage && !m_targetSetupPage->parent())
         delete m_targetSetupPage;
@@ -188,7 +188,7 @@ BaseQt4ProjectWizardDialog::~BaseQt4ProjectWizardDialog()
         delete m_modulesPage;
 }
 
-void BaseQt4ProjectWizardDialog::init(bool showModulesPage)
+void BaseQmakeProjectWizardDialog::init(bool showModulesPage)
 {
     if (showModulesPage)
         m_modulesPage = new ModulesPage;
@@ -196,7 +196,7 @@ void BaseQt4ProjectWizardDialog::init(bool showModulesPage)
             this, SLOT(generateProfileName(QString,QString)));
 }
 
-int BaseQt4ProjectWizardDialog::addModulesPage(int id)
+int BaseQmakeProjectWizardDialog::addModulesPage(int id)
 {
     if (!m_modulesPage)
         return -1;
@@ -210,7 +210,7 @@ int BaseQt4ProjectWizardDialog::addModulesPage(int id)
     return newId;
 }
 
-int BaseQt4ProjectWizardDialog::addTargetSetupPage(bool mobile, int id)
+int BaseQmakeProjectWizardDialog::addTargetSetupPage(bool mobile, int id)
 {
     m_targetSetupPage = new ProjectExplorer::TargetSetupPage;
     const QString platform = selectedPlatform();
@@ -233,12 +233,12 @@ int BaseQt4ProjectWizardDialog::addTargetSetupPage(bool mobile, int id)
     return id;
 }
 
-QStringList BaseQt4ProjectWizardDialog::selectedModulesList() const
+QStringList BaseQmakeProjectWizardDialog::selectedModulesList() const
 {
     return m_modulesPage ? m_modulesPage->selectedModulesList() : m_selectedModules;
 }
 
-void BaseQt4ProjectWizardDialog::setSelectedModules(const QString &modules, bool lock)
+void BaseQmakeProjectWizardDialog::setSelectedModules(const QString &modules, bool lock)
 {
     const QStringList modulesList = modules.split(QLatin1Char(' '));
     if (m_modulesPage) {
@@ -251,12 +251,12 @@ void BaseQt4ProjectWizardDialog::setSelectedModules(const QString &modules, bool
     }
 }
 
-QStringList BaseQt4ProjectWizardDialog::deselectedModulesList() const
+QStringList BaseQmakeProjectWizardDialog::deselectedModulesList() const
 {
     return m_modulesPage ? m_modulesPage->deselectedModulesList() : m_deselectedModules;
 }
 
-void BaseQt4ProjectWizardDialog::setDeselectedModules(const QString &modules)
+void BaseQmakeProjectWizardDialog::setDeselectedModules(const QString &modules)
 {
     const QStringList modulesList = modules.split(QLatin1Char(' '));
     if (m_modulesPage) {
@@ -267,7 +267,7 @@ void BaseQt4ProjectWizardDialog::setDeselectedModules(const QString &modules)
     }
 }
 
-bool BaseQt4ProjectWizardDialog::writeUserFile(const QString &proFileName) const
+bool BaseQmakeProjectWizardDialog::writeUserFile(const QString &proFileName) const
 {
     if (!m_targetSetupPage)
         return false;
@@ -283,14 +283,14 @@ bool BaseQt4ProjectWizardDialog::writeUserFile(const QString &proFileName) const
     return success;
 }
 
-bool BaseQt4ProjectWizardDialog::setupProject(QmakeProject *project) const
+bool BaseQmakeProjectWizardDialog::setupProject(QmakeProject *project) const
 {
     if (!m_targetSetupPage)
         return true;
     return m_targetSetupPage->setupProject(project);
 }
 
-bool BaseQt4ProjectWizardDialog::isQtPlatformSelected(const QString &platform) const
+bool BaseQmakeProjectWizardDialog::isQtPlatformSelected(const QString &platform) const
 {
     QList<Core::Id> selectedKitList = selectedKits();
 
@@ -301,20 +301,20 @@ bool BaseQt4ProjectWizardDialog::isQtPlatformSelected(const QString &platform) c
     return false;
 }
 
-QList<Core::Id> BaseQt4ProjectWizardDialog::selectedKits() const
+QList<Core::Id> BaseQmakeProjectWizardDialog::selectedKits() const
 {
     if (!m_targetSetupPage)
         return m_profileIds;
     return m_targetSetupPage->selectedKits();
 }
 
-void BaseQt4ProjectWizardDialog::addExtensionPages(const QList<QWizardPage *> &wizardPageList)
+void BaseQmakeProjectWizardDialog::addExtensionPages(const QList<QWizardPage *> &wizardPageList)
 {
     foreach (QWizardPage *p,wizardPageList)
         Core::BaseFileWizard::applyExtensionPageShortTitle(this, addPage(p));
 }
 
-void BaseQt4ProjectWizardDialog::generateProfileName(const QString &name, const QString &path)
+void BaseQmakeProjectWizardDialog::generateProfileName(const QString &name, const QString &path)
 {
     if (!m_targetSetupPage)
         return;
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h
index eace93c04e9305f54de549f6e2c41c8b6f224926..7317b0ca50410be98f0eccb5003496e65c528b1d 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h
+++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h
@@ -84,12 +84,12 @@ private:
 };
 
 // A custom wizard with an additional Qt 4 target page
-class CustomQt4ProjectWizard : public ProjectExplorer::CustomProjectWizard
+class CustomQmakeProjectWizard : public ProjectExplorer::CustomProjectWizard
 {
     Q_OBJECT
 
 public:
-    CustomQt4ProjectWizard();
+    CustomQmakeProjectWizard();
 
     static void registerSelf();
 
@@ -108,18 +108,19 @@ private:
  * to select targets and Qt versions.
  */
 
-class BaseQt4ProjectWizardDialog : public ProjectExplorer::BaseProjectWizardDialog {
+class BaseQmakeProjectWizardDialog : public ProjectExplorer::BaseProjectWizardDialog
+{
     Q_OBJECT
 protected:
-    explicit BaseQt4ProjectWizardDialog(bool showModulesPage,
+    explicit BaseQmakeProjectWizardDialog(bool showModulesPage,
                                         Utils::ProjectIntroPage *introPage,
                                         int introId,
                                         QWidget *parent,
                                         const Core::WizardDialogParameters &parameters);
 public:
-    explicit BaseQt4ProjectWizardDialog(bool showModulesPage, QWidget *parent,
+    explicit BaseQmakeProjectWizardDialog(bool showModulesPage, QWidget *parent,
                                         const Core::WizardDialogParameters &parameters);
-    virtual ~BaseQt4ProjectWizardDialog();
+    virtual ~BaseQmakeProjectWizardDialog();
 
     int addModulesPage(int id = -1);
     int addTargetSetupPage(bool mobile = false, int id = -1);
diff --git a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizarddialog.cpp
index df73cd8a29de0f7e4a45601d4c8229b5d3220c11..bc8e73a093b8bd35234b2e9a376b96d9aff10f29 100644
--- a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizarddialog.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizarddialog.cpp
@@ -37,7 +37,7 @@ SubdirsProjectWizardDialog::SubdirsProjectWizardDialog(const QString &templateNa
                                                const QIcon &icon,
                                                QWidget *parent,
                                                const Core::WizardDialogParameters &parameters) :
-    BaseQt4ProjectWizardDialog(false, parent, parameters)
+    BaseQmakeProjectWizardDialog(false, parent, parameters)
 {
     setWindowIcon(icon);
     setWindowTitle(templateName);
diff --git a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizarddialog.h
index 69c493881dea566647c957cd09abb65a69bce1aa..7e0388cdbc0fc982776d762710d90618456883de 100644
--- a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizarddialog.h
+++ b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizarddialog.h
@@ -37,7 +37,7 @@ namespace Internal {
 
 struct QtProjectParameters;
 
-class SubdirsProjectWizardDialog : public BaseQt4ProjectWizardDialog
+class SubdirsProjectWizardDialog : public BaseQmakeProjectWizardDialog
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.cpp
index 53e3847931a7cc706e809652e31c90f807ccb983..7f4e1e1f4b59faab30c34d219a2f1aeb21edeead 100644
--- a/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.cpp
@@ -52,7 +52,7 @@ TestWizardDialog::TestWizardDialog(const QString &templateName,
                                    const QIcon &icon,
                                    QWidget *parent,
                                    const Core::WizardDialogParameters &parameters)  :
-    BaseQt4ProjectWizardDialog(true, parent, parameters),
+    BaseQmakeProjectWizardDialog(true, parent, parameters),
     m_testPage(new TestWizardPage),
     m_testPageId(-1), m_modulesPageId(-1)
 {
diff --git a/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.h
index e2afee117cedd924369212e1e0872f7b1afec20e..75192c824b401c7efcfe038671bb25b9a1be3631 100644
--- a/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.h
+++ b/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.h
@@ -58,7 +58,7 @@ struct TestWizardParameters {
     QString fileName;
 };
 
-class TestWizardDialog : public BaseQt4ProjectWizardDialog
+class TestWizardDialog : public BaseQmakeProjectWizardDialog
 {
     Q_OBJECT
 public: