diff --git a/test/manual/favlink/main.cpp b/test/manual/favlink/main.cpp
index 992eb7e21..00f9067e4 100644
--- a/test/manual/favlink/main.cpp
+++ b/test/manual/favlink/main.cpp
@@ -18,5 +18,5 @@ int main(int argc, char* argv[])
 {
    QString dir="/tmp/linktest/";
    QDir().mkpath(dir);
-   Mirall::Utility::setupFavLink(dir);
+   OCC::Utility::setupFavLink(dir);
 }
diff --git a/test/scripts/README.rst b/test/scripts/README.rst
index 3ba17d100..4af1d7848 100644
--- a/test/scripts/README.rst
+++ b/test/scripts/README.rst
@@ -1,5 +1,5 @@
-Torture for Mirall
-==================
+Torture for ownCloud Client
+===========================
 
 This is a set of scripts comprising of two parts:
 
diff --git a/test/testfolder.h b/test/testfolder.h
index 9f3f8f8d5..786f798fc 100644
--- a/test/testfolder.h
+++ b/test/testfolder.h
@@ -13,7 +13,7 @@
 #include "utility.h"
 #include "folder.h"
 
-using namespace Mirall;
+using namespace OCC;
 
 class TestFolder: public QObject
 {
diff --git a/test/testfolderwatcher.h b/test/testfolderwatcher.h
index f94a0d603..4fbf77326 100644
--- a/test/testfolderwatcher.h
+++ b/test/testfolderwatcher.h
@@ -13,7 +13,7 @@
 #include "folderwatcher_linux.h"
 #include "utility.h"
 
-using namespace Mirall;
+using namespace OCC;
 
 class TestFolderWatcher : public QObject
 {
diff --git a/test/testinotifywatcher.h b/test/testinotifywatcher.h
index 57e72ea55..454c57a6d 100644
--- a/test/testinotifywatcher.h
+++ b/test/testinotifywatcher.h
@@ -12,7 +12,7 @@
 #include "folderwatcher_linux.h"
 #include "utility.h"
 
-using namespace Mirall;
+using namespace OCC;
 
 class TestInotifyWatcher: public FolderWatcherPrivate
 {
diff --git a/test/testnetrcparser.h b/test/testnetrcparser.h
index 404c57e25..b77f2f782 100644
--- a/test/testnetrcparser.h
+++ b/test/testnetrcparser.h
@@ -11,7 +11,7 @@
 
 #include "cmd/netrcparser.h"
 
-using namespace Mirall;
+using namespace OCC;
 
 namespace {
 
diff --git a/test/testownsql.h b/test/testownsql.h
index 8678bea4a..af4472414 100644
--- a/test/testownsql.h
+++ b/test/testownsql.h
@@ -13,7 +13,7 @@
 
 #include "ownsql.h"
 
-using namespace Mirall;
+using namespace OCC;
 
 namespace {
 
diff --git a/test/testsyncjournaldb.h b/test/testsyncjournaldb.h
index fbf701f10..7ca65b754 100644
--- a/test/testsyncjournaldb.h
+++ b/test/testsyncjournaldb.h
@@ -14,7 +14,7 @@
 #include "libsync/syncjournaldb.h"
 #include "libsync/syncjournalfilerecord.h"
 
-using namespace Mirall;
+using namespace OCC;
 
 namespace {
 
diff --git a/test/testupdater.h b/test/testupdater.h
index 29efef26f..b90c51d26 100644
--- a/test/testupdater.h
+++ b/test/testupdater.h
@@ -12,7 +12,7 @@
 #include "updater/updater.h"
 #include "updater/ocupdater.h"
 
-using namespace Mirall;
+using namespace OCC;
 
 class TestUpdater : public QObject
 {
diff --git a/test/testutility.h b/test/testutility.h
index e49c77ff7..27f7f1270 100644
--- a/test/testutility.h
+++ b/test/testutility.h
@@ -11,7 +11,7 @@
 
 #include "utility.h"
 
-using namespace Mirall::Utility;
+using namespace OCC::Utility;
 
 class TestUtility : public QObject
 {