diff --git a/share/qtcreator/templates/qmlapp/qml/app/app.qml b/share/qtcreator/templates/qmlapp/qml/app/main.qml
similarity index 100%
rename from share/qtcreator/templates/qmlapp/qml/app/app.qml
rename to share/qtcreator/templates/qmlapp/qml/app/main.qml
diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
index 0bae8ed53761b71de02d9889f403e5f177e1e702..0a2daa6cc730898483a61b4521a031f505f84573 100644
--- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
@@ -164,16 +164,16 @@ QString QmlStandaloneApp::pathExtended(int fileType) const
                               + (useExistingMainQml() ? m_mainQmlFile.dir().dirName() : projectName())
                               + QLatin1Char('/');   
     const QString appViewerTargetSubDir = appViewerOriginsSubDir;
-    const QString qmlExtension = QLatin1String(".qml");
+    const QString mainQml = QLatin1String("main.qml");
     const QString pathBase = outputPathBase();
     const QDir appProFilePath(pathBase);
 
     switch (fileType) {
         case MainQml:                       return useExistingMainQml() ? m_mainQmlFile.canonicalFilePath()
-                                                : pathBase + qmlSubDir + projectName() + qmlExtension;
+                                                : pathBase + qmlSubDir + mainQml;
         case MainQmlDeployed:               return useExistingMainQml() ? qmlSubDir + m_mainQmlFile.fileName()
-                                                : QString(qmlSubDir + projectName() + qmlExtension);
-        case MainQmlOrigin:                 return originsRoot() + QLatin1String("qml/app/app.qml");
+                                                : QString(qmlSubDir + mainQml);
+        case MainQmlOrigin:                 return originsRoot() + QLatin1String("qml/app/") + mainQml;
         case AppViewerPri:                  return pathBase + appViewerTargetSubDir + appViewerPriFileName;
         case AppViewerPriOrigin:            return originsRoot() + appViewerOriginsSubDir + appViewerPriFileName;
         case AppViewerCpp:                  return pathBase + appViewerTargetSubDir + appViewerCppFileName;