diff --git a/Modules/Logging/LoggingMode.cpp b/Modules/Logging/LoggingMode.cpp
index dd5fb12a..330e5e30 100644
--- a/Modules/Logging/LoggingMode.cpp
+++ b/Modules/Logging/LoggingMode.cpp
@@ -30,7 +30,7 @@ LoggingMode::LoggingMode(QObject *parent)
     setEnabled(false);
     setDisplayOrder(100);
 
-    connect(&MacGitver::self().repoMan(),
+    connect(&RM::RepoMan::instance(),
             &RM::RepoMan::hasActiveRepositoryChanged,
             this, &LoggingMode::setEnabled);
 }
diff --git a/Modules/Repository/CreateRepositoryDlg.cpp b/Modules/Repository/CreateRepositoryDlg.cpp
index a3910bd6..c62330d2 100644
--- a/Modules/Repository/CreateRepositoryDlg.cpp
+++ b/Modules/Repository/CreateRepositoryDlg.cpp
@@ -105,7 +105,7 @@ void CreateRepositoryDlg::accept()
 
     MacGitver::log(Log::Normal, trUtf8("Created a new repository at %1").arg(fn));
 
-    MacGitver::repoMan().open(fn);
+    RM::RepoMan::instance().open(fn);
 
     QDialog::accept();
 }
diff --git a/Modules/Repository/RepoTreeView.cpp b/Modules/Repository/RepoTreeView.cpp
index c2d5b38c..3b7e7189 100644
--- a/Modules/Repository/RepoTreeView.cpp
+++ b/Modules/Repository/RepoTreeView.cpp
@@ -55,11 +55,11 @@ RepoTreeView::RepoTreeView()
     connect( mRepos,    SIGNAL(contextMenu(QModelIndex,QPoint)),
              this,      SLOT(contextMenu(QModelIndex,QPoint)) );
 
-    connect( &MacGitver::repoMan(), &RM::RepoMan::repositoryActivated,
-             this,                  &RepoTreeView::onRepoActivated);
+    connect(&RM::RepoMan::instance(),   &RM::RepoMan::repositoryActivated,
+            this,                       &RepoTreeView::onRepoActivated);
 
-    connect( &MacGitver::repoMan(), &RM::RepoMan::repositoryDeactivated,
-             this,                  &RepoTreeView::onRepoDeactivated);
+    connect(&RM::RepoMan::instance(),   &RM::RepoMan::repositoryDeactivated,
+            this,                       &RepoTreeView::onRepoDeactivated);
 }
 
 QModelIndex RepoTreeView::deeplyMapToSource( QModelIndex current ) const
diff --git a/testMacGitverCore/Infra/TempRepo.cpp b/testMacGitverCore/Infra/TempRepo.cpp
index ed72d6ec..0b0e8156 100644
--- a/testMacGitverCore/Infra/TempRepo.cpp
+++ b/testMacGitverCore/Infra/TempRepo.cpp
@@ -37,7 +37,7 @@ TempRepo::~TempRepo()
 TempRepoOpener::TempRepoOpener(Fixture* fixture, const char* name)
     : mTempRepo(fixture, name)
 {
-    MacGitver::repoMan().open(mTempRepo);
+    RM::RepoMan::instance().open(mTempRepo);
 }
 
 TempRepoOpener::~TempRepoOpener()