9 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/git/clonewizard.cpp b/src/plugins/git/clonewizard.cpp
index 4bbd138632b..18c03cf7e5f 100644
--- a/src/plugins/git/clonewizard.cpp
+++ b/src/plugins/git/clonewizard.cpp
@@ -55,7 +55,7 @@ QString CloneWizard::description() const
     return tr("Clones a project from a git repository.");
 }
 
-QString CloneWizard::name() const
+QString CloneWizard::displayName() const
 {
     return tr("Git Repository Clone");
 }
diff --git a/src/plugins/git/clonewizard.h b/src/plugins/git/clonewizard.h
index f8c1310c054..b2612549e06 100644
--- a/src/plugins/git/clonewizard.h
+++ b/src/plugins/git/clonewizard.h
@@ -44,7 +44,7 @@ public:
     // IWizard
     virtual QIcon icon() const;
     virtual QString description() const;
-    virtual QString name() const;
+    virtual QString displayName() const;
 
 protected:
     // BaseCheckoutWizard
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index dd124773aef..db10366140f 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -67,7 +67,7 @@ GitEditor::GitEditor(const VCSBase::VCSBaseEditorParameters *type,
     QTC_ASSERT(m_changeNumberPattern40.isValid(), return);
     setAnnotateRevisionTextFormat(tr("Blame %1"));
     if (Git::Constants::debug)
-        qDebug() << "GitEditor::GitEditor" << type->type << type->kind;
+        qDebug() << "GitEditor::GitEditor" << type->type << type->id;
 }
 
 QSet<QString> GitEditor::annotationChanges() const
diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.cpp b/src/plugins/git/gitorious/gitoriousclonewizard.cpp
index 1437242121a..5af7ef0ffb6 100644
--- a/src/plugins/git/gitorious/gitoriousclonewizard.cpp
+++ b/src/plugins/git/gitorious/gitoriousclonewizard.cpp
@@ -83,7 +83,7 @@ QString GitoriousCloneWizard::description() const
     return tr("Clones a project from a Gitorious repository.");
 }
 
-QString GitoriousCloneWizard::name() const
+QString GitoriousCloneWizard::displayName() const
 {
     return tr("Gitorious Repository Clone");
 }
diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.h b/src/plugins/git/gitorious/gitoriousclonewizard.h
index 01eac8cd22d..f673584711e 100644
--- a/src/plugins/git/gitorious/gitoriousclonewizard.h
+++ b/src/plugins/git/gitorious/gitoriousclonewizard.h
@@ -46,7 +46,7 @@ public:
     // IWizard
     virtual QIcon icon() const;
     virtual QString description() const;
-    virtual QString name() const;
+    virtual QString displayName() const;
 
 protected:
     // BaseCheckoutWizard
diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp
index e9e8ec96026..f241396e22d 100644
--- a/src/plugins/git/gitversioncontrol.cpp
+++ b/src/plugins/git/gitversioncontrol.cpp
@@ -39,7 +39,7 @@ GitVersionControl::GitVersionControl(GitClient *client) :
 {
 }
 
-QString GitVersionControl::name() const
+QString GitVersionControl::displayName() const
 {
     return QLatin1String("git");
 }
diff --git a/src/plugins/git/gitversioncontrol.h b/src/plugins/git/gitversioncontrol.h
index fc4c1f7a2fd..e7dbf0dabec 100644
--- a/src/plugins/git/gitversioncontrol.h
+++ b/src/plugins/git/gitversioncontrol.h
@@ -44,7 +44,7 @@ class GitVersionControl : public Core::IVersionControl
 public:
     explicit GitVersionControl(GitClient *plugin);
 
-    virtual QString name() const;
+    virtual QString displayName() const;
 
     bool managesDirectory(const QString &directory) const;
     virtual QString findTopLevelForDirectory(const QString &directory) const;
diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp
index 5cddbeb22ac..61abe4148e5 100644
--- a/src/plugins/git/settingspage.cpp
+++ b/src/plugins/git/settingspage.cpp
@@ -102,7 +102,7 @@ QString SettingsPage::id() const
     return QLatin1String(VCSBase::Constants::VCS_ID_GIT);
 }
 
-QString SettingsPage::trName() const
+QString SettingsPage::displayName() const
 {
     return tr("Git");
 }
@@ -112,7 +112,7 @@ QString SettingsPage::category() const
     return QLatin1String(VCSBase::Constants::VCS_SETTINGS_CATEGORY);
 }
 
-QString SettingsPage::trCategory() const
+QString SettingsPage::displayCategory() const
 {
     return QCoreApplication::translate("VCSBase", VCSBase::Constants::VCS_SETTINGS_TR_CATEGORY);
 }
diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h
index c559c982c0a..dac646d3796 100644
--- a/src/plugins/git/settingspage.h
+++ b/src/plugins/git/settingspage.h
@@ -71,9 +71,9 @@ public:
     SettingsPage();
 
     QString id() const;
-    QString trName() const;
+    QString displayName() const;
     QString category() const;
-    QString trCategory() const;
+    QString displayCategory() const;
 
     QWidget *createPage(QWidget *parent);
     void apply();