diff --git a/share/qtcreator/templates/qmlapp/app.pro b/share/qtcreator/templates/qtquickapp/app.pro
similarity index 100%
rename from share/qtcreator/templates/qmlapp/app.pro
rename to share/qtcreator/templates/qtquickapp/app.pro
diff --git a/share/qtcreator/templates/qmlapp/main.cpp b/share/qtcreator/templates/qtquickapp/main.cpp
similarity index 100%
rename from share/qtcreator/templates/qmlapp/main.cpp
rename to share/qtcreator/templates/qtquickapp/main.cpp
diff --git a/share/qtcreator/templates/qmlapp/qml/app/main.qml b/share/qtcreator/templates/qtquickapp/qml/app/main.qml
similarity index 100%
rename from share/qtcreator/templates/qmlapp/qml/app/main.qml
rename to share/qtcreator/templates/qtquickapp/qml/app/main.qml
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
similarity index 100%
rename from share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
rename to share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.h b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h
similarity index 100%
rename from share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.h
rename to share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri
similarity index 100%
rename from share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
rename to share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 7a6edc1779a05229609df536754092cc10b5e8a2..1e53d8fa3415a152e305e74ca8aee4e54f5e0bf6 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -18546,7 +18546,7 @@ IDs müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
     </message>
 </context>
 <context>
-    <name>QmlStandaloneAppWizardSourcesPage</name>
+    <name>QtQuickAppWizardSourcesPage</name>
     <message>
         <source>WizardPage</source>
         <translation>WizardPage</translation>
@@ -20756,7 +20756,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung &apos;TRK&apos;
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneApp</name>
+    <name>Qt4ProjectManager::Internal::QtQuickApp</name>
     <message>
         <source>The QML import path &apos;%1&apos; cannot be found.</source>
         <translation>Der QML-Importpfad &apos;%1&apos; konnte nicht gefunden werden.</translation>
@@ -20779,7 +20779,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung &apos;TRK&apos;
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardDialog</name>
     <message>
         <source>New Qt Quick Application</source>
         <translation>Neue Qt Quick-Anwendung</translation>
@@ -20794,7 +20794,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung &apos;TRK&apos;
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage</name>
     <message>
         <source>Select QML File</source>
         <translation>QML-Datei auswählen</translation>
@@ -21370,7 +21370,7 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizard</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizard</name>
     <message>
         <source>Qt Quick Application</source>
         <translation>Neue Qt Quick-Anwendung</translation>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index e63d4e6bff12abea4011d2844e1044228092e06e..ed5a1be283ae2e39722384fa1065e2d43559d73f 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -26038,7 +26038,7 @@ Preselects Qt for Simulator and mobile targets if available</source>
     </message>
 </context>
 <context>
-    <name>QmlStandaloneAppWizardSourcesPage</name>
+    <name>QtQuickAppWizardSourcesPage</name>
     <message>
         <source>WizardPage</source>
         <translation>WizardPage</translation>
@@ -28660,7 +28660,7 @@ Présélectionne la version de Qt pour le simulateur et les mobiles si disponibl
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneApp</name>
+    <name>Qt4ProjectManager::Internal::QtQuickApp</name>
     <message>
         <source>The QML import path &apos;%1&apos; cannot be found.</source>
         <translation>Le chemin d&apos;import QML &apos;%1&apos; est introuvable.</translation>
@@ -28683,7 +28683,7 @@ Présélectionne la version de Qt pour le simulateur et les mobiles si disponibl
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardDialog</name>
     <message>
         <source>New Qt Quick Application</source>
         <translation>Nouvelle application Qt Quick</translation>
@@ -28698,7 +28698,7 @@ Présélectionne la version de Qt pour le simulateur et les mobiles si disponibl
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizard</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizard</name>
     <message>
         <source>Qt Quick Application</source>
         <translation>Application Qt Quick</translation>
@@ -28713,7 +28713,7 @@ Vous pouvez construire l&apos;application et la déployer sur un ordinateur de b
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage</name>
     <message>
         <source>Select QML File</source>
         <translation>Sélectionner un fichier QML</translation>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 96741629a06aaf30bd0378bdacb3267a51bd6c1d..b42e8de9752c4febd62aeda9541caa999e6b956a 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -21906,7 +21906,7 @@ Preselects Qt for Simulator and mobile targets if available</source>
     </message>
 </context>
 <context>
-    <name>QmlStandaloneAppWizardSourcesPage</name>
+    <name>QtQuickAppWizardSourcesPage</name>
     <message>
         <source>WizardPage</source>
         <translation>ウィザードページ</translation>
@@ -24700,7 +24700,7 @@ Preselects Qt for Simulator and mobile targets if available.</source>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneApp</name>
+    <name>Qt4ProjectManager::Internal::QtQuickApp</name>
     <message>
         <source>The QML import path &apos;%1&apos; cannot be found.</source>
         <translation>QML インポート パス &apos;%1&apos; が見つかりませんでした。</translation>
@@ -24723,7 +24723,7 @@ Preselects Qt for Simulator and mobile targets if available.</source>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardDialog</name>
     <message>
         <source>New Qt Quick Application</source>
         <translation>Qt Quick アプリケーションの新規作成</translation>
@@ -24738,7 +24738,7 @@ Preselects Qt for Simulator and mobile targets if available.</source>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizard</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizard</name>
     <message>
         <source>Qt Quick Application</source>
         <translation>Qt Quick アプリケーション</translation>
@@ -24753,7 +24753,7 @@ You can build the application and deploy it on desktop and mobile target platfor
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage</name>
     <message>
         <source>Select QML File</source>
         <translation>QML ファイルを選択</translation>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 8ddbbb5fd0617e57f84914bcb470e70d51d2f71f..f1bf8708d6258bba731e667cb7458a35c9f9c78e 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -18761,7 +18761,7 @@ aktywny tylko po wpisaniu przedrostka</translation>
     </message>
 </context>
 <context>
-    <name>QmlStandaloneAppWizardSourcesPage</name>
+    <name>QtQuickAppWizardSourcesPage</name>
     <message>
         <source>WizardPage</source>
         <translation>StronaKreatora</translation>
@@ -21422,7 +21422,7 @@ Wstępnie wybiera wersję Qt dla Symulatora i aplikacji mobilnych (jeśli jest d
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneApp</name>
+    <name>Qt4ProjectManager::Internal::QtQuickApp</name>
     <message>
         <source>The QML import path &apos;%1&apos; cannot be found.</source>
         <translation>Nie można odnaleźć ścieżki importu QML &quot;%1&quot;.</translation>
@@ -21445,7 +21445,7 @@ Wstępnie wybiera wersję Qt dla Symulatora i aplikacji mobilnych (jeśli jest d
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardDialog</name>
     <message>
         <source>New Qt Quick Application</source>
         <translation>Nowa aplikacja Qt Quick</translation>
@@ -21460,7 +21460,7 @@ Wstępnie wybiera wersję Qt dla Symulatora i aplikacji mobilnych (jeśli jest d
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizard</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizard</name>
     <message>
         <source>Qt Quick Application</source>
         <translation>Aplikacja Qt Quick</translation>
@@ -21760,7 +21760,7 @@ Powód: %2</translation>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage</name>
     <message>
         <source>Select QML File</source>
         <translation>Wybierz plik QML</translation>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 1fc9ec35e30c3a493181f2c6203a5ca178ae068c..4073965af372f5aa4927d871433bfd28e8e48623 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -14671,7 +14671,7 @@ You can review Qt Quick UI projects in the QML Viewer and you need not build the
     </message>
 </context>
 <context>
-    <name>QmlStandaloneAppWizardSourcesPage</name>
+    <name>QtQuickAppWizardSourcesPage</name>
     <message>
         <source>WizardPage</source>
         <translation></translation>
@@ -16475,7 +16475,7 @@ stderr was: %1</source>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneApp</name>
+    <name>Qt4ProjectManager::Internal::QtQuickApp</name>
     <message>
         <source>The QML import path &apos;%1&apos; cannot be found.</source>
         <translation>Не удалось найти путь импорта QML &quot;%1&quot;.</translation>
@@ -16498,7 +16498,7 @@ stderr was: %1</source>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizard</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizard</name>
     <message>
         <source>Qt Quick Application</source>
         <translation>Приложение Qt Quick</translation>
@@ -16513,7 +16513,7 @@ You can build the application and deploy it on desktop and mobile target platfor
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardDialog</name>
     <message>
         <source>New Qt Quick Application</source>
         <translation>Новое приложение Qt Quick</translation>
@@ -16528,7 +16528,7 @@ You can build the application and deploy it on desktop and mobile target platfor
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage</name>
     <message>
         <source>Select QML File</source>
         <translation>Выбор файла QML</translation>
diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts
index 02495e4f71f37c6960c45a6e14159d0d3fc5b679..c5bcf3cf034ac67bd580b91b73d4189b783d4a0c 100644
--- a/share/qtcreator/translations/qtcreator_uk.ts
+++ b/share/qtcreator/translations/qtcreator_uk.ts
@@ -18775,7 +18775,7 @@ The following encodings are likely to fit:</source>
     </message>
 </context>
 <context>
-    <name>QmlStandaloneAppWizardSourcesPage</name>
+    <name>QtQuickAppWizardSourcesPage</name>
     <message>
         <source>WizardPage</source>
         <translation type="unfinished"></translation>
@@ -20964,7 +20964,7 @@ Check if the phone is connected and App TRK is running.</source>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneApp</name>
+    <name>Qt4ProjectManager::Internal::QtQuickApp</name>
     <message>
         <source>The QML import path &apos;%1&apos; cannot be found.</source>
         <translation type="unfinished"></translation>
@@ -21900,7 +21900,7 @@ Preselects Qt for Simulator and mobile targets if available.</source>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardDialog</name>
     <message>
         <source>New Qt Quick Application</source>
         <translation type="unfinished"></translation>
@@ -21915,7 +21915,7 @@ Preselects Qt for Simulator and mobile targets if available.</source>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizard</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizard</name>
     <message>
         <source>Qt Quick Application</source>
         <translation type="unfinished"></translation>
@@ -22022,7 +22022,7 @@ You can build the application and deploy it on desktop and mobile target platfor
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage</name>
     <message>
         <source>Select QML File</source>
         <translation type="unfinished"></translation>
diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts
index 99b1e14eee64d251bf4f0d9f449f6569adacc841..129ca81f17f817cbc2bb6591dc3bc27f824f9908 100644
--- a/share/qtcreator/translations/qtcreator_zh_CN.ts
+++ b/share/qtcreator/translations/qtcreator_zh_CN.ts
@@ -25579,7 +25579,7 @@ Id必须以小写字母开头.</translation>
     </message>
 </context>
 <context>
-    <name>QmlStandaloneAppWizardSourcesPage</name>
+    <name>QtQuickAppWizardSourcesPage</name>
     <message>
         <source>WizardPage</source>
         <translation>向导页面</translation>
@@ -28347,7 +28347,7 @@ Preselects Qt for Simulator and mobile targets if available.</source>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneApp</name>
+    <name>Qt4ProjectManager::Internal::QtQuickApp</name>
     <message>
         <source>The QML import path &apos;%1&apos; cannot be found.</source>
         <translation>QML引入路径&apos;%1&apos;无法找到.</translation>
@@ -28370,7 +28370,7 @@ Preselects Qt for Simulator and mobile targets if available.</source>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardDialog</name>
     <message>
         <source>New Qt Quick Application</source>
         <translation>新建Qt Quick工程</translation>
@@ -28385,7 +28385,7 @@ Preselects Qt for Simulator and mobile targets if available.</source>
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizard</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizard</name>
     <message>
         <source>Qt Quick Application</source>
         <translation>Qt Quick应用程序</translation>
@@ -28398,7 +28398,7 @@ You can build the application and deploy it on desktop and mobile target platfor
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage</name>
+    <name>Qt4ProjectManager::Internal::QtQuickAppWizardSourcesPage</name>
     <message>
         <source>Select QML File</source>
         <translation>选择QMl文件</translation>
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
index a8bb66667049e34f49993865de8b2f297010df54..ee634a3eb2ba2af78b7141b5b8dbbb98ee1a1906 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
@@ -125,7 +125,7 @@ bool QtQuickApp::setExternalModules(const QStringList &uris,
     foreach (const QFileInfo &importPath, importPaths) {
         if (!importPath.exists()) {
             m_error = QCoreApplication::translate(
-                        "Qt4ProjectManager::Internal::QmlStandaloneApp",
+                        "Qt4ProjectManager::Internal::QtQuickApp",
                         "The QML import path '%1' cannot be found.")
                       .arg(QDir::toNativeSeparators(importPath.filePath()));
             return false;
@@ -149,7 +149,7 @@ bool QtQuickApp::setExternalModules(const QStringList &uris,
         }
         if (modulesCount == m_modules.count()) { // no module was added
             m_error = QCoreApplication::translate(
-                      "Qt4ProjectManager::Internal::QmlStandaloneApp",
+                      "Qt4ProjectManager::Internal::QtQuickApp",
                       "The QML module '%1' cannot be found.").arg(uri);
             return false;
         }
@@ -185,14 +185,14 @@ QString QtQuickApp::pathExtended(int fileType) const
         case QmlDirProFileRelative:         return useExistingMainQml() ? appProFilePath.relativeFilePath(m_mainQmlFile.canonicalPath())
                                                 : QString(qmlSubDir).remove(qmlSubDir.length() - 1, 1);
         case ModulesDir:                    return QLatin1String("modules");
-        default:                            qFatal("QmlStandaloneApp::pathExtended() needs more work");
+        default:                            qFatal("QtQuickApp::pathExtended() needs more work");
     }
     return QString();
 }
 
 QString QtQuickApp::originsRoot() const
 {
-    return templatesRoot() + QLatin1String("qmlapp/");
+    return templatesRoot() + QLatin1String("qtquickapp/");
 }
 
 QString QtQuickApp::mainWindowClassName() const
@@ -281,7 +281,7 @@ bool QtQuickApp::addCppPlugin(const QString &qmldirLine, QmlModule *module)
             qmldirLine.split(QLatin1Char(' '), QString::SkipEmptyParts);
     if (qmldirLineElements.count() < 2) {
         m_error = QCoreApplication::translate(
-                      "Qt4ProjectManager::Internal::QmlStandaloneApp",
+                      "Qt4ProjectManager::Internal::QtQuickApp",
                       "Invalid '%1' entry in '%2' of module '%3'.")
                   .arg(qmldir_plugin).arg(qmldir).arg(module->uri);
         return false;
@@ -310,7 +310,7 @@ bool QtQuickApp::addCppPlugin(const QString &qmldirLine, QmlModule *module)
         foundProFile = proFile_guess4.canonicalFilePath();
     } else {
         m_error = QCoreApplication::translate(
-                    "Qt4ProjectManager::Internal::QmlStandaloneApp",
+                    "Qt4ProjectManager::Internal::QtQuickApp",
                     "No .pro file for plugin '%1' cannot be found.").arg(name);
         return false;
     }
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 1499d39176a954e972effc484a607b0d78226d6e..52c146fd1422fb93ac6fb12bc02ed3900923876e 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -51,19 +51,19 @@
 namespace Qt4ProjectManager {
 namespace Internal {
 
-class QmlStandaloneAppWizardDialog : public AbstractMobileAppWizardDialog
+class QtQuickAppWizardDialog : public AbstractMobileAppWizardDialog
 {
     Q_OBJECT
 
 public:
-    explicit QmlStandaloneAppWizardDialog(QWidget *parent = 0);
+    explicit QtQuickAppWizardDialog(QWidget *parent = 0);
 
 private:
     class QtQuickAppWizardSourcesPage *m_qmlSourcesPage;
     friend class QtQuickAppWizard;
 };
 
-QmlStandaloneAppWizardDialog::QmlStandaloneAppWizardDialog(QWidget *parent)
+QtQuickAppWizardDialog::QtQuickAppWizardDialog(QWidget *parent)
     : AbstractMobileAppWizardDialog(parent)
     , m_qmlSourcesPage(0)
 {
@@ -78,7 +78,7 @@ QmlStandaloneAppWizardDialog::QmlStandaloneAppWizardDialog(QWidget *parent)
 class QtQuickAppWizardPrivate
 {
     class QtQuickApp *app;
-    class QmlStandaloneAppWizardDialog *wizardDialog;
+    class QtQuickAppWizardDialog *wizardDialog;
     friend class QtQuickAppWizard;
 };
 
@@ -116,7 +116,7 @@ Core::BaseFileWizardParameters QtQuickAppWizard::parameters()
 
 AbstractMobileAppWizardDialog *QtQuickAppWizard::createWizardDialogInternal(QWidget *parent) const
 {
-    m_d->wizardDialog = new QmlStandaloneAppWizardDialog(parent);
+    m_d->wizardDialog = new QtQuickAppWizardDialog(parent);
     return m_d->wizardDialog;
 }
 
@@ -143,7 +143,7 @@ void QtQuickAppWizard::prepareGenerateFiles(const QWizard *w,
     QString *errorMessage) const
 {
     Q_UNUSED(errorMessage)
-    const QmlStandaloneAppWizardDialog *wizard = qobject_cast<const QmlStandaloneAppWizardDialog*>(w);
+    const QtQuickAppWizardDialog *wizard = qobject_cast<const QtQuickAppWizardDialog*>(w);
     const QString mainQmlFile = wizard->m_qmlSourcesPage->mainQmlFile();
     m_d->app->setMainQmlFile(mainQmlFile);
 }