diff --git a/src/plugins/bazaar/clonewizard.h b/src/plugins/bazaar/clonewizard.h
index 2fd34fb5241..a164e6da61c 100644
--- a/src/plugins/bazaar/clonewizard.h
+++ b/src/plugins/bazaar/clonewizard.h
@@ -37,7 +37,7 @@
 namespace Bazaar {
 namespace Internal {
 
-class CloneWizard : public VcsBase::BaseCheckoutWizard
+class CloneWizard : public VcsBase::BaseCheckoutWizardFactory
 {
     Q_OBJECT
 
diff --git a/src/plugins/cvs/checkoutwizard.h b/src/plugins/cvs/checkoutwizard.h
index 81290935ecc..99f9d165d27 100644
--- a/src/plugins/cvs/checkoutwizard.h
+++ b/src/plugins/cvs/checkoutwizard.h
@@ -35,7 +35,7 @@
 namespace Cvs {
 namespace Internal {
 
-class CheckoutWizard : public VcsBase::BaseCheckoutWizard
+class CheckoutWizard : public VcsBase::BaseCheckoutWizardFactory
 {
     Q_OBJECT
 
diff --git a/src/plugins/git/clonewizard.h b/src/plugins/git/clonewizard.h
index 7d6ebe230eb..7e906a33128 100644
--- a/src/plugins/git/clonewizard.h
+++ b/src/plugins/git/clonewizard.h
@@ -35,7 +35,7 @@
 namespace Git {
 namespace Internal {
 
-class CloneWizard : public VcsBase::BaseCheckoutWizard
+class CloneWizard : public VcsBase::BaseCheckoutWizardFactory
 {
     Q_OBJECT
 
diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.h b/src/plugins/git/gitorious/gitoriousclonewizard.h
index 8e28a9e06bb..1db1ac6bb39 100644
--- a/src/plugins/git/gitorious/gitoriousclonewizard.h
+++ b/src/plugins/git/gitorious/gitoriousclonewizard.h
@@ -37,7 +37,7 @@ namespace Internal {
 
 // GitoriousCloneWizard: A wizard allowing for browsing
 // Gitorious-hosted projects.
-class GitoriousCloneWizard : public VcsBase::BaseCheckoutWizard
+class GitoriousCloneWizard : public VcsBase::BaseCheckoutWizardFactory
 {
     Q_OBJECT
 
diff --git a/src/plugins/mercurial/clonewizard.h b/src/plugins/mercurial/clonewizard.h
index c9adc7b0ce6..7d2a1c23d91 100644
--- a/src/plugins/mercurial/clonewizard.h
+++ b/src/plugins/mercurial/clonewizard.h
@@ -37,7 +37,7 @@
 namespace Mercurial {
 namespace Internal {
 
-class CloneWizard : public VcsBase::BaseCheckoutWizard
+class CloneWizard : public VcsBase::BaseCheckoutWizardFactory
 {
     Q_OBJECT
 
diff --git a/src/plugins/subversion/checkoutwizard.h b/src/plugins/subversion/checkoutwizard.h
index 7ed3cc1fef9..a18e1f08e85 100644
--- a/src/plugins/subversion/checkoutwizard.h
+++ b/src/plugins/subversion/checkoutwizard.h
@@ -35,7 +35,7 @@
 namespace Subversion {
 namespace Internal {
 
-class CheckoutWizard : public VcsBase::BaseCheckoutWizard
+class CheckoutWizard : public VcsBase::BaseCheckoutWizardFactory
 {
     Q_OBJECT
 
diff --git a/src/plugins/vcsbase/basecheckoutwizard.cpp b/src/plugins/vcsbase/basecheckoutwizard.cpp
index 41d6daaa07a..b6d104df817 100644
--- a/src/plugins/vcsbase/basecheckoutwizard.cpp
+++ b/src/plugins/vcsbase/basecheckoutwizard.cpp
@@ -84,7 +84,7 @@ void BaseCheckoutWizardPrivate::clear()
 
 } // namespace Internal
 
-BaseCheckoutWizard::BaseCheckoutWizard() :
+BaseCheckoutWizardFactory::BaseCheckoutWizardFactory() :
     d(new Internal::BaseCheckoutWizardPrivate)
 {
     setWizardKind(IWizardFactory::ProjectWizard);
@@ -94,12 +94,12 @@ BaseCheckoutWizard::BaseCheckoutWizard() :
     setFlags(Core::IWizardFactory::PlatformIndependent);
 }
 
-BaseCheckoutWizard::~BaseCheckoutWizard()
+BaseCheckoutWizardFactory::~BaseCheckoutWizardFactory()
 {
     delete d;
 }
 
-void BaseCheckoutWizard::runWizard(const QString &path, QWidget *parent, const QString &platform,
+void BaseCheckoutWizardFactory::runWizard(const QString &path, QWidget *parent, const QString &platform,
                                    const QVariantMap &extraValues)
 {
     Q_UNUSED(platform);
@@ -132,7 +132,7 @@ void BaseCheckoutWizard::runWizard(const QString &path, QWidget *parent, const Q
 
 static inline QString msgNoProjectFiles(const QDir &dir, const QStringList &patterns)
 {
-    return BaseCheckoutWizard::tr("Could not find any project files matching (%1) in the directory \"%2\".").arg(patterns.join(QLatin1String(", ")), QDir::toNativeSeparators(dir.absolutePath()));
+    return BaseCheckoutWizardFactory::tr("Could not find any project files matching (%1) in the directory \"%2\".").arg(patterns.join(QLatin1String(", ")), QDir::toNativeSeparators(dir.absolutePath()));
 }
 
 // Try to find the project files in a project directory with some smartness
@@ -158,7 +158,7 @@ static QFileInfoList findProjectFiles(const QDir &projectDir, QString *errorMess
     return projectFiles;
 }
 
-QString BaseCheckoutWizard::openProject(const QString &path, QString *errorMessage)
+QString BaseCheckoutWizardFactory::openProject(const QString &path, QString *errorMessage)
 {
     // Search the directory for project files
     const QDir dir(path);
@@ -178,13 +178,13 @@ QString BaseCheckoutWizard::openProject(const QString &path, QString *errorMessa
     return projectFile;
 }
 
-void BaseCheckoutWizard::setCustomLabels(const QString &progressTitle, const QString &startedStatus)
+void BaseCheckoutWizardFactory::setCustomLabels(const QString &progressTitle, const QString &startedStatus)
 {
     d->progressTitle = progressTitle;
     d->startedStatus = startedStatus;
 }
 
-void BaseCheckoutWizard::slotProgressPageShown()
+void BaseCheckoutWizardFactory::slotProgressPageShown()
 {
     Command *command = createCommand(d->parameterPages, &(d->checkoutPath));
     d->dialog->start(command);
diff --git a/src/plugins/vcsbase/basecheckoutwizard.h b/src/plugins/vcsbase/basecheckoutwizard.h
index 3c1380b578f..490b87e2e8f 100644
--- a/src/plugins/vcsbase/basecheckoutwizard.h
+++ b/src/plugins/vcsbase/basecheckoutwizard.h
@@ -45,13 +45,13 @@ namespace Internal { class BaseCheckoutWizardPrivate; }
 
 class Command;
 
-class VCSBASE_EXPORT BaseCheckoutWizard : public Core::IWizardFactory
+class VCSBASE_EXPORT BaseCheckoutWizardFactory : public Core::IWizardFactory
 {
     Q_OBJECT
 
 public:
-    BaseCheckoutWizard();
-    ~BaseCheckoutWizard();
+    BaseCheckoutWizardFactory();
+    ~BaseCheckoutWizardFactory();
 
     void runWizard(const QString &path, QWidget *parent, const QString &platform, const QVariantMap &extraValues);