diff --git a/core/doc/admin/index.html b/core/doc/admin/index.html
index 7785f2ce2f1ea..ac24d0503bf9f 100644
--- a/core/doc/admin/index.html
+++ b/core/doc/admin/index.html
@@ -1,2 +1,2 @@
 Here goes the admin documentation.
-In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
+In the meantime go to <a href="https://nextcloud.com/support/" target="_blank">nextcloud.com/support/</a>
diff --git a/core/doc/user/index.html b/core/doc/user/index.html
index ede62f05aee7a..409495a42c999 100644
--- a/core/doc/user/index.html
+++ b/core/doc/user/index.html
@@ -1,2 +1,2 @@
 Here goes the user documentation
-In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
+In the meantime go to <a href="https://nextcloud.com/support/" target="_blank">nextcloud.com/support/</a>
diff --git a/lib/base.php b/lib/base.php
index be14f49cab33b..a2630093c9445 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -62,19 +62,19 @@ class OC {
 	 */
 	public static $CLASSPATH = array();
 	/**
-	 * The installation path for owncloud on the server (e.g. /srv/http/owncloud)
+	 * The installation path for Nextcloud  on the server (e.g. /srv/http/nextcloud)
 	 */
 	public static $SERVERROOT = '';
 	/**
-	 * the current request path relative to the owncloud root (e.g. files/index.php)
+	 * the current request path relative to the Nextcloud root (e.g. files/index.php)
 	 */
 	private static $SUBURI = '';
 	/**
-	 * the owncloud root path for http requests (e.g. owncloud/)
+	 * the Nextcloud root path for http requests (e.g. nextcloud/)
 	 */
 	public static $WEBROOT = '';
 	/**
-	 * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and
+	 * The installation path array of the apps folder on the server (e.g. /srv/http/nextcloud) 'path' and
 	 * web path in 'url'
 	 */
 	public static $APPSROOTS = array();
@@ -90,7 +90,7 @@ class OC {
 	public static $REQUESTEDAPP = '';
 
 	/**
-	 * check if ownCloud runs in cli mode
+	 * check if Nextcloud runs in cli mode
 	 */
 	public static $CLI = false;
 
@@ -168,7 +168,7 @@ public static function initPaths() {
 				OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
 			}
 
-			// Resolve /owncloud to /owncloud/ to ensure to always have a trailing
+			// Resolve /nextcloud to /nextcloud/ to ensure to always have a trailing
 			// slash which is required by URL generation.
 			if($_SERVER['REQUEST_URI'] === \OC::$WEBROOT &&
 					substr($_SERVER['REQUEST_URI'], -1) !== '/') {
@@ -198,15 +198,15 @@ public static function initPaths() {
 		}
 
 		if (empty(OC::$APPSROOTS)) {
-			throw new \RuntimeException('apps directory not found! Please put the ownCloud apps folder in the ownCloud folder'
+			throw new \RuntimeException('apps directory not found! Please put the Nextcloud apps folder in the Nextcloud folder'
 				. ' or the folder above. You can also configure the location in the config.php file.');
 		}
 		$paths = array();
 		foreach (OC::$APPSROOTS as $path) {
 			$paths[] = $path['path'];
 			if (!is_dir($path['path'])) {
-				throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the ownCloud apps folder in the'
-					. ' ownCloud folder or the folder above. You can also configure the location in the'
+				throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the Nextcloud apps folder in the'
+					. ' Nextcloud folder or the folder above. You can also configure the location in the'
 					. ' config.php file.', $path['path']));
 			}
 		}
@@ -357,7 +357,7 @@ private static function printUpgradePage() {
 
 			// render error page
 			$template = new OC_Template('', 'update.use-cli', 'guest');
-			$template->assign('productName', 'ownCloud'); // for now
+			$template->assign('productName', 'owncloud'); // for now
 			$template->assign('version', OC_Util::getVersionString());
 			$template->assign('tooBig', $tooBig);
 
@@ -397,7 +397,7 @@ public static function initSession() {
 		// prevents javascript from accessing php session cookies
 		ini_set('session.cookie_httponly', true);
 
-		// set the cookie path to the ownCloud directory
+		// set the cookie path to the Nextcloud directory
 		$cookie_path = OC::$WEBROOT ? : '/';
 		ini_set('session.cookie_path', $cookie_path);
 
@@ -462,7 +462,7 @@ public static function loadAppClassPaths() {
 	}
 
 	/**
-	 * Try to set some values to the required ownCloud default
+	 * Try to set some values to the required Nextcloud default
 	 */
 	public static function setRequiredIniValues() {
 		@ini_set('default_charset', 'UTF-8');
@@ -808,7 +808,7 @@ public static function handleRequest() {
 		// in the routing files of each app
 		OC::loadAppClassPaths();
 
-		// Check if ownCloud is installed or in maintenance (update) mode
+		// Check if Nextcloud is installed or in maintenance (update) mode
 		if (!$systemConfig->getValue('installed', false)) {
 			\OC::$server->getSession()->clear();
 			$setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(),