diff --git a/CPackOptions.cmake.in b/CPackOptions.cmake.in
index c5941d4a3..0fcfc4593 100644
--- a/CPackOptions.cmake.in
+++ b/CPackOptions.cmake.in
@@ -21,6 +21,6 @@ set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@)
 
 set( BUILD_OWNCLOUD_OSX_BUNDLE @BUILD_OWNCLOUD_OSX_BUNDLE@)
 if(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
-    message( FATAL_ERROR "You're trying to build a bundle although you haven't built mirall in bundle mode.\n Add -DBUILD_OWNCLOUD_OSX_BUNDLE=ON")
+    message( FATAL_ERROR "You're trying to build a bundle although you haven't built the client in bundle mode.\n Add -DBUILD_OWNCLOUD_OSX_BUNDLE=ON")
 endif()
 
diff --git a/README.md b/README.md
index 21570f972..4e321627d 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ contact the authors directly by mail, as this increases the chance
 of your report being lost.
 
 If you created a patch, please submit a [Pull
-Request](https://github.com/owncloud/mirall/pulls). For non-trivial
+Request](https://github.com/owncloud/client/pulls). For non-trivial
 patches, we need you to sign the [Contributor
 Agreement](https://owncloud.org/contribute/agreement) before
 we can accept your patch.
diff --git a/binary b/binary
index 151fc83a0..da9d1b487 160000
--- a/binary
+++ b/binary
@@ -1 +1 @@
-Subproject commit 151fc83a05edce5fb78acba8a4136f10b608b8d9
+Subproject commit da9d1b487d16c85b6660582498dace8d5684a461
diff --git a/shell_integration/MacOSX/OwnCloud.xcworkspace/xcshareddata/OwnCloud.xccheckout b/shell_integration/MacOSX/OwnCloud.xcworkspace/xcshareddata/OwnCloud.xccheckout
index 6fee20835..8320a7f7b 100644
--- a/shell_integration/MacOSX/OwnCloud.xcworkspace/xcshareddata/OwnCloud.xccheckout
+++ b/shell_integration/MacOSX/OwnCloud.xcworkspace/xcshareddata/OwnCloud.xccheckout
@@ -11,7 +11,7 @@
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
 		<key>09EE94AA-F410-4594-AB26-5A0220DEAEC7</key>
-		<string>ssh://github.com/owncloud/mirall.git</string>
+		<string>ssh://github.com/owncloud/client.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
 	<string>shell_integration/MacOSX/OwnCloud.xcworkspace</string>
@@ -21,7 +21,7 @@
 		<string>../../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>ssh://github.com/owncloud/mirall.git</string>
+	<string>ssh://github.com/owncloud/client.git</string>
 	<key>IDESourceControlProjectVersion</key>
 	<integer>110</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
@@ -34,7 +34,7 @@
 			<key>IDESourceControlWCCIdentifierKey</key>
 			<string>09EE94AA-F410-4594-AB26-5A0220DEAEC7</string>
 			<key>IDESourceControlWCCName</key>
-			<string>mirall</string>
+			<string>client</string>
 		</dict>
 	</array>
 </dict>
diff --git a/shell_integration/MacOSX/OwnCloudFinder/ContentManager.m b/shell_integration/MacOSX/OwnCloudFinder/ContentManager.m
index 70c0e889d..ee850bfb2 100644
--- a/shell_integration/MacOSX/OwnCloudFinder/ContentManager.m
+++ b/shell_integration/MacOSX/OwnCloudFinder/ContentManager.m
@@ -164,7 +164,7 @@ static ContentManager* sharedInstance = nil;
 }
 
 // called as a result of an UPDATE_VIEW message.
-// it clears the entries from the hash to make it call again home to mirall.
+// it clears the entries from the hash to make it call again home to the desktop client.
 - (void)clearFileNameCacheForPath:(NSString*)path
 {
 	NSLog(@"%@", NSStringFromSelector(_cmd));
@@ -387,4 +387,4 @@ static ContentManager* sharedInstance = nil;
 	}
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/shell_integration/MacOSX/deploy.sh b/shell_integration/MacOSX/deploy.sh
index ae5a9d31e..2cb2ca579 100644
--- a/shell_integration/MacOSX/deploy.sh
+++ b/shell_integration/MacOSX/deploy.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# osascript $HOME/owncloud.com/mirall/shell_integration/MacOSX/unload.scpt
+# osascript $HOME/owncloud.com/client/shell_integration/MacOSX/unload.scpt
 
 sudo rm -rf /Library/ScriptingAdditions/SyncStateFinder.osax
 # Klaas' machine
@@ -12,6 +12,6 @@ OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Products/Debu
 
 sudo killall Finder
 sleep 1
-osascript $HOME/owncloud.com/mirall/shell_integration/MacOSX/load.scpt
-osascript $HOME/owncloud.com/mirall/shell_integration/MacOSX/check.scpt
+osascript $HOME/owncloud.com/client/shell_integration/MacOSX/load.scpt
+osascript $HOME/owncloud.com/client/shell_integration/MacOSX/check.scpt
 
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 6dab176b8..4db7bcf64 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #ifdef WITH_CRASHREPORTER
-    #include "mirallconfigfile.h"
+    #include "configfile.h"
     #include <libcrashreporter-handler/Handler.h>
 #endif
 
diff --git a/src/libsync/creds/credentialscommon.cpp b/src/libsync/creds/credentialscommon.cpp
index bf98f7794..feba82f90 100644
--- a/src/libsync/creds/credentialscommon.cpp
+++ b/src/libsync/creds/credentialscommon.cpp
@@ -40,7 +40,7 @@ int handleNeonSSLProblems(const char* prompt,
     const QString qPrompt = QString::fromLatin1( prompt ).trimmed();
 
     if( qPrompt.startsWith( QLatin1String("There are problems with the SSL certificate:"))) {
-        // SSL is requested. If the program came here, the SSL check was done by mirall
+        // SSL is requested. If the program came here, the SSL check was done by Qt
         // It needs to be checked if the  chain is still equal to the one which
         // was verified by the user.
         const QRegExp regexp("fingerprint: ([\\w\\d:]+)");