diff --git a/src/libsync/accessmanager.cpp b/src/libsync/accessmanager.cpp
index 2b9fc77f1c..331f9d00c6 100644
--- a/src/libsync/accessmanager.cpp
+++ b/src/libsync/accessmanager.cpp
@@ -112,7 +112,7 @@ void AccessManager::slotAuthenticationRequired(QNetworkReply *reply, QAuthentica
     }
 #else
     Q_UNUSED(reply) Q_UNUSED(authenticator)
-    Q_ASSERT(!"MirallAccessManager::slotAuthenticationRequired called");
+    Q_ASSERT(!"OCC::AccessManager::slotAuthenticationRequired called");
 #endif
 }
 
diff --git a/src/libsync/bandwidthmanager.cpp b/src/libsync/bandwidthmanager.cpp
index e7662c2673..0b5e730653 100644
--- a/src/libsync/bandwidthmanager.cpp
+++ b/src/libsync/bandwidthmanager.cpp
@@ -27,7 +27,7 @@
 #include <QTimer>
 #include <QObject>
 
-namespace Mirall {
+namespace OCC {
 
 // Because of the many layers of buffering inside Qt (and probably the OS and the network)
 // we cannot lower this value much more. If we do, the estimated bw will be very high
diff --git a/src/libsync/bandwidthmanager.h b/src/libsync/bandwidthmanager.h
index 6b705f9705..74ad4ab075 100644
--- a/src/libsync/bandwidthmanager.h
+++ b/src/libsync/bandwidthmanager.h
@@ -20,7 +20,7 @@
 #include <QTimer>
 #include <QIODevice>
 
-namespace Mirall {
+namespace OCC {
 
 class UploadDevice;
 class GETFileJob;
diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index 3b4f96a662..01dc70b2fb 100644
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -555,13 +555,13 @@ void ConfigFile::setMonoIcons(bool useMonoIcons)
     settings.setValue(QLatin1String(monoIconsC), useMonoIcons);
 }
 
-bool MirallConfigFile::crashReporter() const
+bool ConfigFile::crashReporter() const
 {
     QSettings settings(configFile(), QSettings::IniFormat);
     return settings.value(QLatin1String(crashReporterC), true).toBool();
 }
 
-void MirallConfigFile::setCrashReporter(bool enabled)
+void ConfigFile::setCrashReporter(bool enabled)
 {
     QSettings settings(configFile(), QSettings::IniFormat);
     settings.setValue(QLatin1String(crashReporterC), enabled);
diff --git a/src/libsync/propagatedownload.h b/src/libsync/propagatedownload.h
index e98be4b400..0cc79c7008 100644
--- a/src/libsync/propagatedownload.h
+++ b/src/libsync/propagatedownload.h
@@ -19,7 +19,7 @@
 #include <QBuffer>
 #include <QFile>
 
-namespace Mirall {
+namespace OCC {
 
 class GETFileJob : public AbstractNetworkJob {
     Q_OBJECT
diff --git a/src/libsync/propagateremotedelete.cpp b/src/libsync/propagateremotedelete.cpp
index 503daf3078..395368f86a 100644
--- a/src/libsync/propagateremotedelete.cpp
+++ b/src/libsync/propagateremotedelete.cpp
@@ -16,7 +16,7 @@
 #include "owncloudpropagator_p.h"
 #include "account.h"
 
-namespace Mirall {
+namespace OCC {
 
 DeleteJob::DeleteJob(Account* account, const QString& path, QObject* parent)
     : AbstractNetworkJob(account, path, parent)
diff --git a/src/libsync/propagateremotedelete.h b/src/libsync/propagateremotedelete.h
index e82b6acc49..7b7a175265 100644
--- a/src/libsync/propagateremotedelete.h
+++ b/src/libsync/propagateremotedelete.h
@@ -16,7 +16,7 @@
 #include "owncloudpropagator.h"
 #include "networkjobs.h"
 
-namespace Mirall {
+namespace OCC {
 
 class DeleteJob : public AbstractNetworkJob {
     Q_OBJECT
diff --git a/src/libsync/propagateremotemkdir.cpp b/src/libsync/propagateremotemkdir.cpp
index ce51a054f6..51cf64543e 100644
--- a/src/libsync/propagateremotemkdir.cpp
+++ b/src/libsync/propagateremotemkdir.cpp
@@ -18,7 +18,7 @@
 #include "syncjournalfilerecord.h"
 #include <QFile>
 
-namespace Mirall {
+namespace OCC {
 
 void PropagateRemoteMkdir::start()
 {
diff --git a/src/libsync/propagateremotemkdir.h b/src/libsync/propagateremotemkdir.h
index fae8db28b4..d88990b186 100644
--- a/src/libsync/propagateremotemkdir.h
+++ b/src/libsync/propagateremotemkdir.h
@@ -16,7 +16,7 @@
 #include "owncloudpropagator.h"
 #include "networkjobs.h"
 
-namespace Mirall {
+namespace OCC {
 
 class PropagateRemoteMkdir : public PropagateItemJob {
     Q_OBJECT
diff --git a/src/libsync/propagateremotemove.cpp b/src/libsync/propagateremotemove.cpp
index d7888029ed..34c1d57277 100644
--- a/src/libsync/propagateremotemove.cpp
+++ b/src/libsync/propagateremotemove.cpp
@@ -18,7 +18,7 @@
 #include "syncjournalfilerecord.h"
 #include <QFile>
 
-namespace Mirall {
+namespace OCC {
 
 MoveJob::MoveJob(Account* account, const QString& path,
                  const QString &destination, QObject* parent)
diff --git a/src/libsync/propagateremotemove.h b/src/libsync/propagateremotemove.h
index 540fff9f60..d3d3bf4503 100644
--- a/src/libsync/propagateremotemove.h
+++ b/src/libsync/propagateremotemove.h
@@ -16,7 +16,7 @@
 #include "owncloudpropagator.h"
 #include "networkjobs.h"
 
-namespace Mirall {
+namespace OCC {
 
 class MoveJob : public AbstractNetworkJob {
     Q_OBJECT
@@ -43,10 +43,10 @@ public:
         : PropagateItemJob(propagator, item) {}
     void start() Q_DECL_OVERRIDE;
     void abort() Q_DECL_OVERRIDE;
-    JobParallelism parallelism() Q_DECL_OVERRIDE { return Mirall::PropagatorJob::WaitForFinishedInParentDirectory; }
+    JobParallelism parallelism() Q_DECL_OVERRIDE { return OCC::PropagatorJob::WaitForFinishedInParentDirectory; }
 private slots:
     void slotMoveJobFinished();
     void finalize();
 };
 
-}
\ No newline at end of file
+}
diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index 654de66c90..1b25672f9c 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -28,7 +28,7 @@
 #include <QDir>
 #include <cmath>
 
-namespace Mirall {
+namespace OCC {
 
 /**
  * The mtime of a file must be at least this many milliseconds in