Make method naming more consistent.

  * Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt

55 files changed, 405 insertions, 382 deletions

diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
index cb5518047e..a1e0eed80f 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
@@ -50,9 +50,9 @@ QWizard *CustomWidgetWizard::createWizardDialog(QWidget *parent,
                                                 const QString &defaultPath,
                                                 const WizardPageList &extensionPages) const
 {
-    CustomWidgetWizardDialog *rc = new CustomWidgetWizardDialog(name(), icon(), extensionPages, parent);
+    CustomWidgetWizardDialog *rc = new CustomWidgetWizardDialog(displayName(), icon(), extensionPages, parent);
     rc->setPath(defaultPath);
-    rc->setName(CustomWidgetWizardDialog::projectName(defaultPath));
+    rc->setProjectName(CustomWidgetWizardDialog::uniqueProjectName(defaultPath));
     rc->setFileNamingParameters(FileNamingParameters(headerSuffix(), sourceSuffix(), QtWizard::lowerCaseFiles()));
     return rc;
 }
@@ -63,7 +63,7 @@ Core::GeneratedFiles CustomWidgetWizard::generateFiles(const QWizard *w,
     const CustomWidgetWizardDialog *cw = qobject_cast<const CustomWidgetWizardDialog *>(w);
     Q_ASSERT(w);
     GenerationParameters p;
-    p.name = cw->name();
+    p.fileName = cw->projectName();
     p.path = cw->path();
     p.license = CppTools::AbstractEditorSupport::licenseTemplate();
     p.templatePath = QtWizard::templateDir();
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
index 60c7160bed..5e22af5ae5 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
@@ -76,7 +76,7 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
 
     QString baseDir = p.path;
     baseDir += slash;
-    baseDir += p.name;
+    baseDir += p.fileName;
     const QString slashLessBaseDir = baseDir;
     baseDir += slash;
 
@@ -280,7 +280,7 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
     const QString proFileContents = processTemplate(p.templatePath + QLatin1String("/tpl_plugin.pro"), sm, errorMessage);
     if (proFileContents.isEmpty())
         return QList<Core::GeneratedFile>();
-    Core::GeneratedFile proFile(baseDir + p.name + QLatin1String(".pro"));
+    Core::GeneratedFile proFile(baseDir + p.fileName + QLatin1String(".pro"));
     proFile.setContents(proFileContents);
     rc.push_back(proFile);
     return rc;
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h
index 9977f32050..3d1484207b 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h
@@ -50,7 +50,7 @@ struct PluginOptions;
 
 struct GenerationParameters {
     QString path;
-    QString name;
+    QString fileName;
     QString license;
     QString templatePath;
 };
diff --git a/src/plugins/qt4projectmanager/externaleditors.cpp b/src/plugins/qt4projectmanager/externaleditors.cpp
index 5c6cb81358..0f113175d7 100644
--- a/src/plugins/qt4projectmanager/externaleditors.cpp
+++ b/src/plugins/qt4projectmanager/externaleditors.cpp
@@ -68,15 +68,15 @@ static inline QString msgStartFailed(const QString &binary, QStringList argument
     return ExternalQtEditor::tr("Unable to start \"%1\"").arg(arguments.join(QString(QLatin1Char(' '))));
 }
 
-static inline QString msgAppNotFound(const QString &kind)
+static inline QString msgAppNotFound(const QString &id)
 {
-    return ExternalQtEditor::tr("The application \"%1\" could not be found.").arg(kind);
+    return ExternalQtEditor::tr("The application \"%1\" could not be found.").arg(id);
 }
 
 // -- Commands and helpers
 #ifdef Q_OS_MAC
-static const char *linguistBinaryC = "Linguist";
-static const char *designerBinaryC = "Designer";
+static const char * const linguistBinaryC = "Linguist";
+static const char * const designerBinaryC = "Designer";
 
 // Mac: Change the call 'Foo.app/Contents/MacOS/Foo <file>' to
 // 'open Foo.app <file>'. Do this ONLY if you do not want to have
@@ -90,21 +90,26 @@ static void createMacOpenCommand(QString *binary, QStringList *arguments)
         *binary = QLatin1String("open");
     }
 }
-
 #else
-static const char *linguistBinaryC = "linguist";
-static const char *designerBinaryC = "designer";
+static const char * const linguistBinaryC = "linguist";
+static const char * const designerBinaryC = "designer";
 #endif
 
-static const char *designerKindC = "Qt Designer";
+static const char * const designerIdC = "Qt.Designer";
+static const char * const linguistIdC = "Qt.Linguisr";
+
+static const char * const designerDisplayName = QT_TRANSLATE_NOOP("OpenWith::Editors", "Qt Designer");
+static const char * const linguistDisplayName = QT_TRANSLATE_NOOP("OpenWith::Editors", "Qt Linguist");
 
 // -------------- ExternalQtEditor
-ExternalQtEditor::ExternalQtEditor(const QString &kind,
-                              const QString &mimetype,
-                              QObject *parent) :
+ExternalQtEditor::ExternalQtEditor(const QString &id,
+                                   const QString &displayName,
+                                   const QString &mimetype,
+                                   QObject *parent) :
     Core::IExternalEditor(parent),
     m_mimeTypes(mimetype),
-    m_kind(kind)
+    m_id(id),
+    m_displayName(displayName)
 {
 }
 
@@ -113,9 +118,14 @@ QStringList ExternalQtEditor::mimeTypes() const
     return m_mimeTypes;
 }
 
-QString ExternalQtEditor::kind() const
+QString ExternalQtEditor::id() const
+{
+    return m_id;
+}
+
+QString ExternalQtEditor::displayName() const
 {
-    return m_kind;
+    return m_displayName;
 }
 
 bool ExternalQtEditor::getEditorLaunchData(const QString &fileName,
@@ -138,7 +148,7 @@ bool ExternalQtEditor::getEditorLaunchData(const QString &fileName,
         data->binary = Utils::SynchronousProcess::locateBinary(fallbackBinary);
     }
     if (data->binary.isEmpty()) {
-        *errorMessage = msgAppNotFound(kind());
+        *errorMessage = msgAppNotFound(id());
         return false;
     }
     // Setup binary + arguments, use Mac Open if appropriate
@@ -169,7 +179,8 @@ bool ExternalQtEditor::startEditorProcess(const EditorLaunchData &data, QString
 
 // --------------- LinguistExternalEditor
 LinguistExternalEditor::LinguistExternalEditor(QObject *parent) :
-       ExternalQtEditor(QLatin1String("Qt Linguist"),
+       ExternalQtEditor(QLatin1String(linguistIdC),
+                        QLatin1String(linguistDisplayName),
                         QLatin1String(Qt4ProjectManager::Constants::LINGUIST_MIMETYPE),
                         parent)
 {
@@ -186,7 +197,8 @@ bool LinguistExternalEditor::startEditor(const QString &fileName, QString *error
 
 // --------------- MacDesignerExternalEditor, using Mac 'open'
 MacDesignerExternalEditor::MacDesignerExternalEditor(QObject *parent) :
-       ExternalQtEditor(QLatin1String(designerKindC),
+       ExternalQtEditor(QLatin1String(designerIdC),
+                        QLatin1String(designerDisplayName),
                         QLatin1String(Qt4ProjectManager::Constants::FORM_MIMETYPE),
                         parent)
 {
@@ -204,7 +216,8 @@ bool MacDesignerExternalEditor::startEditor(const QString &fileName, QString *er
 
 // --------------- DesignerExternalEditor with Designer Tcp remote control.
 DesignerExternalEditor::DesignerExternalEditor(QObject *parent) :
-    ExternalQtEditor(QLatin1String(designerKindC),
+    ExternalQtEditor(QLatin1String(designerIdC),
+                     QLatin1String(designerDisplayName),
                      QLatin1String(Designer::Constants::FORM_MIMETYPE),
                      parent),
     m_terminationMapper(0)
diff --git a/src/plugins/qt4projectmanager/externaleditors.h b/src/plugins/qt4projectmanager/externaleditors.h
index b67d7af5c1..f94f9a40f0 100644
--- a/src/plugins/qt4projectmanager/externaleditors.h
+++ b/src/plugins/qt4projectmanager/externaleditors.h
@@ -58,7 +58,8 @@ class ExternalQtEditor : public Core::IExternalEditor
     Q_OBJECT
 public:
     virtual QStringList mimeTypes() const;
-    virtual QString kind() const;
+    virtual QString id() const;
+    virtual QString displayName() const;
 
 protected:
     // Method pointer for a QtVersion method return a string (command)
@@ -71,7 +72,8 @@ protected:
         QString workingDirectory;
     };
 
-    explicit ExternalQtEditor(const QString &kind,
+    explicit ExternalQtEditor(const QString &id,
+                              const QString &displayName,
                               const QString &mimetype,
                               QObject *parent = 0);
 
@@ -91,7 +93,8 @@ protected:
 
 private:
     const QStringList m_mimeTypes;
-    const QString m_kind;
+    const QString m_id;
+    const QString m_displayName;
 };
 
 // Qt Linguist
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 2ff62bb025..254465c64a 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -166,7 +166,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
     AbstractProcessStep::run(fi);
 }
 
-QString MakeStep::name()
+QString MakeStep::id()
 {
     return Constants::MAKESTEP;
 }
@@ -317,14 +317,14 @@ MakeStepFactory::~MakeStepFactory()
 {
 }
 
-bool MakeStepFactory::canCreate(const QString & name) const
+bool MakeStepFactory::canCreate(const QString &id) const
 {
-    return (name == Constants::MAKESTEP);
+    return (id == Constants::MAKESTEP);
 }
 
-ProjectExplorer::BuildStep *MakeStepFactory::create(ProjectExplorer::BuildConfiguration *bc, const QString & name) const
+ProjectExplorer::BuildStep *MakeStepFactory::create(ProjectExplorer::BuildConfiguration *bc, const QString &id) const
 {
-    Q_UNUSED(name)
+    Q_UNUSED(id);
     return new MakeStep(bc);
 }
 
@@ -341,8 +341,8 @@ QStringList MakeStepFactory::canCreateForBuildConfiguration(ProjectExplorer::Bui
         return QStringList();
 }
 
-QString MakeStepFactory::displayNameForName(const QString &name) const
+QString MakeStepFactory::displayNameForId(const QString &id) const
 {
-    Q_UNUSED(name)
+    Q_UNUSED(id);
     return tr("Make");
 }
diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index b18bca6ef2..2626acaf5f 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -52,11 +52,11 @@ class MakeStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     MakeStepFactory();
     virtual ~MakeStepFactory();
-    bool canCreate(const QString & name) const;
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildConfiguration *bc, const QString & name) const;
+    bool canCreate(const QString &id) const;
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildConfiguration *bc, const QString &id) const;
     ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const;
     QStringList canCreateForBuildConfiguration(ProjectExplorer::BuildConfiguration *bc) const;
-    QString displayNameForName(const QString &name) const;
+    QString displayNameForId(const QString &id) const;
 };
 } //namespace Internal
 
@@ -76,7 +76,7 @@ public:
 
     virtual bool init();
     virtual void run(QFutureInterface<bool> &);
-    virtual QString name();
+    virtual QString id();
     virtual QString displayName();
     virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
     virtual bool immutable() const;
diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp
index 15df3c59a1..86a7f36bd7 100644
--- a/src/plugins/qt4projectmanager/profileeditor.cpp
+++ b/src/plugins/qt4projectmanager/profileeditor.cpp
@@ -72,9 +72,9 @@ Core::IEditor *ProFileEditorEditable::duplicate(QWidget *parent)
     return ret->editableInterface();
 }
 
-const char *ProFileEditorEditable::kind() const
+QString ProFileEditorEditable::id() const
 {
-    return Qt4ProjectManager::Constants::PROFILE_EDITOR;
+    return QLatin1String(Qt4ProjectManager::Constants::PROFILE_EDITOR_ID);
 }
 
 //
diff --git a/src/plugins/qt4projectmanager/profileeditor.h b/src/plugins/qt4projectmanager/profileeditor.h
index d9673e7e42..6756dc5b78 100644
--- a/src/plugins/qt4projectmanager/profileeditor.h
+++ b/src/plugins/qt4projectmanager/profileeditor.h
@@ -57,7 +57,7 @@ public:
 
     bool duplicateSupported() const { return true; }
     Core::IEditor *duplicate(QWidget *parent);
-    const char *kind() const;
+    QString id() const;
     bool isTemporary() const { return false; }
 private:
     QList<int> m_context;
diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
index a9b96dcf75..33b7a88c69 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
@@ -46,7 +46,6 @@ using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
 
 ProFileEditorFactory::ProFileEditorFactory(Qt4Manager *manager, TextEditor::TextEditorActionHandler *handler) :
-    m_kind(QLatin1String(Qt4ProjectManager::Constants::PROFILE_EDITOR)),
     m_mimeTypes(QStringList() << QLatin1String(Qt4ProjectManager::Constants::PROFILE_MIMETYPE)
                 << QLatin1String(Qt4ProjectManager::Constants::PROINCLUDEFILE_MIMETYPE)),
     m_manager(manager),
@@ -63,14 +62,19 @@ ProFileEditorFactory::~ProFileEditorFactory()
 {
 }
 
-QString ProFileEditorFactory::kind() const
+QString ProFileEditorFactory::id() const
 {
-    return m_kind;
+    return QLatin1String(Qt4ProjectManager::Constants::PROFILE_EDITOR_ID);
+}
+
+QString ProFileEditorFactory::displayName() const
+{
+    return tr(Qt4ProjectManager::Constants::PROFILE_EDITOR_DISPLAY_NAME);
 }
 
 Core::IFile *ProFileEditorFactory::open(const QString &fileName)
 {
-    Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, kind());
+    Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, id());
     return iface ? iface->file() : 0;
 }
 
diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.h b/src/plugins/qt4projectmanager/profileeditorfactory.h
index aa41561b95..91ccf4e3da 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.h
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.h
@@ -57,14 +57,14 @@ public:
     ~ProFileEditorFactory();
 
     virtual QStringList mimeTypes() const;
-    virtual QString kind() const;
+    virtual QString id() const;
+    virtual QString displayName() const;
     Core::IFile *open(const QString &fileName);
     Core::IEditor *createEditor(QWidget *parent);
 
     inline Qt4Manager *qt4ProjectManager() const { return m_manager; }
 
 private:
-    const QString m_kind;
     const QStringList m_mimeTypes;
     Qt4Manager *m_manager;
     TextEditor::TextEditorActionHandler *m_actionHandler;
diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp
index 04d46cb2ca..4051ae0b22 100644
--- a/src/plugins/qt4projectmanager/projectloadwizard.cpp
+++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp
@@ -172,7 +172,7 @@ void ProjectLoadWizard::setupImportPage(QtVersion *version, QtVersion::QmakeBuil
     QVBoxLayout *importLayout = new QVBoxLayout(importPage);
     importLabel = new QLabel(importPage);
 
-    QString versionString = version->name() + " (" + QDir::toNativeSeparators(version->qmakeCommand()) + ")";
+    QString versionString = version->displayName() + " (" + QDir::toNativeSeparators(version->qmakeCommand()) + ")";
     QString buildConfigString = (buildConfig & QtVersion::BuildAll) ? QLatin1String("debug_and_release ") : QLatin1String("");
     buildConfigString.append((buildConfig & QtVersion::DebugBuild) ? QLatin1String("debug") : QLatin1String("release"));
     importLabel->setTextFormat(Qt::RichText);
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 545ecd0a2e..920c9f0f77 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -161,7 +161,7 @@ void QMakeStep::run(QFutureInterface<bool> &fi)
     AbstractProcessStep::run(fi);
 }
 
-QString QMakeStep::name()
+QString QMakeStep::id()
 {
     return QLatin1String(Constants::QMAKESTEP);
 }
@@ -374,14 +374,14 @@ QMakeStepFactory::~QMakeStepFactory()
 {
 }
 
-bool QMakeStepFactory::canCreate(const QString & name) const
+bool QMakeStepFactory::canCreate(const QString &id) const
 {
-    return (name == Constants::QMAKESTEP);
+    return (id == Constants::QMAKESTEP);
 }
 
-ProjectExplorer::BuildStep *QMakeStepFactory::create(BuildConfiguration *bc, const QString & name) const
+ProjectExplorer::BuildStep *QMakeStepFactory::create(BuildConfiguration *bc, const QString &id) const
 {
-    Q_UNUSED(name)
+    Q_UNUSED(id);
     return new QMakeStep(bc);
 }
 
@@ -398,9 +398,9 @@ QStringList QMakeStepFactory::canCreateForBuildConfiguration(ProjectExplorer::Bu
     return QStringList();
 }
 
-QString QMakeStepFactory::displayNameForName(const QString &name) const
+QString QMakeStepFactory::displayNameForId(const QString &id) const
 {
-    Q_UNUSED(name);
+    Q_UNUSED(id);
     return tr("QMake");
 }
 
diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h
index acee94ad52..53fa52d2e8 100644
--- a/src/plugins/qt4projectmanager/qmakestep.h
+++ b/src/plugins/qt4projectmanager/qmakestep.h
@@ -54,11 +54,11 @@ class QMakeStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     QMakeStepFactory();
     virtual ~QMakeStepFactory();
-    bool canCreate(const QString & name) const;
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildConfiguration *bc, const QString & name) const;
+    bool canCreate(const QString & id) const;
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildConfiguration *bc, const QString &id) const;
     ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const;
     QStringList canCreateForBuildConfiguration(ProjectExplorer::BuildConfiguration *bc) const;
-    QString displayNameForName(const QString &name) const;
+    QString displayNameForId(const QString &id) const;
 };
 
 } // namespace Internal
@@ -74,7 +74,7 @@ public:
     Internal::Qt4BuildConfiguration *qt4BuildConfiguration() const;
     virtual bool init();
     virtual void run(QFutureInterface<bool> &);
-    virtual QString name();
+    virtual QString id();
     virtual QString displayName();
     virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
     virtual bool immutable() const;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index ff1cb5668a..97a3d6f2dd 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -113,10 +113,10 @@ MaemoRunConfiguration::MaemoRunConfiguration(Project *project,
     , qemu(0)
 {
     if (!m_proFilePath.isEmpty()) {
-        setName(tr("%1 on Maemo device").arg(QFileInfo(m_proFilePath)
+        setDisplayName(tr("%1 on Maemo device").arg(QFileInfo(m_proFilePath)
             .completeBaseName()));
     } else {
-        setName(tr("MaemoRunConfiguration"));
+        setDisplayName(tr("MaemoRunConfiguration"));
     }
 
     connect(&MaemoDeviceConfigurations::instance(), SIGNAL(updated()),
@@ -148,7 +148,7 @@ MaemoRunConfiguration::~MaemoRunConfiguration()
     qemu = NULL;
 }
 
-QString MaemoRunConfiguration::type() const
+QString MaemoRunConfiguration::id() const
 {
     return QLatin1String("Qt4ProjectManager.MaemoRunConfiguration");
 }
@@ -421,7 +421,7 @@ void MaemoRunConfiguration::updateTarget()
         if (info.error == Qt4TargetInformation::ProParserError) {
             Core::ICore::instance()->messageManager()->printToOutputPane(tr(
                 "Could not parse %1. The Maemo run configuration %2 "
-                "can not be started.").arg(m_proFilePath).arg(name()));
+                "can not be started.").arg(m_proFilePath).arg(displayName()));
         }
         emit targetInformationChanged();
         return;
@@ -561,12 +561,12 @@ MaemoRunConfigurationFactory::~MaemoRunConfigurationFactory()
 {
 }
 
-bool MaemoRunConfigurationFactory::canRestore(const QString &type) const
+bool MaemoRunConfigurationFactory::canRestore(const QString &id) const
 {
-    return type == "Qt4ProjectManager.MaemoRunConfiguration";
+    return id == "Qt4ProjectManager.MaemoRunConfiguration";
 }
 
-QStringList MaemoRunConfigurationFactory::availableCreationTypes(
+QStringList MaemoRunConfigurationFactory::availableCreationIds(
     Project *pro) const
 {
     Qt4Project *qt4project = qobject_cast<Qt4Project *>(pro);
@@ -581,16 +581,15 @@ QStringList MaemoRunConfigurationFactory::availableCreationTypes(
     return QStringList();
 }
 
-QString MaemoRunConfigurationFactory::displayNameForType(
-    const QString &type) const
+QString MaemoRunConfigurationFactory::displayNameForId(const QString &id) const
 {
     const int size = QString::fromLocal8Bit("MaemoRunConfiguration.").size();
-    return tr("%1 on Maemo Device").arg(QFileInfo(type.mid(size))
+    return tr("%1 on Maemo Device").arg(QFileInfo(id.mid(size))
         .completeBaseName());
 }
 
 RunConfiguration *MaemoRunConfigurationFactory::create(Project *project,
-    const QString &type)
+    const QString &id)
 {
     Qt4Project *qt4project = qobject_cast<Qt4Project *>(project);
     Q_ASSERT(qt4project);
@@ -602,10 +601,10 @@ RunConfiguration *MaemoRunConfigurationFactory::create(Project *project,
 
     RunConfiguration *rc = 0;
     const QLatin1String prefix("MaemoRunConfiguration.");
-    if (type.startsWith(prefix)) {
-        rc = new MaemoRunConfiguration(qt4project, type.mid(QString(prefix).size()));
+    if (id.startsWith(prefix)) {
+        rc = new MaemoRunConfiguration(qt4project, id.mid(QString(prefix).size()));
     } else {
-        Q_ASSERT(type == "Qt4ProjectManager.MaemoRunConfiguration");
+        Q_ASSERT(id == "Qt4ProjectManager.MaemoRunConfiguration");
         rc = new MaemoRunConfiguration(qt4project, QString::null);
     }
 
@@ -642,35 +641,35 @@ bool hasMaemoRunConfig(ProjectExplorer::Project* project)
 }
 
 void MaemoRunConfigurationFactory::addedRunConfiguration(
-    ProjectExplorer::Project* project)
+    ProjectExplorer::Project *project)
 {
     if (hasMaemoRunConfig(project))
         MaemoManager::instance()->addQemuSimulatorStarter(project);
 }
 
 void MaemoRunConfigurationFactory::removedRunConfiguration(
-    ProjectExplorer::Project* project)
+    ProjectExplorer::Project *project)
 {
     if (!hasMaemoRunConfig(project))
         MaemoManager::instance()->removeQemuSimulatorStarter(project);
 }
 
 void MaemoRunConfigurationFactory::projectAdded(
-    ProjectExplorer::Project* project)
+    ProjectExplorer::Project *project)
 {
     if (hasMaemoRunConfig(project))
         MaemoManager::instance()->addQemuSimulatorStarter(project);
 }
 
 void MaemoRunConfigurationFactory::projectRemoved(
-    ProjectExplorer::Project* project)
+    ProjectExplorer::Project *project)
 {
     if (hasMaemoRunConfig(project))
         MaemoManager::instance()->removeQemuSimulatorStarter(project);
 }
 
 void MaemoRunConfigurationFactory::currentProjectChanged(
-    ProjectExplorer::Project* project)
+    ProjectExplorer::Project *project)
 {
     bool hasRunConfig = hasMaemoRunConfig(project);
     MaemoManager::instance()->setQemuSimulatorStarterEnabled(hasRunConfig);
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
index 94ca55fe2e..f9d39af039 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
@@ -70,7 +70,7 @@ public:
                           const QString &proFilePath);
     ~MaemoRunConfiguration();
 
-    QString type() const;
+    QString id() const;
     bool isEnabled(ProjectExplorer::BuildConfiguration *config) const;
     using RunConfiguration::isEnabled;
     QWidget *configurationWidget();
@@ -173,7 +173,6 @@ private:
 #endif
 };
 
-
 class MaemoRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory
 {
     Q_OBJECT
@@ -181,20 +180,18 @@ public:
     MaemoRunConfigurationFactory(QObject *parent);
     ~MaemoRunConfigurationFactory();
 
-    bool canRestore(const QString &type) const;
-    QStringList availableCreationTypes(ProjectExplorer::Project *project) const;
-    QString displayNameForType(const QString &type) const;
-    ProjectExplorer::RunConfiguration *create(ProjectExplorer::Project *project,
-                                              const QString &type);
-
+    bool canRestore(const QString &id) const;
+    QStringList availableCreationIds(ProjectExplorer::Project *project) const;
+    QString displayNameForId(const QString &id) const;
+    ProjectExplorer::RunConfiguration *create(ProjectExplorer::Project *project, const QString &id);
 
 private slots:
-    void addedRunConfiguration(ProjectExplorer::Project* project);
-    void removedRunConfiguration(ProjectExplorer::Project* project);
+    void addedRunConfiguration(ProjectExplorer::Project *project);
+    void removedRunConfiguration(ProjectExplorer::Project *project);
 
-    void projectAdded(ProjectExplorer::Project* project);
-    void projectRemoved(ProjectExplorer::Project* project);
-    void currentProjectChanged(ProjectExplorer::Project* project);
+    void projectAdded(ProjectExplorer::Project *project);
+    void projectRemoved(ProjectExplorer::Project *project);
+    void currentProjectChanged(ProjectExplorer::Project *project);
 };
 
 
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
index 503930b057..92c9f7e82d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
@@ -63,7 +63,7 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
     setLayout(mainLayout);
 
     mainLayout->setFormAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-    m_configNameLineEdit = new QLineEdit(m_runConfiguration->name());
+    m_configNameLineEdit = new QLineEdit(m_runConfiguration->displayName());
     mainLayout->addRow(tr("Run configuration name:"), m_configNameLineEdit);
     QWidget *devConfWidget = new QWidget;
     QHBoxLayout *devConfLayout = new QHBoxLayout(devConfWidget);
@@ -105,7 +105,7 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
 
 void MaemoRunConfigurationWidget::configNameEdited(const QString &text)
 {
-    m_runConfiguration->setName(text);
+    m_runConfiguration->setDisplayName(text);
 }
 
 void MaemoRunConfigurationWidget::argumentsEdited(const QString &text)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp
index 0fe08e2f1d..86f1724dbf 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp
@@ -95,7 +95,7 @@ public:
     {
     }
 
-    void setName(const QString &name) { m_oldName = name; }
+    void setDisplayName(const QString &name) { m_oldName = name; }
 
     virtual State validate(QString &input, int & /* pos */) const
     {
@@ -186,7 +186,7 @@ QString MaemoSettingsPage::id() const
     return QLatin1String(PAGE_ID);
 }
 
-QString MaemoSettingsPage::trName() const
+QString MaemoSettingsPage::displayName() const
 {
     return tr(PAGE_ID_TR);
 }
@@ -196,7 +196,7 @@ QString MaemoSettingsPage::category() const
     return QLatin1String(Constants::QT_SETTINGS_CATEGORY);
 }
 
-QString MaemoSettingsPage::trCategory() const
+QString MaemoSettingsPage::displayCategory() const
 {
     return QCoreApplication::translate("Qt4ProjectManager",
         Constants::QT_SETTINGS_CATEGORY);
@@ -311,7 +311,7 @@ void MaemoSettingsWidget::display(const MaemoDeviceConfig &devConfig)
     m_ui->pwdLineEdit->setText(devConfig.pwd);
     m_ui->keyFileLineEdit->setPath(devConfig.keyFile);
     m_ui->detailsWidget->setEnabled(true);
-    m_nameValidator.setName(devConfig.name);
+    m_nameValidator.setDisplayName(devConfig.name);
     m_portValidator.setValue(devConfig.port);
     m_timeoutValidator.setValue(devConfig.timeout);
     m_ui->detailsWidget->setEnabled(true);
@@ -337,7 +337,7 @@ void MaemoSettingsWidget::configNameEditingFinished()
 {
     const QString &newName = m_ui->nameLineEdit->text();
     currentConfig().name = newName;
-    m_nameValidator.setName(newName);
+    m_nameValidator.setDisplayName(newName);
     m_ui->configListWidget->currentItem()->setText(newName);
 }
 
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.h b/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.h
index 0b9171ad8d..ca48160a79 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.h
@@ -57,9 +57,9 @@ public:
     ~MaemoSettingsPage();
 
     virtual QString id() const;
-    virtual QString trName() const;
+    virtual QString displayName() const;
     virtual QString category() const;
-    virtual QString trCategory() const;
+    virtual QString displayCategory() const;
     virtual QWidget *createPage(QWidget *parent);
     virtual void apply();
     virtual void finish();
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 4d10173ad7..a7ce8a4b4b 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -93,9 +93,9 @@ S60DeviceRunConfiguration::S60DeviceRunConfiguration(Project *project, const QSt
     m_signingMode(SignSelf)
 {
     if (!m_proFilePath.isEmpty())
-        setName(tr("%1 on Symbian Device").arg(QFileInfo(m_proFilePath).completeBaseName()));
+        setDisplayName(tr("%1 on Symbian Device").arg(QFileInfo(m_proFilePath).completeBaseName()));
     else
-        setName(tr("QtS60DeviceRunConfiguration"));
+        setDisplayName(tr("QtS60DeviceRunConfiguration"));
 
     connect(project, SIGNAL(targetInformationChanged()),
             this, SLOT(invalidateCachedTargetInformation()));
@@ -120,7 +120,7 @@ Qt4Project *S60DeviceRunConfiguration::qt4Project() const
     return static_cast<Qt4Project *>(project());
 }
 
-QString S60DeviceRunConfiguration::type() const
+QString S60DeviceRunConfiguration::id() const
 {
     return QLatin1String("Qt4ProjectManager.DeviceRunConfiguration");
 }
@@ -286,7 +286,7 @@ void S60DeviceRunConfiguration::updateTarget()
         if (info.error == Qt4TargetInformation::ProParserError) {
             Core::ICore::instance()->messageManager()->printToOutputPane(
                     tr("Could not parse %1. The QtS60 Device run configuration %2 can not be started.")
-                    .arg(m_proFilePath).arg(name()));
+                    .arg(m_proFilePath).arg(displayName()));
         }
         m_targetName = QString::null;
         m_baseFileName = QString::null;
@@ -347,12 +347,12 @@ S60DeviceRunConfigurationFactory::~S60DeviceRunConfigurationFactory()
 {
 }
 
-bool S60DeviceRunConfigurationFactory::canRestore(const QString &type) const
+bool S60DeviceRunConfigurationFactory::canRestore(const QString &id) const
 {
-    return type == "Qt4ProjectManager.DeviceRunConfiguration";
+    return id == "Qt4ProjectManager.DeviceRunConfiguration";
 }
 
-QStringList S60DeviceRunConfigurationFactory::availableCreationTypes(Project *pro) const
+QStringList S60DeviceRunConfigurationFactory::availableCreationIds(Project *pro) const
 {
     Qt4Project *qt4project = qobject_cast<Qt4Project *>(pro);
     if (qt4project) {
@@ -367,21 +367,21 @@ QStringList S60DeviceRunConfigurationFactory::availableCreationTypes(Project *pr
     }
 }
 
-QString S60DeviceRunConfigurationFactory::displayNameForType(const QString &type) const
+QString S60DeviceRunConfigurationFactory::displayNameForId(const QString &id) const
 {
-    QString fileName = type.mid(QString("QtSymbianDeviceRunConfiguration.").size());
+    QString fileName = id.mid(QString("QtSymbianDeviceRunConfiguration.").size());
     return tr("%1 on Symbian Device").arg(QFileInfo(fileName).completeBaseName());
 }
 
-RunConfiguration *S60DeviceRunConfigurationFactory::create(Project *project, const QString &type)
+RunConfiguration *S60DeviceRunConfigurationFactory::create(Project *project, const QString &id)
 {
     Qt4Project *p = qobject_cast<Qt4Project *>(project);
     Q_ASSERT(p);
-    if (type.startsWith("QtSymbianDeviceRunConfiguration.")) {
-        QString fileName = type.mid(QString("QtSymbianDeviceRunConfiguration.").size());
+    if (id.startsWith("QtSymbianDeviceRunConfiguration.")) {
+        QString fileName = id.mid(QString("QtSymbianDeviceRunConfiguration.").size());
         return new S60DeviceRunConfiguration(p, fileName);
     }
-    Q_ASSERT(type == "Qt4ProjectManager.DeviceRunConfiguration");
+    Q_ASSERT(id == "Qt4ProjectManager.DeviceRunConfiguration");
     // The right path is set in restoreSettings
     RunConfiguration *rc = new S60DeviceRunConfiguration(p, QString::null);
     return rc;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index 8bfe992aa3..11b3db05b7 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -67,7 +67,7 @@ public:
 
     Qt4Project *qt4Project() const;
 
-    QString type() const;
+    QString id() const;
     bool isEnabled(ProjectExplorer::BuildConfiguration *configuration) const;
     QWidget *configurationWidget();
     void save(ProjectExplorer::PersistentSettingsWriter &writer) const;
@@ -127,11 +127,11 @@ class S60DeviceRunConfigurationFactory : public ProjectExplorer::IRunConfigurati
 public:
     explicit S60DeviceRunConfigurationFactory(QObject *parent);
     ~S60DeviceRunConfigurationFactory();
-    bool canRestore(const QString &type) const;
-    QStringList availableCreationTypes(ProjectExplorer::Project *pro) const;
-    // used to translate the types to names to display to the user
-    QString displayNameForType(const QString &type) const;
-    ProjectExplorer::RunConfiguration *create(ProjectExplorer::Project *project, const QString &type);
+    bool canRestore(const QString &id) const;
+    QStringList availableCreationIds(ProjectExplorer::Project *pro) const;
+    // used to translate the ids to names to display to the user
+    QString displayNameForId(const QString &id) const;
+    ProjectExplorer::RunConfiguration *create(ProjectExplorer::Project *project, const QString &id);
 };
 
 /* S60DeviceRunControlBase: Builds the package and starts launcher
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
index 7fbbf9f7fc..ac5820c4b8 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
@@ -69,7 +69,7 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget(
     m_runConfiguration(runConfiguration),
     m_detailsWidget(new Utils::DetailsWidget),
     m_serialPortsCombo(new QComboBox),
-    m_nameLineEdit(new QLineEdit(m_runConfiguration->name())),
+    m_nameLineEdit(new QLineEdit(m_runConfiguration->displayName())),
     m_sisxFileLabel(new QLabel),
     m_deviceInfoButton(new QToolButton),
     m_deviceInfoDescriptionLabel(new QLabel(tr("Device:"))),
@@ -162,7 +162,7 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget(
     keyPath->setPath(m_runConfiguration->customKeyPath());
 
     connect(m_nameLineEdit, SIGNAL(textEdited(QString)),
-            this, SLOT(nameEdited(QString)));
+            this, SLOT(displayNameEdited(QString)));
     connect(m_runConfiguration, SIGNAL(targetInformationChanged()),
             this, SLOT(updateTargetInformation()));
     connect(selfSign, SIGNAL(toggled(bool)), this, SLOT(selfSignToggled(bool)));
@@ -216,9 +216,9 @@ CommunicationDevice S60DeviceRunConfigurationWidget::currentDevice() const
     return device(m_serialPortsCombo->currentIndex());
 }
 
-void S60DeviceRunConfigurationWidget::nameEdited(const QString &text)
+void S60DeviceRunConfigurationWidget::displayNameEdited(const QString &text)
 {
-    m_runConfiguration->setName(text);
+    m_runConfiguration->setDisplayName(text);
 }
 
 void S60DeviceRunConfigurationWidget::updateTargetInformation()
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h
index 18f736da73..83de31aa4a 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h
@@ -66,7 +66,7 @@ public:
                                       QWidget *parent = 0);
 
 private slots:
-    void nameEdited(const QString &text);
+    void displayNameEdited(const QString &text);
     void updateTargetInformation();
     void updateSerialDevices();
     void setSerialPort(int index);
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp
index 9c6e4830ec..5cac9cf955 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp
@@ -109,7 +109,7 @@ QString S60DevicesPreferencePane::id() const
     return QLatin1String("Z.S60 SDKs");
 }
 
-QString S60DevicesPreferencePane::trName() const
+QString S60DevicesPreferencePane::displayName() const
 {
     return tr("S60 SDKs");
 }
@@ -119,7 +119,7 @@ QString S60DevicesPreferencePane::category() const
     return QLatin1String(Constants::QT_SETTINGS_CATEGORY);
 }
 
-QString S60DevicesPreferencePane::trCategory() const
+QString S60DevicesPreferencePane::displayCategory() const
 {
     return QCoreApplication::translate("Qt4ProjectManager", Constants::QT_SETTINGS_CATEGORY);
 }
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h
index 92efc14e49..19e9008c51 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h
@@ -70,9 +70,9 @@ public:
     ~S60DevicesPreferencePane();
 
     QString id() const;
-    QString trName() const;
+    QString displayName() const;
     QString category() const;
-    QString trCategory() const;
+    QString displayCategory() const;
 
     QWidget *createPage(QWidget *parent);
     void apply();
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
index 2672e54c5e..6e39e1f98f 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
@@ -58,9 +58,9 @@ S60EmulatorRunConfiguration::S60EmulatorRunConfiguration(Project *project, const
     m_cachedTargetInformationValid(false)
 {
     if (!m_proFilePath.isEmpty())
-        setName(tr("%1 in Symbian Emulator").arg(QFileInfo(m_proFilePath).completeBaseName()));
+        setDisplayName(tr("%1 in Symbian Emulator").arg(QFileInfo(m_proFilePath).completeBaseName()));
     else
-        setName(tr("QtSymbianEmulatorRunConfiguration"));
+        setDisplayName(tr("QtSymbianEmulatorRunConfiguration"));
 
     connect(project, SIGNAL(targetInformationChanged()),
             this, SLOT(invalidateCachedTargetInformation()));
@@ -85,7 +85,7 @@ Qt4Project *S60EmulatorRunConfiguration::qt4Project() const
     return static_cast<Qt4Project *>(project());
 }
 
-QString S60EmulatorRunConfiguration::type() const
+QString S60EmulatorRunConfiguration::id() const
 {
     return "Qt4ProjectManager.EmulatorRunConfiguration";
 }
@@ -133,7 +133,7 @@ void S60EmulatorRunConfiguration::updateTarget()
         if (info.error == Qt4TargetInformation::ProParserError) {
             Core::ICore::instance()->messageManager()->printToOutputPane(
                     tr("Could not parse %1. The Qt for Symbian emulator run configuration %2 can not be started.")
-                    .arg(m_proFilePath).arg(name()));
+                    .arg(m_proFilePath).arg(displayName()));
         }
         m_executable = QString::null;
         m_cachedTargetInformationValid = true;
@@ -170,7 +170,7 @@ S60EmulatorRunConfigurationWidget::S60EmulatorRunConfigurationWidget(S60Emulator
     : QWidget(parent),
     m_runConfiguration(runConfiguration),
     m_detailsWidget(new Utils::DetailsWidget),
-    m_nameLineEdit(new QLineEdit(m_runConfiguration->name())),
+    m_nameLineEdit(new QLineEdit(m_runConfiguration->displayName())),
     m_executableLabel(new QLabel(m_runConfiguration->executable()))
 {
     QVBoxLayout *mainBoxLayout = new QVBoxLayout();
@@ -192,15 +192,15 @@ S60EmulatorRunConfigurationWidget::S60EmulatorRunConfigurationWidget(S60Emulator
     detailsFormLayout->addRow(tr("Executable:"), m_executableLabel);
 
     connect(m_nameLineEdit, SIGNAL(textEdited(QString)),
-        this, SLOT(nameEdited(QString)));
+        this, SLOT(displayNameEdited(QString)));
     connect(m_runConfiguration, SIGNAL(targetInformationChanged()),
             this, SLOT(updateTargetInformation()));
     updateSummary();
 }
 
-void S60EmulatorRunConfigurationWidget::nameEdited(const QString &text)
+void S60EmulatorRunConfigurationWidget::displayNameEdited(const QString &text)
 {
-    m_runConfiguration->setName(text);
+    m_runConfiguration->setDisplayName(text);
 }
 
 void S60EmulatorRunConfigurationWidget::updateTargetInformation()
@@ -224,12 +224,12 @@ S60EmulatorRunConfigurationFactory::~S60EmulatorRunConfigurationFactory()
 {
 }
 
-bool S60EmulatorRunConfigurationFactory::canRestore(const QString &type) const
+bool S60EmulatorRunConfigurationFactory::canRestore(const QString &id) const
 {
-    return type == "Qt4ProjectManager.EmulatorRunConfiguration";
+    return id == "Qt4ProjectManager.EmulatorRunConfiguration";
 }
 
-QStringList S60EmulatorRunConfigurationFactory::availableCreationTypes(Project *pro) const
+QStringList S60EmulatorRunConfigurationFactory::availableCreationIds(Project *pro) const
 {
     Qt4Project *qt4project = qobject_cast<Qt4Project *>(pro);
     if (qt4project) {
@@ -244,21 +244,21 @@ QStringList S60EmulatorRunConfigurationFactory::availableCreationTypes(Project *
     }
 }
 
-QString S60EmulatorRunConfigurationFactory::displayNameForType(const QString &type) const
+QString S60EmulatorRunConfigurationFactory::displayNameForId(const QString &id) const
 {
-    QString fileName = type.mid(QString("QtSymbianEmulatorRunConfiguration.").size());
+    QString fileName = id.mid(QString("QtSymbianEmulatorRunConfiguration.").size());
     return tr("%1 in Symbian Emulator").arg(QFileInfo(fileName).completeBaseName());
 }
 
-RunConfiguration *S60EmulatorRunConfigurationFactory::create(Project *project, const QString &type)
+RunConfiguration *S60EmulatorRunConfigurationFactory::create(Project *project, const QString &id)
 {
     Qt4Project *p = qobject_cast<Qt4Project *>(project);
     Q_ASSERT(p);
-    if (type.startsWith("QtSymbianEmulatorRunConfiguration.")) {
-        QString fileName = type.mid(QString("QtSymbianEmulatorRunConfiguration.").size());
+    if (id.startsWith("QtSymbianEmulatorRunConfiguration.")) {
+        QString fileName = id.mid(QString("QtSymbianEmulatorRunConfiguration.").size());
         return new S60EmulatorRunConfiguration(p, fileName);
     }
-    Q_ASSERT(type == "Qt4ProjectManager.EmulatorRunConfiguration");
+    Q_ASSERT(id == "Qt4ProjectManager.EmulatorRunConfiguration");
     // The right path is set in restoreSettings
     RunConfiguration *rc = new S60EmulatorRunConfiguration(p, QString::null);
     return rc;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
index b5db9a313b..c4aa2103bf 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
@@ -59,7 +59,7 @@ public:
 
     Qt4Project *qt4Project() const;
 
-    QString type() const;
+    QString id() const;
     bool isEnabled(ProjectExplorer::BuildConfiguration *configuration) const;
     QWidget *configurationWidget();
     void save(ProjectExplorer::PersistentSettingsWriter &writer) const;
@@ -90,7 +90,7 @@ public:
                                       QWidget *parent = 0);
 
 private slots:
-    void nameEdited(const QString &text);
+    void displayNameEdited(const QString &text);
     void updateTargetInformation();
     void updateSummary();
 
@@ -107,11 +107,11 @@ class S60EmulatorRunConfigurationFactory : public ProjectExplorer::IRunConfigura
 public:
     explicit S60EmulatorRunConfigurationFactory(QObject *parent);
     ~S60EmulatorRunConfigurationFactory();
-    bool canRestore(const QString &type) const;
-    QStringList availableCreationTypes(ProjectExplorer::Project *pro) const;
-    // used to translate the types to names to display to the user
-    QString displayNameForType(const QString &type) const;
-    ProjectExplorer::RunConfiguration *create(ProjectExplorer::Project *project, const QString &type);
+    bool canRestore(const QString &id) const;
+    QStringList availableCreationIds(ProjectExplorer::Project *pro) const;
+    // used to translate the ids to names to display to the user
+    QString displayNameForId(const QString &id) const;
+    ProjectExplorer::RunConfiguration *create(ProjectExplorer::Project *project, const QString &id);
 };
 
 class S60EmulatorRunControl : public ProjectExplorer::RunControl
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
index fa7bf32ee5..e8853ff768 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
@@ -183,12 +183,12 @@ void S60Manager::updateQtVersions()
         }
         if (deviceVersion) {
             deviceVersion->setQMakeCommand(qmakeFromQtDir(device.qt));
-            deviceVersion->setName(QString("%1 (Qt %2)").arg(device.id, deviceVersion->qtVersionString()));
+            deviceVersion->setDisplayName(QString("%1 (Qt %2)").arg(device.id, deviceVersion->qtVersionString()));
             handledVersions.append(deviceVersion);
         } else {
             deviceVersion = new QtVersion(QString("%1 (Qt %2)").arg(device.id), qmakeFromQtDir(device.qt),
                                           true, QString("%1.%2").arg(S60_AUTODETECTION_SOURCE, device.id));
-            deviceVersion->setName(deviceVersion->name().arg(deviceVersion->qtVersionString()));
+            deviceVersion->setDisplayName(deviceVersion->displayName().arg(deviceVersion->qtVersionString()));
             versionsToAdd.append(deviceVersion);
         }
         deviceVersion->setS60SDKDirectory(device.epocRoot);
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index eae0c39b8b..2a2a9d49bd 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -28,8 +28,13 @@
 **************************************************************************/
 
 #include "qt4buildconfiguration.h"
+
 #include "qt4project.h"
 
+#include <utils/qtcassert.h>
+
+#include <QtGui/QInputDialog>
+
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
 using namespace ProjectExplorer;
@@ -501,3 +506,90 @@ QString Qt4BuildConfiguration::extractSpecFromArgumentList(const QStringList &li
 #endif
     return parsedSpec;
 }
+
+/*!
+  \class Qt4BuildConfigurationFactory
+*/
+
+Qt4BuildConfigurationFactory::Qt4BuildConfigurationFactory(Qt4Project *project)
+    : IBuildConfigurationFactory(project),
+    m_project(project)
+{
+    update();
+
+    QtVersionManager *vm = QtVersionManager::instance();
+    connect(vm, SIGNAL(defaultQtVersionChanged()),
+            this, SLOT(update()));
+    connect(vm, SIGNAL(qtVersionsChanged(QList<int>)),
+            this, SLOT(update()));
+}
+
+Qt4BuildConfigurationFactory::~Qt4BuildConfigurationFactory()
+{
+}
+
+void Qt4BuildConfigurationFactory::update()
+{
+
+    m_versions.clear();
+    m_versions.insert(QLatin1String("DefaultQt"), VersionInfo(tr("Using Default Qt Version"), 0));
+    QtVersionManager *vm = QtVersionManager::instance();
+    foreach (const QtVersion *version, vm->versions()) {
+        m_versions.insert(QString::fromLatin1("Qt%1").arg(version->uniqueId()),
+                          VersionInfo(tr("Using Qt Version \"%1\"").arg(version->displayName()), version->uniqueId()));
+    }
+    emit availableCreationIdsChanged();
+}
+
+QStringList Qt4BuildConfigurationFactory::availableCreationIds() const
+{
+    return m_versions.keys();
+}
+
+QString Qt4BuildConfigurationFactory::displayNameForId(const QString &id) const
+{
+    if (m_versions.contains(id))
+        return m_versions.value(id).displayName;
+    return QString();
+}
+
+BuildConfiguration *Qt4BuildConfigurationFactory::create(const QString &id) const
+{
+    QTC_ASSERT(m_versions.contains(id), return false);
+    const VersionInfo &info = m_versions.value(id);
+    QtVersion *version = QtVersionManager::instance()->version(info.versionId);
+    if (!version)
+        return false;
+    bool ok;
+    QString buildConfigurationName = QInputDialog::getText(0,
+                          tr("New configuration"),
+                          tr("New Configuration Name:"),
+                          QLineEdit::Normal,
+                          version->displayName(),
+                          &ok);
+    if (!ok || buildConfigurationName.isEmpty())
+        return false;
+
+    m_project->addQt4BuildConfiguration(tr("%1 Debug").arg(buildConfigurationName),
+                                     version,
+                                     (version->defaultBuildConfig() | QtVersion::DebugBuild));
+    BuildConfiguration *bc =
+    m_project->addQt4BuildConfiguration(tr("%1 Release").arg(buildConfigurationName),
+                                     version,
+                                     (version->defaultBuildConfig() & ~QtVersion::DebugBuild));
+    return bc;
+}
+
+BuildConfiguration *Qt4BuildConfigurationFactory::clone(BuildConfiguration *source) const
+{
+    Qt4BuildConfiguration *oldbc = static_cast<Qt4BuildConfiguration *>(source);
+    Qt4BuildConfiguration *newbc = new Qt4BuildConfiguration(oldbc);
+    return newbc;
+}
+
+BuildConfiguration *Qt4BuildConfigurationFactory::restore(const QMap<QString, QVariant> &values) const
+{
+    Qt4BuildConfiguration *bc = new Qt4BuildConfiguration(m_project, values);
+    return bc;
+}
+
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
index 45febf077f..ea913fe308 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
@@ -138,6 +138,37 @@ private:
     QtVersion::QmakeBuildConfigs m_qmakeBuildConfiguration;
 };
 
+class Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
+{
+    Q_OBJECT
+
+public:
+    Qt4BuildConfigurationFactory(Qt4Project *project);
+    ~Qt4BuildConfigurationFactory();
+
+    QStringList availableCreationIds() const;
+    QString displayNameForId(const QString &id) const;
+
+    ProjectExplorer::BuildConfiguration *create(const QString &id) const;
+    ProjectExplorer::BuildConfiguration *clone(ProjectExplorer::BuildConfiguration *source) const;
+    ProjectExplorer::BuildConfiguration *restore(const QVariantMap &values) const;
+
+private slots:
+    void update();
+
+private:
+    struct VersionInfo {
+        VersionInfo() {}
+        VersionInfo(const QString &d, int v)
+            : displayName(d), versionId(v) { }
+        QString displayName;
+        int versionId;
+    };
+
+    Qt4Project *m_project;
+    QMap<QString, VersionInfo> m_versions;
+};
+
 } // namespace Qt4ProjectManager
 } // namespace Internal
 
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index c428cddb03..987e1ec58d 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -237,10 +237,10 @@ namespace Internal {
             QMap<QString, InternalNode*>::const_iterator newNodeIter = subnodes.constBegin();;
             while (existingNodeIter != existingFolderNodes.constEnd()
                    && newNodeIter != subnodes.constEnd()) {
-                if ((*existingNodeIter)->name() < newNodeIter.key()) {
+                if ((*existingNodeIter)->displayName() < newNodeIter.key()) {
                     foldersToRemove << *existingNodeIter;
                     ++existingNodeIter;
-                } else if ((*existingNodeIter)->name() > newNodeIter.key()) {
+                } else if ((*existingNodeIter)->displayName() > newNodeIter.key()) {
                     FolderNode *newNode = new FolderNode(newNodeIter.value()->fullName);
                     newNode->setFolderName(newNodeIter.key());
                     if (!newNodeIter.value()->icon.isNull())
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 2f6a668ce6..6f1a9c3adc 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -219,93 +219,6 @@ void Qt4ProjectFile::modified(Core::IFile::ReloadBehavior *)
 {
 }
 
-
-/*!
-  \class Qt4BuildConfigurationFactory
-*/
-
-Qt4BuildConfigurationFactory::Qt4BuildConfigurationFactory(Qt4Project *project)
-    : IBuildConfigurationFactory(project),
-    m_project(project)
-{
-    update();
-
-    QtVersionManager *vm = QtVersionManager::instance();
-    connect(vm, SIGNAL(defaultQtVersionChanged()),
-            this, SLOT(update()));
-    connect(vm, SIGNAL(qtVersionsChanged(QList<int>)),
-            this, SLOT(update()));
-}
-
-Qt4BuildConfigurationFactory::~Qt4BuildConfigurationFactory()
-{
-}
-
-void Qt4BuildConfigurationFactory::update()
-{
-
-    m_versions.clear();
-    m_versions.insert(QLatin1String("DefaultQt"), VersionInfo(tr("Using Default Qt Version"), 0));
-    QtVersionManager *vm = QtVersionManager::instance();
-    foreach (const QtVersion *version, vm->versions()) {
-        m_versions.insert(QString::fromLatin1("Qt%1").arg(version->uniqueId()),
-                          VersionInfo(tr("Using Qt Version \"%1\"").arg(version->name()), version->uniqueId()));
-    }
-    emit availableCreationTypesChanged();
-}
-
-QStringList Qt4BuildConfigurationFactory::availableCreationTypes() const
-{
-    return m_versions.keys();
-}
-
-QString Qt4BuildConfigurationFactory::displayNameForType(const QString &type) const
-{
-    if (m_versions.contains(type))
-        return m_versions.value(type).displayName;
-    return QString();
-}
-
-BuildConfiguration *Qt4BuildConfigurationFactory::create(const QString &type) const
-{
-    QTC_ASSERT(m_versions.contains(type), return false);
-    const VersionInfo &info = m_versions.value(type);
-    QtVersion *version = QtVersionManager::instance()->version(info.versionId);
-    if (!version)
-        return false;
-    bool ok;
-    QString buildConfigurationName = QInputDialog::getText(0,
-                          tr("New configuration"),
-                          tr("New Configuration Name:"),
-                          QLineEdit::Normal,
-                          version->name(),
-                          &ok);
-    if (!ok || buildConfigurationName.isEmpty())
-        return false;
-
-    m_project->addQt4BuildConfiguration(tr("%1 Debug").arg(buildConfigurationName),
-                                     version,
-                                     (version->defaultBuildConfig() | QtVersion::DebugBuild));
-    BuildConfiguration *bc =
-    m_project->addQt4BuildConfiguration(tr("%1 Release").arg(buildConfigurationName),
-                                     version,
-                                     (version->defaultBuildConfig() & ~QtVersion::DebugBuild));
-    return bc;
-}
-
-BuildConfiguration *Qt4BuildConfigurationFactory::clone(BuildConfiguration *source) const
-{
-    Qt4BuildConfiguration *oldbc = static_cast<Qt4BuildConfiguration *>(source);
-    Qt4BuildConfiguration *newbc = new Qt4BuildConfiguration(oldbc);
-    return newbc;
-}
-
-BuildConfiguration *Qt4BuildConfigurationFactory::restore(const QMap<QString, QVariant> &values) const
-{
-    Qt4BuildConfiguration *bc = new Qt4BuildConfiguration(m_project, values);
-    return bc;
-}
-
 /*!
   \class Qt4Project
 
@@ -783,7 +696,7 @@ Qt4Manager *Qt4Project::qt4ProjectManager() const
     return m_manager;
 }
 
-QString Qt4Project::name() const
+QString Qt4Project::displayName() const
 {
     return QFileInfo(file()->fileName()).completeBaseName();
 }
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index f0a280f0ae..8c2f6e2fb8 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -74,6 +74,7 @@ namespace Internal {
     struct Qt4ProjectFiles;
     class Qt4ProjectConfigWidget;
     class Qt4BuildConfiguration;
+    class Qt4BuildConfigurationFactory;
 
     class CodeModelInfo
     {
@@ -117,37 +118,6 @@ private:
     QString m_filePath;
 };
 
-class Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
-{
-    Q_OBJECT
-
-public:
-    Qt4BuildConfigurationFactory(Qt4Project *project);
-    ~Qt4BuildConfigurationFactory();
-
-    QStringList availableCreationTypes() const;
-    QString displayNameForType(const QString &type) const;
-
-    ProjectExplorer::BuildConfiguration *create(const QString &type) const;
-    ProjectExplorer::BuildConfiguration *clone(ProjectExplorer::BuildConfiguration *source) const;
-    ProjectExplorer::BuildConfiguration *restore(const QMap<QString, QVariant> &values) const;
-
-private slots:
-    void update();
-
-private:
-    struct VersionInfo {
-        VersionInfo() {}
-        VersionInfo(const QString &d, int v)
-            : displayName(d), versionId(v) { }
-        QString displayName;
-        int versionId;
-    };
-
-    Qt4Project *m_project;
-    QMap<QString, VersionInfo> m_versions;
-};
-
 struct Qt4TargetInformation
 {
     enum ErrorCode {
@@ -174,7 +144,7 @@ public:
 
     Internal::Qt4BuildConfiguration *activeQt4BuildConfiguration() const;
 
-    QString name() const;
+    QString displayName() const;
     Core::IFile *file() const;
     ProjectExplorer::IProjectManager *projectManager() const;
     Qt4Manager *qt4ProjectManager() const;
@@ -261,7 +231,7 @@ private:
     Qt4Manager *m_manager;
     Internal::Qt4ProFileNode *m_rootProjectNode;
     Internal::Qt4NodesWatcher *m_nodesWatcher;
-    Qt4BuildConfigurationFactory *m_buildConfigurationFactory;
+    Internal::Qt4BuildConfigurationFactory *m_buildConfigurationFactory;
 
     Qt4ProjectFile *m_fileInfo;
     bool m_isApplication;
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 004e3720fd..1bbdc9d19c 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -116,9 +116,9 @@ void Qt4ProjectConfigWidget::updateDetails()
     QtVersion *version = m_buildConfiguration->qtVersion();
     QString versionString;
     if (m_buildConfiguration->qtVersionId() == 0) {
-        versionString = tr("Default Qt Version (%1)").arg(version->name());
+        versionString = tr("Default Qt Version (%1)").arg(version->displayName());
     } else if(version){
-        versionString = version->name();
+        versionString = version->displayName();
     } else {
         versionString = tr("No Qt Version set");
     }
@@ -203,7 +203,7 @@ void Qt4ProjectConfigWidget::qtVersionsChanged()
     QtVersionManager *vm = QtVersionManager::instance();
 
     m_ui->qtVersionComboBox->clear();
-    m_ui->qtVersionComboBox->addItem(tr("Default Qt Version (%1)").arg(vm->defaultVersion()->name()), 0);
+    m_ui->qtVersionComboBox->addItem(tr("Default Qt Version (%1)").arg(vm->defaultVersion()->displayName()), 0);
 
     int qtVersionId = m_buildConfiguration->qtVersionId();
 
@@ -214,7 +214,7 @@ void Qt4ProjectConfigWidget::qtVersionsChanged()
     // Add Qt Versions to the combo box
     const QList<QtVersion *> &versions = vm->versions();
     for (int i = 0; i < versions.size(); ++i) {
-        m_ui->qtVersionComboBox->addItem(versions.at(i)->name(), versions.at(i)->uniqueId());
+        m_ui->qtVersionComboBox->addItem(versions.at(i)->displayName(), versions.at(i)->uniqueId());
 
         if (versions.at(i)->uniqueId() == qtVersionId) {
             m_ui->qtVersionComboBox->setCurrentIndex(i + 1);
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
index 3e940b9e74..771ade7ce7 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
@@ -40,8 +40,9 @@ const char * const C_PROFILEEDITOR  = ".pro File Editor";
 const char * const C_PROFILEEDITOR_PANEL  = ".pro File Editor (embedded)";
 
 // kinds
-const char * const PROJECT_KIND      = "Qt4";
-const char * const PROFILE_EDITOR    = QT_TRANSLATE_NOOP("OpenWith::Editors", ".pro File Editor");
+const char * const PROJECT_ID      = "Qt4.Qt4Project";
+const char * const PROFILE_EDITOR_ID = "Qt4.proFileEditor";
+const char * const PROFILE_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", ".pro File Editor");
 const char * const PROFILE_MIMETYPE  = "application/vnd.nokia.qt.qmakeprofile";
 const char * const PROINCLUDEFILE_MIMETYPE  = "application/vnd.nokia.qt.qmakeproincludefile";
 const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src";
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index 4f3fc2ca61..cb5ae5c835 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -166,7 +166,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
 
     //register actions
     m_projectContext = core->uniqueIDManager()->
-        uniqueIdentifier(Qt4ProjectManager::Constants::PROJECT_KIND);
+        uniqueIdentifier(Qt4ProjectManager::Constants::PROJECT_ID);
     QList<int> context = QList<int>() << m_projectContext;
     Core::Command *command;
 
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index e038ac5572..c919531ccd 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -68,9 +68,9 @@ Qt4RunConfiguration::Qt4RunConfiguration(Qt4Project *pro, const QString &proFile
       m_baseEnvironmentBase(Qt4RunConfiguration::BuildEnvironmentBase)
 {
     if (!m_proFilePath.isEmpty())
-        setName(QFileInfo(m_proFilePath).completeBaseName());
+        setDisplayName(QFileInfo(m_proFilePath).completeBaseName());
     else
-        setName(tr("Qt4RunConfiguration"));
+        setDisplayName(tr("Qt4RunConfiguration"));
 
     connect(pro, SIGNAL(targetInformationChanged()),
             this, SLOT(invalidateCachedTargetInformation()));
@@ -91,7 +91,7 @@ Qt4Project *Qt4RunConfiguration::qt4Project() const
     return static_cast<Qt4Project *>(project());
 }
 
-QString Qt4RunConfiguration::type() const
+QString Qt4RunConfiguration::id() const
 {
     return "Qt4ProjectManager.Qt4RunConfiguration";
 }
@@ -142,7 +142,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
     toplayout->setMargin(0);
 
     QLabel *nameLabel = new QLabel(tr("Name:"));
-    m_nameLineEdit = new QLineEdit(m_qt4RunConfiguration->name());
+    m_nameLineEdit = new QLineEdit(m_qt4RunConfiguration->displayName());
     nameLabel->setBuddy(m_nameLineEdit);
     toplayout->addRow(nameLabel, m_nameLineEdit);
 
@@ -221,7 +221,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
     connect(m_argumentsLineEdit, SIGNAL(textEdited(QString)),
             this, SLOT(argumentsEdited(QString)));
     connect(m_nameLineEdit, SIGNAL(textEdited(QString)),
-            this, SLOT(nameEdited(QString)));
+            this, SLOT(displayNameEdited(QString)));
     connect(m_useTerminalCheck, SIGNAL(toggled(bool)),
             this, SLOT(termToggled(bool)));
 
@@ -233,8 +233,8 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
 
     connect(qt4RunConfiguration, SIGNAL(commandLineArgumentsChanged(QString)),
             this, SLOT(commandLineArgumentsChanged(QString)));
-    connect(qt4RunConfiguration, SIGNAL(nameChanged(QString)),
-            this, SLOT(nameChanged(QString)));
+    connect(qt4RunConfiguration, SIGNAL(displayNameChanged(QString)),
+            this, SLOT(displayNameChanged(QString)));
     connect(qt4RunConfiguration, SIGNAL(runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode)),
             this, SLOT(runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode)));
     connect(qt4RunConfiguration, SIGNAL(usingDyldImageSuffixChanged(bool)),
@@ -317,7 +317,7 @@ void Qt4RunConfigurationWidget::argumentsEdited(const QString &args)
     m_ignoreChange = false;
 }
 
-void Qt4RunConfigurationWidget::nameEdited(const QString &name)
+void Qt4RunConfigurationWidget::displayNameEdited(const QString &name)
 {
     m_ignoreChange = true;
     m_qt4RunConfiguration->setUserName(name);
@@ -353,7 +353,7 @@ void Qt4RunConfigurationWidget::commandLineArgumentsChanged(const QString &args)
     m_argumentsLineEdit->setText(args);
 }
 
-void Qt4RunConfigurationWidget::nameChanged(const QString &name)
+void Qt4RunConfigurationWidget::displayNameChanged(const QString &name)
 {
     if (!m_ignoreChange)
         m_nameLineEdit->setText(name);
@@ -432,7 +432,7 @@ void Qt4RunConfiguration::restore(const PersistentSettingsReader &reader)
     if (!m_proFilePath.isEmpty()) {
         m_cachedTargetInformationValid = false;
         if (!m_userSetName)
-            setName(QFileInfo(m_proFilePath).completeBaseName());
+            setDisplayName(QFileInfo(m_proFilePath).completeBaseName());
     }
     m_userEnvironmentChanges = ProjectExplorer::EnvironmentItem::fromStringList(reader.restoreValue("UserEnvironmentChanges").toStringList());
     QVariant tmp = reader.restoreValue("BaseEnvironmentBase");
@@ -551,14 +551,14 @@ void Qt4RunConfiguration::setRunMode(RunMode runMode)
 
 void Qt4RunConfiguration::setUserName(const QString &name)
 {
-    if (name == "") {
+    if (name.isEmpty()) {
         m_userSetName = false;
-        setName(tr("Qt4RunConfiguration"));
+        setDisplayName(tr("Qt4RunConfiguration"));
     } else {
         m_userSetName = true;
-        setName(name);
+        setDisplayName(name);
     }
-    emit nameChanged(name);
+    emit displayNameChanged(name);
 }
 
 QString Qt4RunConfiguration::proFilePath() const
@@ -576,7 +576,7 @@ void Qt4RunConfiguration::updateTarget()
         if (info.error == Qt4TargetInformation::ProParserError) {
             Core::ICore::instance()->messageManager()->printToOutputPane(
                     tr("Could not parse %1. The Qt4 run configuration %2 can not be started.")
-                    .arg(m_proFilePath).arg(name()));
+                    .arg(m_proFilePath).arg(displayName()));
         }
         m_workingDir = QString::null;
         m_executable = QString::null;
@@ -648,25 +648,25 @@ Qt4RunConfigurationFactory::~Qt4RunConfigurationFactory()
 }
 
 // used to recreate the runConfigurations when restoring settings
-bool Qt4RunConfigurationFactory::canRestore(const QString &type) const
+bool Qt4RunConfigurationFactory::canRestore(const QString &id) const
 {
-    return type == "Qt4ProjectManager.Qt4RunConfiguration";
+    return id == "Qt4ProjectManager.Qt4RunConfiguration";
 }
 
-ProjectExplorer::RunConfiguration *Qt4RunConfigurationFactory::create(ProjectExplorer::Project *project, const QString &type)
+ProjectExplorer::RunConfiguration *Qt4RunConfigurationFactory::create(ProjectExplorer::Project *project, const QString &id)
 {
     Qt4Project *p = qobject_cast<Qt4Project *>(project);
     Q_ASSERT(p);
-    if (type.startsWith("Qt4RunConfiguration.")) {
-        QString fileName = type.mid(QString("Qt4RunConfiguration.").size());
+    if (id.startsWith("Qt4RunConfiguration.")) {
+        QString fileName = id.mid(QString("Qt4RunConfiguration.").size());
         return new Qt4RunConfiguration(p, fileName);
     }
-    Q_ASSERT(type == "Qt4ProjectManager.Qt4RunConfiguration");
+    Q_ASSERT(id == "Qt4ProjectManager.Qt4RunConfiguration");
     // The right path is set in restoreSettings
     return new Qt4RunConfiguration(p, QString::null);
 }
 
-QStringList Qt4RunConfigurationFactory::availableCreationTypes(ProjectExplorer::Project *pro) const
+QStringList Qt4RunConfigurationFactory::availableCreationIds(ProjectExplorer::Project *pro) const
 {
     Qt4Project *qt4project = qobject_cast<Qt4Project *>(pro);
     if (qt4project) {
@@ -681,8 +681,8 @@ QStringList Qt4RunConfigurationFactory::availableCreationTypes(ProjectExplorer::
     }
 }
 
-QString Qt4RunConfigurationFactory::displayNameForType(const QString &type) const
+QString Qt4RunConfigurationFactory::displayNameForId(const QString &id) const
 {
-    QString fileName = type.mid(QString("Qt4RunConfiguration.").size());
+    QString fileName = id.mid(QString("Qt4RunConfiguration.").size());
     return QFileInfo(fileName).completeBaseName();
 }
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h
index ca3c4630d2..8df1a4b58c 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h
@@ -59,7 +59,7 @@ class Qt4ProFileNode;
 class Qt4RunConfiguration : public ProjectExplorer::LocalApplicationRunConfiguration
 {
     Q_OBJECT
-    // to change the name and arguments and set the userenvironmentchanges
+    // to change the display name and arguments and set the userenvironmentchanges
     friend class Qt4RunConfigurationWidget;
 public:
     Qt4RunConfiguration(Qt4Project *pro, const QString &proFilePath);
@@ -67,7 +67,7 @@ public:
 
     Qt4Project *qt4Project() const;
 
-    virtual QString type() const;
+    virtual QString id() const;
     virtual bool isEnabled(ProjectExplorer::BuildConfiguration *configuration) const;
     virtual QWidget *configurationWidget();
     virtual void save(ProjectExplorer::PersistentSettingsWriter &writer) const;
@@ -97,7 +97,7 @@ public slots:
     void invalidateCachedTargetInformation();
 
 signals:
-    void nameChanged(const QString&);
+    void displayNameChanged(const QString&);
     void commandLineArgumentsChanged(const QString&);
     void workingDirectoryChanged(const QString&);
     void runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode runMode);
@@ -157,12 +157,12 @@ private slots:
     void workDirectoryEdited();
     void workingDirectoryReseted();
     void argumentsEdited(const QString &arguments);
-    void nameEdited(const QString &name);
+    void displayNameEdited(const QString &name);
     void userChangesEdited();
 
     void workingDirectoryChanged(const QString &workingDirectory);
     void commandLineArgumentsChanged(const QString &args);
-    void nameChanged(const QString &name);
+    void displayNameChanged(const QString &name);
     void runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode runMode);
     void userEnvironmentChangesChanged(const QList<ProjectExplorer::EnvironmentItem> &userChanges);
     void baseEnvironmentChanged();
@@ -197,10 +197,10 @@ class Qt4RunConfigurationFactory : public ProjectExplorer::IRunConfigurationFact
 public:
     Qt4RunConfigurationFactory();
     virtual ~Qt4RunConfigurationFactory();
-    virtual bool canRestore(const QString &type) const;
-    virtual ProjectExplorer::RunConfiguration *create(ProjectExplorer::Project *project, const QString &type);
-    QStringList availableCreationTypes(ProjectExplorer::Project *pro) const;
-    QString displayNameForType(const QString &type) const;
+    virtual bool canRestore(const QString &id) const;
+    virtual ProjectExplorer::RunConfiguration *create(ProjectExplorer::Project *project, const QString &id);
+    QStringList availableCreationIds(ProjectExplorer::Project *pro) const;
+    QString displayNameForId(const QString &id) const;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
index 6e604de2df..08e490acf0 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -72,7 +72,7 @@ void DebuggingHelperBuildTask::run(QFutureInterface<void> &future)
     future.setProgressValue(1);
     const QString output = m_version->buildDebuggingHelperLibrary();
     future.setProgressValue(1);
-    emit finished(m_version->name(), output);
+    emit finished(m_version->displayName(), output);
     deleteLater();
 }
 
@@ -89,7 +89,7 @@ QString QtOptionsPage::id() const
     return QLatin1String(Constants::QTVERSION_SETTINGS_PAGE_ID);
 }
 
-QString QtOptionsPage::trName() const
+QString QtOptionsPage::displayName() const
 {
     return QCoreApplication::translate("Qt4ProjectManager", Constants::QTVERSION_SETTINGS_PAGE_NAME);
 }
@@ -99,7 +99,7 @@ QString QtOptionsPage::category() const
     return QLatin1String(Constants::QT_SETTINGS_CATEGORY);
 }
 
-QString QtOptionsPage::trCategory() const
+QString QtOptionsPage::displayCategory() const
 {
     return QCoreApplication::translate("Qt4ProjectManager", Constants::QT_SETTINGS_TR_CATEGORY);
 }
@@ -178,7 +178,7 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> ver
     for (int i = 0; i < m_versions.count(); ++i) {
         const QtVersion * const version = m_versions.at(i).data();
         QTreeWidgetItem *item = new QTreeWidgetItem(version->isAutodetected()? autoItem : manualItem);
-        item->setText(0, version->name());
+        item->setText(0, version->displayName());
         item->setText(1, QDir::toNativeSeparators(version->qmakeCommand()));
         item->setData(0, Qt::UserRole, version->uniqueId());
 
@@ -188,7 +188,7 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> ver
             item->setData(2, Qt::DecorationRole, QIcon());
         }
 
-        m_ui->defaultCombo->addItem(version->name());
+        m_ui->defaultCombo->addItem(version->displayName());
         if (i == m_defaultVersion)
             m_ui->defaultCombo->setCurrentIndex(i);
     }
@@ -275,7 +275,7 @@ static inline int findVersionByName(const QList<QSharedPointerQtVersion> &l, con
 {
     const int size = l.size();
     for (int i = 0; i < size; i++)
-        if (l.at(i)->name() == name)
+        if (l.at(i)->displayName() == name)
             return i;
     return -1;
 }
@@ -347,16 +347,16 @@ void QtOptionsPageWidget::addQtDir()
     m_versions.append(newVersion);
 
     QTreeWidgetItem *item = new QTreeWidgetItem(m_ui->qtdirList->topLevelItem(1));
-    item->setText(0, newVersion->name());
+    item->setText(0, newVersion->displayName());
     item->setText(1, QDir::toNativeSeparators(newVersion->qmakeCommand()));
     item->setData(0, Qt::UserRole, newVersion->uniqueId());
     item->setData(2, Qt::DecorationRole, QIcon());
 
     m_ui->qtdirList->setCurrentItem(item);
 
-    m_ui->nameEdit->setText(newVersion->name());
+    m_ui->nameEdit->setText(newVersion->displayName());
     m_ui->qmakePath->setPath(newVersion->qmakeCommand());
-    m_ui->defaultCombo->addItem(newVersion->name());
+    m_ui->defaultCombo->addItem(newVersion->displayName());
     m_ui->nameEdit->setFocus();
     m_ui->nameEdit->selectAll();
 
@@ -606,7 +606,7 @@ void QtOptionsPageWidget::onMingwBrowsed()
 void QtOptionsPageWidget::defaultChanged(int)
 {
     for (int i=0; i<m_ui->defaultCombo->count(); ++i) {
-        if (m_versions.at(i)->name() == m_ui->defaultCombo->currentText()) {
+        if (m_versions.at(i)->displayName() == m_ui->defaultCombo->currentText()) {
             m_defaultVersion = i;
             return;
         }
@@ -622,10 +622,10 @@ void QtOptionsPageWidget::updateCurrentQtName()
     int currentItemIndex = indexForTreeItem(currentItem);
     if (currentItemIndex < 0)
         return;
-    m_versions[currentItemIndex]->setName(m_ui->nameEdit->text());
-    currentItem->setText(0, m_versions[currentItemIndex]->name());
+    m_versions[currentItemIndex]->setDisplayName(m_ui->nameEdit->text());
+    currentItem->setText(0, m_versions[currentItemIndex]->displayName());
 
-    m_ui->defaultCombo->setItemText(currentItemIndex, m_versions[currentItemIndex]->name());
+    m_ui->defaultCombo->setItemText(currentItemIndex, m_versions[currentItemIndex]->displayName());
 }
 
 
@@ -644,10 +644,10 @@ void QtOptionsPageWidget::fixQtVersionName(int index)
     if (index < 0)
         return;
     int count = m_versions.count();
-    QString name = m_versions.at(index)->name();
+    QString name = m_versions.at(index)->displayName();
     for (int i = 0; i < count; ++i) {
         if (i != index) {
-            if (m_versions.at(i)->name() == m_versions.at(index)->name()) {
+            if (m_versions.at(i)->displayName() == m_versions.at(index)->displayName()) {
                 // Same name, find new name
                 QRegExp regexp("^(.*)\\((\\d)\\)$");
                 if (regexp.exactMatch(name)) {
@@ -657,7 +657,7 @@ void QtOptionsPageWidget::fixQtVersionName(int index)
                     name = name + " (2)";
                 }
                 // set new name
-                m_versions[index]->setName(name);
+                m_versions[index]->setDisplayName(name);
                 treeItemForIndex(index)->setText(0, name);
                 m_ui->defaultCombo->setItemText(index, name);
 
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.h b/src/plugins/qt4projectmanager/qtoptionspage.h
index 7c3e2c5053..7441437d1f 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.h
+++ b/src/plugins/qt4projectmanager/qtoptionspage.h
@@ -134,9 +134,9 @@ class QtOptionsPage : public Core::IOptionsPage
 public:
     QtOptionsPage();
     QString id() const;
-    QString trName() const;
+    QString displayName() const;
     QString category() const;
-    QString trCategory() const;
+    QString displayCategory() const;
     QWidget *createPage(QWidget *parent);
     void apply();
     void finish() { }
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 95e5030a02..10530a54e8 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -256,7 +256,7 @@ void QtVersionManager::writeVersionsIntoSettings()
     for (int i = 0; i < m_versions.size(); ++i) {
         const QtVersion *version = m_versions.at(i);
         s->setArrayIndex(i);
-        s->setValue("Name", version->name());
+        s->setValue("Name", version->displayName());
         // for downwards compat
         s->setValue("Path", version->versionInfo().value("QT_INSTALL_DATA"));
         s->setValue("QMakePath", version->qmakeCommand());
@@ -363,7 +363,7 @@ void QtVersionManager::updateSystemVersion()
         if (version->isAutodetected()
             && version->autodetectionSource() == PATH_AUTODETECTION_SOURCE) {
             version->setQMakeCommand(systemQMakePath);
-            version->setName(tr("Qt in PATH"));
+            version->setDisplayName(tr("Qt in PATH"));
             haveSystemVersion = true;
         }
     }
@@ -486,7 +486,7 @@ void QtVersionManager::setNewQtVersions(QList<QtVersion *> newVersions, int newD
 
 QtVersion::QtVersion(const QString &name, const QString &qmakeCommand, int id,
                      bool isAutodetected, const QString &autodetectionSource)
-    : m_name(name),
+    : m_displayName(name),
     m_isAutodetected(isAutodetected),
     m_autodetectionSource(autodetectionSource),
     m_hasDebuggingHelper(false),
@@ -508,7 +508,7 @@ QtVersion::QtVersion(const QString &name, const QString &qmakeCommand, int id,
 
 QtVersion::QtVersion(const QString &name, const QString &qmakeCommand,
                      bool isAutodetected, const QString &autodetectionSource)
-    : m_name(name),
+    : m_displayName(name),
     m_isAutodetected(isAutodetected),
     m_autodetectionSource(autodetectionSource),
     m_hasDebuggingHelper(false),
@@ -541,11 +541,11 @@ QtVersion::QtVersion(const QString &qmakeCommand, bool isAutodetected, const QSt
 {
     m_id = getUniqueId();
     setQMakeCommand(qmakeCommand);
-    m_name = qtVersionString();
+    m_displayName = qtVersionString();
 }
 
 QtVersion::QtVersion()
-    : m_name(QString::null),
+    : m_displayName(QString::null),
     m_id(-1),
     m_isAutodetected(false),
     m_hasDebuggingHelper(false),
@@ -573,7 +573,7 @@ QString QtVersion::toHtml() const
     QTextStream str(&rc);
     str << "<html></head><body><table>";
     str << "<tr><td><b>" << QtVersionManager::tr("Name:")
-        << "</b></td><td>" << name() << "</td></tr>";
+        << "</b></td><td>" << displayName() << "</td></tr>";
     str << "<tr><td><b>" << QtVersionManager::tr("Source:")
         << "</b></td><td>" << sourcePath() << "</td></tr>";
     str << "<tr><td><b>" << QtVersionManager::tr("mkspec:")
@@ -603,9 +603,9 @@ QString QtVersion::toHtml() const
     return rc;
 }
 
-QString QtVersion::name() const
+QString QtVersion::displayName() const
 {
-    return m_name;
+    return m_displayName;
 }
 
 QString QtVersion::qmakeCommand() const
@@ -641,9 +641,9 @@ QHash<QString,QString> QtVersion::versionInfo() const
     return m_versionInfo;
 }
 
-void QtVersion::setName(const QString &name)
+void QtVersion::setDisplayName(const QString &name)
 {
-    m_name = name;
+    m_displayName = name;
 }
 
 void QtVersion::setQMakeCommand(const QString& qmakeCommand)
@@ -1360,7 +1360,7 @@ bool QtVersion::isValid() const
 {
     updateVersionInfo();
     return (!(m_id == -1 || qmakeCommand() == QString::null
-        || name() == QString::null) && !m_notInstalled);
+        || displayName() == QString::null) && !m_notInstalled);
 }
 
 QtVersion::QmakeBuildConfigs QtVersion::defaultBuildConfig() const
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index ea09da8adf..6a5cbf7033 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -68,7 +68,7 @@ public:
     bool isAutodetected() const { return m_isAutodetected; }
     QString autodetectionSource() const { return m_autodetectionSource; }
 
-    QString name() const;
+    QString displayName() const;
     QString sourcePath() const;
     QString qmakeCommand() const;
     QString uicCommand() const;
@@ -86,7 +86,7 @@ public:
     /// specifally not the directory the symlink/ORIGINAL_QMAKESPEC points to
     QString mkspecPath() const;
 
-    void setName(const QString &name);
+    void setDisplayName(const QString &name);
     void setQMakeCommand(const QString &path);
 
     QString qtVersionString() const;
@@ -145,7 +145,7 @@ private:
     void updateVersionInfo() const;
     QString findQtBinary(const QStringList &possibleName) const;
     void updateToolChainAndMkspec() const;
-    QString m_name;
+    QString m_displayName;
     QString m_sourcePath;
     QString m_mingwDirectory;
     QString m_msvcVersion;
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
index 4456b6a87c..c3477a5ef9 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
@@ -66,10 +66,10 @@ QWizard *ConsoleAppWizard::createWizardDialog(QWidget *parent,
                                               const QString &defaultPath,
                                               const WizardPageList &extensionPages) const
 {
-    ConsoleAppWizardDialog *dialog = new ConsoleAppWizardDialog(name(), icon(), extensionPages,
+    ConsoleAppWizardDialog *dialog = new ConsoleAppWizardDialog(displayName(), icon(), extensionPages,
                                                                 showModulesPageForApplications(), parent);
     dialog->setPath(defaultPath);
-    dialog->setName(ConsoleAppWizardDialog::projectName(defaultPath));
+    dialog->setProjectName(ConsoleAppWizardDialog::uniqueProjectName(defaultPath));
     return dialog;
 }
 
@@ -88,7 +88,7 @@ Core::GeneratedFiles
     Core::GeneratedFile source(sourceFileName);
     source.setContents(license + QLatin1String(mainCppC));
     // Create files: Profile
-    const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, params.name,profileSuffix());
+    const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, params.fileName, profileSuffix());
 
     Core::GeneratedFile profile(profileName);
     QString contents;
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
index 445a34620a..4a7a84dd4b 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
@@ -59,7 +59,7 @@ QtProjectParameters ConsoleAppWizardDialog::parameters() const
 {
     QtProjectParameters rc;
     rc.type = QtProjectParameters::ConsoleApp;
-    rc.name = name();
+    rc.fileName = projectName();
     rc.path = path();
 
     rc.selectedModules = selectedModules();
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
index b16ea2dbe1..cb8ab14caa 100644
--- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
@@ -46,9 +46,9 @@ QWizard *EmptyProjectWizard::createWizardDialog(QWidget *parent,
                                               const QString &defaultPath,
                                               const WizardPageList &extensionPages) const
 {
-    EmptyProjectWizardDialog *dialog = new EmptyProjectWizardDialog(name(), icon(), extensionPages, parent);
+    EmptyProjectWizardDialog *dialog = new EmptyProjectWizardDialog(displayName(), icon(), extensionPages, parent);
     dialog->setPath(defaultPath);
-    dialog->setName(EmptyProjectWizardDialog::projectName(defaultPath));
+    dialog->setProjectName(EmptyProjectWizardDialog::uniqueProjectName(defaultPath));
     return dialog;
 }
 
@@ -59,7 +59,7 @@ Core::GeneratedFiles
     const EmptyProjectWizardDialog *wizard = qobject_cast< const EmptyProjectWizardDialog *>(w);
     const QtProjectParameters params = wizard->parameters();
     const QString projectPath = params.projectPath();
-    const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, params.name, profileSuffix());
+    const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, params.fileName, profileSuffix());
 
     Core::GeneratedFile profile(profileName);
     return Core::GeneratedFiles() << profile;
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
index b32bb7bf03..bd09c18690 100644
--- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
@@ -53,7 +53,7 @@ QtProjectParameters EmptyProjectWizardDialog::parameters() const
 {
     QtProjectParameters rc;
     rc.type = QtProjectParameters::EmptyProject;
-    rc.name = name();
+    rc.fileName = projectName();
     rc.path = path();
     return rc;
 }
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index 0634a69d87..871cf20cec 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -83,11 +83,11 @@ QWizard *GuiAppWizard::createWizardDialog(QWidget *parent,
                                           const QString &defaultPath,
                                           const WizardPageList &extensionPages) const
 {
-    GuiAppWizardDialog *dialog = new GuiAppWizardDialog(name(), icon(), extensionPages,
+    GuiAppWizardDialog *dialog = new GuiAppWizardDialog(displayName(), icon(), extensionPages,
                                                         showModulesPageForApplications(),
                                                         parent);
     dialog->setPath(defaultPath);
-    dialog->setName(GuiAppWizardDialog::projectName(defaultPath));
+    dialog->setProjectName(GuiAppWizardDialog::uniqueProjectName(defaultPath));
     // Order! suffixes first to generate files correctly
     dialog->setLowerCaseFiles(QtWizard::lowerCaseFiles());
     dialog->setSuffixes(headerSuffix(), sourceSuffix(), formSuffix());
@@ -169,7 +169,7 @@ Core::GeneratedFiles GuiAppWizard::generateFiles(const QWizard *w,
         formHeader.setContents(license + contents);
     }
     // Create files: profile
-    const QString profileName = buildFileName(projectPath, projectParams.name, profileSuffix());
+    const QString profileName = buildFileName(projectPath, projectParams.fileName, profileSuffix());
     Core::GeneratedFile profile(profileName);
     contents.clear();
     {
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
index 2c1769369a..97750490c5 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
@@ -87,7 +87,7 @@ QtProjectParameters GuiAppWizardDialog::projectParameters() const
 {
     QtProjectParameters rc;
     rc.type =  QtProjectParameters::GuiApp;
-    rc.name = name();
+    rc.fileName = projectName();
     rc.path = path();
     rc.selectedModules = selectedModules();
     rc.deselectedModules = deselectedModules();
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
index cd5cbe0855..6a9ffb3ba8 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
@@ -58,11 +58,11 @@ QWizard *LibraryWizard::createWizardDialog(QWidget *parent,
                                           const QString &defaultPath,
                                           const WizardPageList &extensionPages) const
 {
-    LibraryWizardDialog *dialog = new  LibraryWizardDialog(name(), icon(), extensionPages,
+    LibraryWizardDialog *dialog = new  LibraryWizardDialog(displayName(), icon(), extensionPages,
                                                            showModulesPageForLibraries(), parent);
     dialog->setLowerCaseFiles(QtWizard::lowerCaseFiles());
     dialog->setPath(defaultPath);
-    dialog->setName(LibraryWizardDialog::projectName(defaultPath));
+    dialog->setProjectName(LibraryWizardDialog::uniqueProjectName(defaultPath));
     dialog->setSuffixes(headerSuffix(), sourceSuffix(), formSuffix());    
     return dialog;
 }
@@ -78,7 +78,7 @@ Core::GeneratedFiles LibraryWizard::generateFiles(const QWizard *w,
     const LibraryParameters params = dialog->libraryParameters();
     const QString license = CppTools::AbstractEditorSupport::licenseTemplate();
 
-    const QString sharedLibExportMacro = QtProjectParameters::exportMacro(projectParams.name);
+    const QString sharedLibExportMacro = QtProjectParameters::exportMacro(projectParams.fileName);
 
     Core::GeneratedFiles rc;
     // Class header + source
@@ -92,16 +92,16 @@ Core::GeneratedFiles LibraryWizard::generateFiles(const QWizard *w,
     // Create files: global header for shared libs
     QString globalHeaderFileName;
     if (projectParams.type == QtProjectParameters::SharedLibrary) {
-        const QString globalHeaderName = buildFileName(projectPath, projectParams.name + QLatin1String(sharedHeaderPostfixC), headerSuffix());
+        const QString globalHeaderName = buildFileName(projectPath, projectParams.fileName + QLatin1String(sharedHeaderPostfixC), headerSuffix());
         Core::GeneratedFile globalHeader(globalHeaderName);
         globalHeaderFileName = QFileInfo(globalHeader.path()).fileName();
-        globalHeader.setContents(license + LibraryParameters::generateSharedHeader(globalHeaderFileName, projectParams.name, sharedLibExportMacro));
+        globalHeader.setContents(license + LibraryParameters::generateSharedHeader(globalHeaderFileName, projectParams.fileName, sharedLibExportMacro));
         rc.push_back(globalHeader);
     }
 
     // Generate code
     QString headerContents, sourceContents;
-    params.generateCode(projectParams.type, projectParams.name,  headerFileName,
+    params.generateCode(projectParams.type, projectParams.fileName,  headerFileName,
                         globalHeaderFileName, sharedLibExportMacro,
                         /* indentation*/ 4, &headerContents, &sourceContents);
 
@@ -110,7 +110,7 @@ Core::GeneratedFiles LibraryWizard::generateFiles(const QWizard *w,
     rc.push_back(source);
     rc.push_back(header);
     // Create files: profile
-    const QString profileName = buildFileName(projectPath, projectParams.name, profileSuffix());
+    const QString profileName = buildFileName(projectPath, projectParams.fileName, profileSuffix());
     Core::GeneratedFile profile(profileName);
     QString profileContents;
     {
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
index e445f62854..fb6102c503 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
@@ -192,7 +192,7 @@ QtProjectParameters LibraryWizardDialog::parameters() const
 {
     QtProjectParameters rc;
     rc.type = type();
-    rc.name = name();
+    rc.fileName = projectName();
     rc.path = path();
     if (rc.type == QtProjectParameters::Qt4Plugin) {
         // Plugin: Dependencies & Target directory
@@ -236,7 +236,7 @@ void LibraryWizardDialog::slotCurrentIdChanged(int id)
         break;
     default: {
         // Urrm, figure out a good class name. Use project name this time
-        QString className = name();
+        QString className = projectName();
         if (!className.isEmpty())
             className[0] = className.at(0).toUpper();
         m_filesPage->setClassName(className);
diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp
index e91aedaa62..4a8ddcfdf7 100644
--- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp
@@ -50,7 +50,7 @@ QString QtProjectParameters::projectPath() const
     QString rc = path;
     if (!rc.isEmpty())
         rc += QDir::separator();
-    rc += name;
+    rc += fileName;
     return rc;
 }
 
@@ -60,7 +60,7 @@ void QtProjectParameters::writeProFile(QTextStream &str) const
         str << "QT       += " << selectedModules << "\n\n";
     if (!deselectedModules.isEmpty())
         str << "QT       -= " << deselectedModules << "\n\n";
-    const QString &effectiveTarget = target.isEmpty() ? name : target;
+    const QString &effectiveTarget = target.isEmpty() ? fileName : target;
     if (!effectiveTarget.isEmpty())
         str << "TARGET = " <<  effectiveTarget << '\n';
     switch (type) {
@@ -74,7 +74,7 @@ void QtProjectParameters::writeProFile(QTextStream &str) const
         str << "TEMPLATE = lib\nCONFIG += staticlib\n";
         break;
     case SharedLibrary:
-        str << "TEMPLATE = lib\n\nDEFINES += " << libraryMacro(name) << '\n';
+        str << "TEMPLATE = lib\n\nDEFINES += " << libraryMacro(fileName) << '\n';
         break;
     case Qt4Plugin:
         str << "TEMPLATE = lib\nCONFIG += plugin\n";
diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h
index c361404051..63b45e21df 100644
--- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h
+++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h
@@ -61,7 +61,7 @@ struct QtProjectParameters {
     static QString libraryMacro(const QString &projectName);
 
     Type type;
-    QString name;
+    QString fileName;
     QString target;
     QString path;
     QString selectedModules;
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
index 9bd987f7aa..8651accd10 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
@@ -56,9 +56,9 @@ static inline Core::BaseFileWizardParameters
 {
     Core::BaseFileWizardParameters rc(Core::IWizard::ProjectWizard);
     rc.setCategory(QLatin1String(ProjectExplorer::Constants::PROJECT_WIZARD_CATEGORY));
-    rc.setTrCategory(QCoreApplication::translate("ProjectExplorer", ProjectExplorer::Constants::PROJECT_WIZARD_TR_CATEGORY));
+    rc.setDisplayCategory(QCoreApplication::translate("ProjectExplorer", ProjectExplorer::Constants::PROJECT_WIZARD_TR_CATEGORY));
     rc.setIcon(icon);
-    rc.setName(name);
+    rc.setDisplayName(name);
     rc.setId(id);
     rc.setDescription(description);
     return rc;
diff --git a/src/plugins/qt4projectmanager/wizards/testwizard.cpp b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
index 2257daa01b..5c1a0fe96d 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
@@ -53,9 +53,9 @@ QWizard *TestWizard::createWizardDialog(QWidget *parent,
                                         const QString &defaultPath,
                                         const WizardPageList &extensionPages) const
 {
-    TestWizardDialog *dialog = new TestWizardDialog(name(), icon(), extensionPages, parent);
+    TestWizardDialog *dialog = new TestWizardDialog(displayName(), icon(), extensionPages, parent);
     dialog->setPath(defaultPath);
-    dialog->setName(TestWizardDialog::projectName(defaultPath));
+    dialog->setProjectName(TestWizardDialog::uniqueProjectName(defaultPath));
     return dialog;
 }
 
@@ -160,7 +160,7 @@ Core::GeneratedFiles TestWizard::generateFiles(const QWizard *w, QString *errorM
     source.setContents(generateTestCode(testParams, sourceFileInfo.baseName()));
 
     // Create profile with define for base dir to find test data
-    const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, projectParams.name, profileSuffix());
+    const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, projectParams.fileName, profileSuffix());
     Core::GeneratedFile profile(profileName);
     QString contents;
     {
diff --git a/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp
index 266abb5a33..e84fcd27f8 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp
@@ -69,7 +69,7 @@ TestWizardDialog::TestWizardDialog(const QString &templateName,
 void TestWizardDialog::slotCurrentIdChanged(int id)
 {
     if (id == TestPageId)
-        m_testPage->setProjectName(name());
+        m_testPage->setProjectName(projectName());
 }
 
 TestWizardParameters TestWizardDialog::testParameters() const
@@ -81,7 +81,7 @@ QtProjectParameters TestWizardDialog::projectParameters() const
 {
     QtProjectParameters rc;
     rc.type = QtProjectParameters::ConsoleApp;
-    rc.name = name();
+    rc.fileName = projectName();
     rc.path = path();
     // Name binary "tst_xx" after the main source
     rc.target = QFileInfo(m_testPage->sourcefileName()).baseName();