diff --git a/apps/dav/lib/Connector/Sabre/Auth.php b/apps/dav/lib/Connector/Sabre/Auth.php
index 93d8b14d9c9..bdaf73d46e7 100644
--- a/apps/dav/lib/Connector/Sabre/Auth.php
+++ b/apps/dav/lib/Connector/Sabre/Auth.php
@@ -174,7 +174,7 @@ class Auth extends AbstractBasic {
 			return false;
 		}
 
-		// Official ownCloud clients require no checks
+		// Official Nextcloud clients require no checks
 		if($this->request->isUserAgent([
 			IRequest::USER_AGENT_CLIENT_DESKTOP,
 			IRequest::USER_AGENT_CLIENT_ANDROID,
diff --git a/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php b/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php
index a9e339f9ffc..f8193f38e1f 100644
--- a/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php
+++ b/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php
@@ -27,7 +27,7 @@ use Sabre\HTTP\RequestInterface;
 
 /**
  * Class DummyGetResponsePlugin is a plugin used to not show a "Not implemented"
- * error to clients that rely on verifying the functionality of the ownCloud
+ * error to clients that rely on verifying the functionality of the Nextcloud
  * WebDAV backend using a simple GET to /.
  *
  * This is considered a legacy behaviour and implementers should consider sending
diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php
index 24c93ee571d..f04362dfc08 100644
--- a/apps/dav/lib/Connector/Sabre/ServerFactory.php
+++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php
@@ -142,7 +142,7 @@ class ServerFactory {
 				$rootInfo = $view->getFileInfo('');
 			}
 
-			// Create ownCloud Dir
+			// Create Nextcloud Dir
 			if ($rootInfo->getType() === 'dir') {
 				$root = new \OCA\DAV\Connector\Sabre\Directory($view, $rootInfo, $objectTree);
 			} else {
diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php
index 4303cb9e940..9a9ac27b96f 100644
--- a/apps/encryption/lib/Crypto/Crypt.php
+++ b/apps/encryption/lib/Crypto/Crypt.php
@@ -38,7 +38,7 @@ use OCP\ILogger;
 use OCP\IUserSession;
 
 /**
- * Class Crypt provides the encryption implementation of the default ownCloud
+ * Class Crypt provides the encryption implementation of the default Nextcloud
  * encryption module. As default AES-256-CTR is used, it does however offer support
  * for the following modes:
  *
@@ -54,10 +54,10 @@ use OCP\IUserSession;
 class Crypt {
 
 	const DEFAULT_CIPHER = 'AES-256-CTR';
-	// default cipher from old ownCloud versions
+	// default cipher from old Nextcloud versions
 	const LEGACY_CIPHER = 'AES-128-CFB';
 
-	// default key format, old ownCloud version encrypted the private key directly
+	// default key format, old Nextcloud version encrypted the private key directly
 	// with the user password
 	const LEGACY_KEY_FORMAT = 'password';
 
diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php
index fdcbd41a09c..7f7665a24fc 100644
--- a/apps/encryption/lib/Crypto/Encryption.php
+++ b/apps/encryption/lib/Crypto/Encryption.php
@@ -458,7 +458,7 @@ class Encryption implements IEncryptionModule {
 
 	/**
 	 * get size of the unencrypted payload per block.
-	 * ownCloud read/write files with a block size of 8192 byte
+	 * Nextcloud read/write files with a block size of 8192 byte
 	 *
 	 * @param bool $signed
 	 * @return int
diff --git a/apps/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php
index d189ce3eeef..e0826e2c7e3 100644
--- a/apps/encryption/lib/Hooks/UserHooks.php
+++ b/apps/encryption/lib/Hooks/UserHooks.php
@@ -236,7 +236,7 @@ class UserHooks implements IHook {
 	}
 
 	/**
-	 * If the password can't be changed within ownCloud, than update the key password in advance.
+	 * If the password can't be changed within Nextcloud, than update the key password in advance.
 	 *
 	 * @param array $params : uid, password
 	 * @return boolean|null
diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index 32872ae99b3..6b260c39bfb 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -687,7 +687,7 @@ class KeyManager {
 	public function getMasterKeyPassword() {
 		$password = $this->config->getSystemValue('secret');
 		if (empty($password)){
-			throw new \Exception('Can not get secret from ownCloud instance');
+			throw new \Exception('Can not get secret from Nextcloud instance');
 		}
 
 		return $password;
diff --git a/apps/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php
index 3525d2d4aec..7e074a5b9e8 100644
--- a/apps/encryption/tests/Crypto/EncryptionTest.php
+++ b/apps/encryption/tests/Crypto/EncryptionTest.php
@@ -345,7 +345,7 @@ class EncryptionTest extends TestCase {
 	}
 
 	/**
-	 * Test case if the public key is missing. ownCloud should still encrypt
+	 * Test case if the public key is missing. Nextcloud should still encrypt
 	 * the file for the remaining users
 	 */
 	public function testUpdateMissingPublicKey() {
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
index 5623b60ad06..120365263a9 100644
--- a/apps/federatedfilesharing/lib/FederatedShareProvider.php
+++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php
@@ -945,7 +945,7 @@ class FederatedShareProvider implements IShareProvider {
 	}
 
 	/**
-	 * check if users are allowed to mount public links from other ownClouds
+	 * check if users are allowed to mount public links from other Nextclouds
 	 *
 	 * @return bool
 	 */
diff --git a/apps/federation/lib/BackgroundJob/GetSharedSecret.php b/apps/federation/lib/BackgroundJob/GetSharedSecret.php
index 521ffca8a70..c0a4b43db64 100644
--- a/apps/federation/lib/BackgroundJob/GetSharedSecret.php
+++ b/apps/federation/lib/BackgroundJob/GetSharedSecret.php
@@ -41,7 +41,7 @@ use OCP\IURLGenerator;
 /**
  * Class GetSharedSecret
  *
- * request shared secret from remote ownCloud
+ * request shared secret from remote Nextcloud
  *
  * @package OCA\Federation\Backgroundjob
  */
diff --git a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
index fa7a67a1caf..352995572c9 100644
--- a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
+++ b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
@@ -41,7 +41,7 @@ use OCP\IURLGenerator;
 /**
  * Class RequestSharedSecret
  *
- * Ask remote ownCloud to request a sharedSecret from this server
+ * Ask remote Nextcloud to request a sharedSecret from this server
  *
  * @package OCA\Federation\Backgroundjob
  */
diff --git a/apps/federation/lib/Controller/OCSAuthAPIController.php b/apps/federation/lib/Controller/OCSAuthAPIController.php
index 6cd3b1890ef..fdca601da63 100644
--- a/apps/federation/lib/Controller/OCSAuthAPIController.php
+++ b/apps/federation/lib/Controller/OCSAuthAPIController.php
@@ -40,7 +40,7 @@ use OCP\Security\ISecureRandom;
 /**
  * Class OCSAuthAPI
  *
- * OCS API end-points to exchange shared secret between two connected ownClouds
+ * OCS API end-points to exchange shared secret between two connected Nextclouds
  *
  * @package OCA\Federation\Controller
  */
diff --git a/apps/federation/lib/Controller/SettingsController.php b/apps/federation/lib/Controller/SettingsController.php
index 40cc4c084a0..afbaa4abeee 100644
--- a/apps/federation/lib/Controller/SettingsController.php
+++ b/apps/federation/lib/Controller/SettingsController.php
@@ -58,7 +58,7 @@ class SettingsController extends Controller {
 
 
 	/**
-	 * add server to the list of trusted ownClouds
+	 * add server to the list of trusted Nextclouds
 	 *
 	 * @param string $url
 	 * @return DataResponse
@@ -78,7 +78,7 @@ class SettingsController extends Controller {
 	}
 
 	/**
-	 * add server to the list of trusted ownClouds
+	 * add server to the list of trusted Nextclouds
 	 *
 	 * @param int $id
 	 * @return DataResponse
diff --git a/apps/federation/lib/TrustedServers.php b/apps/federation/lib/TrustedServers.php
index 1376dd683d3..9bf1452eab3 100644
--- a/apps/federation/lib/TrustedServers.php
+++ b/apps/federation/lib/TrustedServers.php
@@ -183,7 +183,7 @@ class TrustedServers {
 	}
 
 	/**
-	 * check if given server is a trusted ownCloud server
+	 * check if given server is a trusted Nextcloud server
 	 *
 	 * @param string $url
 	 * @return bool
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 7e79399bba5..0fcb10a21ee 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -856,7 +856,7 @@
 				title = '';
 			}
 			title += this.appName;
-			// Sets the page title with the " - ownCloud" suffix as in templates
+			// Sets the page title with the " - Nextcloud" suffix as in templates
 			window.document.title = title + ' - ' + oc_defaults.title;
 
 			return true;
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 3f6a48d2e22..74ad050d30e 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>files_external</id>
 	<name>External storage support</name>
 	<description>
-This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other ownCloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root ownCloud directory, which they can access and use like any other ownCloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.
+This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other Nextcloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root Nextcloud directory, which they can access and use like any other Nextcloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.
 
 External storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation.
 	</description>
diff --git a/apps/files_external/lib/Lib/Storage/Google.php b/apps/files_external/lib/Lib/Storage/Google.php
index b22b0c29263..2211686055e 100644
--- a/apps/files_external/lib/Lib/Storage/Google.php
+++ b/apps/files_external/lib/Lib/Storage/Google.php
@@ -126,7 +126,7 @@ class Google extends \OC\Files\Storage\Common {
 					$q = "title='" . str_replace("'","\\'", $name) . "' and '" . str_replace("'","\\'", $parentId) . "' in parents and trashed = false";
 					$result = $this->service->files->listFiles(array('q' => $q))->getItems();
 					if (!empty($result)) {
-						// Google Drive allows files with the same name, ownCloud doesn't
+						// Google Drive allows files with the same name, Nextcloud doesn't
 						if (count($result) > 1) {
 							$this->onDuplicateFileDetected($path);
 							return false;
@@ -294,7 +294,7 @@ class Google extends \OC\Files\Storage\Common {
 					} else {
 						$filepath = $path.'/'.$name;
 					}
-					// Google Drive allows files with the same name, ownCloud doesn't
+					// Google Drive allows files with the same name, Nextcloud doesn't
 					// Prevent opendir() from returning any duplicate files
 					$key = array_search($name, $files);
 					if ($key !== false || isset($duplicates[$filepath])) {
diff --git a/apps/files_external/lib/Lib/Storage/OwnCloud.php b/apps/files_external/lib/Lib/Storage/OwnCloud.php
index 427b55a4a54..9669b5f3dad 100644
--- a/apps/files_external/lib/Lib/Storage/OwnCloud.php
+++ b/apps/files_external/lib/Lib/Storage/OwnCloud.php
@@ -26,9 +26,9 @@ namespace OCA\Files_External\Lib\Storage;
 use Sabre\DAV\Client;
 
 /**
- * ownCloud backend for external storage based on DAV backend.
+ * Nextcloud backend for external storage based on DAV backend.
  *
- * The ownCloud URL consists of three parts:
+ * The Nextcloud URL consists of three parts:
  * http://%host/%context/remote.php/webdav/%root
  *
  */
diff --git a/apps/files_external/tests/README.md b/apps/files_external/tests/README.md
index 0b3c7fd004f..202ae8eee9a 100644
--- a/apps/files_external/tests/README.md
+++ b/apps/files_external/tests/README.md
@@ -20,7 +20,7 @@ freely.
 
 ## Hands-on way of unit test execution
 
-Run all files_external unit tests by invoking the following in the ownCloud
+Run all files_external unit tests by invoking the following in the Nextcloud
 core root folder:
 
     ./autotest-external.sh
diff --git a/apps/files_external/tests/Storage/OwncloudTest.php b/apps/files_external/tests/Storage/OwncloudTest.php
index 45b5071d941..f1564304e2f 100644
--- a/apps/files_external/tests/Storage/OwncloudTest.php
+++ b/apps/files_external/tests/Storage/OwncloudTest.php
@@ -45,7 +45,7 @@ class OwncloudTest extends \Test\Files\Storage\Storage {
 		$id = $this->getUniqueID();
 		$this->config = include('files_external/tests/config.php');
 		if ( ! is_array($this->config) or ! isset($this->config['owncloud']) or ! $this->config['owncloud']['run']) {
-			$this->markTestSkipped('ownCloud backend not configured');
+			$this->markTestSkipped('Nextcloud backend not configured');
 		}
 		$this->config['owncloud']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
 		$this->instance = new OwnCloud($this->config['owncloud']);
diff --git a/apps/files_external/tests/env/start-webdav-apache.sh b/apps/files_external/tests/env/start-webdav-apache.sh
index 48acb8572d6..a5464c9cfab 100755
--- a/apps/files_external/tests/env/start-webdav-apache.sh
+++ b/apps/files_external/tests/env/start-webdav-apache.sh
@@ -6,7 +6,7 @@
 # against. It will also change the files_external config to use the docker
 # container as testing environment. This is reverted in the stop step.
 #
-# If the environment variable RUN_DOCKER_MYSQL is set the ownCloud will
+# If the environment variable RUN_DOCKER_MYSQL is set the Nextcloud will
 # be set up using MySQL instead of SQLite.
 #
 # Set environment variable DEBUG to print config file
@@ -74,7 +74,7 @@ return array(
 
 DELIM
 
-echo "ownCloud container: $container"
+echo "Nextcloud container: $container"
 
 # put container IDs into a file to drop them after the test run (keep in mind that multiple tests run in parallel on the same host)
 echo $container >> $thisFolder/dockerContainerWebdav.$EXECUTOR_NUMBER.webdav
diff --git a/apps/files_external/tests/env/start-webdav-ownCloud.sh b/apps/files_external/tests/env/start-webdav-ownCloud.sh
index d992516d7b1..870bd5bcdf8 100755
--- a/apps/files_external/tests/env/start-webdav-ownCloud.sh
+++ b/apps/files_external/tests/env/start-webdav-ownCloud.sh
@@ -6,7 +6,7 @@
 # against. It will also change the files_external config to use the docker
 # container as testing environment. This is reverted in the stop step.
 #
-# If the environment variable RUN_DOCKER_MYSQL is set the ownCloud will
+# If the environment variable RUN_DOCKER_MYSQL is set the Nextcloud will
 # be set up using MySQL instead of SQLite.
 #
 # Set environment variable DEBUG to print config file
@@ -48,7 +48,7 @@ container=`docker run -P $parameter -d -e ADMINLOGIN=test -e ADMINPWD=test morri
 
 host=`docker inspect --format="{{.NetworkSettings.IPAddress}}" $container`
 
-echo -n "Waiting for ownCloud initialization"
+echo -n "Waiting for Nextcloud initialization"
 if ! "$thisFolder"/env/wait-for-connection ${host} 80 60; then
     echo "[ERROR] Waited 60 seconds, no response" >&2
     exit 1
@@ -74,7 +74,7 @@ return array(
 
 DELIM
 
-echo "ownCloud container: $container"
+echo "Nextcloud container: $container"
 
 # put container IDs into a file to drop them after the test run (keep in mind that multiple tests run in parallel on the same host)
 echo $container >> $thisFolder/dockerContainerOwnCloud.$EXECUTOR_NUMBER.webdav
diff --git a/apps/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php
index 51d97388db7..319735dcaf5 100644
--- a/apps/files_sharing/lib/External/Storage.php
+++ b/apps/files_sharing/lib/External/Storage.php
@@ -208,16 +208,16 @@ class Storage extends DAV implements ISharedStorage {
 		try {
 			$this->getShareInfo();
 		} catch (NotFoundException $e) {
-			// a 404 can either mean that the share no longer exists or there is no ownCloud on the remote
+			// a 404 can either mean that the share no longer exists or there is no Nextcloud on the remote
 			if ($this->testRemote()) {
-				// valid ownCloud instance means that the public share no longer exists
+				// valid Nextcloud instance means that the public share no longer exists
 				// since this is permanent (re-sharing the file will create a new token)
 				// we remove the invalid storage
 				$this->manager->removeShare($this->mountPoint);
 				$this->manager->getMountManager()->removeMount($this->mountPoint);
 				throw new StorageInvalidException();
 			} else {
-				// ownCloud instance is gone, likely to be a temporary server configuration error
+				// Nextcloud instance is gone, likely to be a temporary server configuration error
 				throw new StorageNotAvailableException();
 			}
 		} catch (ForbiddenException $e) {
@@ -286,7 +286,7 @@ class Storage extends DAV implements ISharedStorage {
 	}
 
 	/**
-	 * Whether the remote is an ownCloud, used since some sharing features are not
+	 * Whether the remote is an ownCloud/Nextcloud, used since some sharing features are not
 	 * standardized. Let's use this to detect whether to use it.
 	 *
 	 * @return bool
diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php
index 78f0c9212f9..48dc3fbd055 100644
--- a/apps/files_trashbin/lib/Trashbin.php
+++ b/apps/files_trashbin/lib/Trashbin.php
@@ -680,7 +680,7 @@ class Trashbin {
 	}
 
 	/**
-	 * resize trash bin if necessary after a new file was added to ownCloud
+	 * resize trash bin if necessary after a new file was added to Nextcloud
 	 *
 	 * @param string $user user id
 	 */
diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml
index e633df00bd9..ede999ffec6 100644
--- a/apps/provisioning_api/appinfo/info.xml
+++ b/apps/provisioning_api/appinfo/info.xml
@@ -4,9 +4,9 @@
 	<name>Provisioning API</name>
 	<description>
 		This application enables a set of APIs that external systems can use to create, edit, delete and query user
-		attributes, query, set and remove groups, set quota and query total storage used in ownCloud. Group admin users
-		can also query ownCloud and perform the same functions as an admin for groups they manage. The API also enables
-		an admin to query for active ownCloud applications, application info, and to enable or disable an app remotely.
+		attributes, query, set and remove groups, set quota and query total storage used in Nextcloud. Group admin users
+		can also query Nextcloud and perform the same functions as an admin for groups they manage. The API also enables
+		an admin to query for active Nextcloud applications, application info, and to enable or disable an app remotely.
 		Once the app is enabled, http requests can be used via a Basic Auth header to perform any of the functions
 		listed above. More information is available in the Provisioning API documentation, including example calls
 		and server responses.
diff --git a/apps/user_ldap/js/wizard/configModel.js b/apps/user_ldap/js/wizard/configModel.js
index 3732409c3e1..d99392660c8 100644
--- a/apps/user_ldap/js/wizard/configModel.js
+++ b/apps/user_ldap/js/wizard/configModel.js
@@ -10,11 +10,11 @@ OCA = OCA || {};
 
 	/**
 	 * @classdesc this class represents a server configuration. It communicates
-	 * with the ownCloud server to ensure to always have the up to date LDAP
+	 * with the Nextcloud server to ensure to always have the up to date LDAP
 	 * configuration. It sends various events that views can listen to and
 	 * provides methods so they can modify the configuration based upon user
 	 * input. This model is also extended by so-called "detectors" who let the
-	 * ownCloud server try to auto-detect settings and manipulate the
+	 * Nextcloud server try to auto-detect settings and manipulate the
 	 * configuration as well.
 	 *
 	 * @constructor
@@ -108,7 +108,7 @@ OCA = OCA || {};
 		 */
 
 		/**
-		 * calls an AJAX endpoint at ownCloud. This method should be called by
+		 * calls an AJAX endpoint at Nextcloud. This method should be called by
 		 * detectors only!
 		 *
 		 * @param {string} [params] - as return by OC.buildQueryString
@@ -121,7 +121,7 @@ OCA = OCA || {};
 		},
 
 		/**
-		 * calls an AJAX endpoint at ownCloud. This method should be called by
+		 * calls an AJAX endpoint at Nextcloud. This method should be called by
 		 * detectors only!
 		 *
 		 * @param {string} destination - the desired end point
@@ -148,7 +148,7 @@ OCA = OCA || {};
 		/**
 		 * modifies a configuration key. If a provided configuration key does
 		 * not exist or the provided value equals the current setting, false is
-		 * returned. Otherwise ownCloud server will be called to save the new
+		 * returned. Otherwise Nextcloud server will be called to save the new
 		 * value, an event will notify when this is done. True is returned when
 		 * the request is sent, however it does not mean whether saving was
 		 * successful or not.
@@ -195,7 +195,7 @@ OCA = OCA || {};
 
 		/**
 		 * updates the model's configuration data. This should be called only,
-		 * when a new configuration value was received from the ownCloud server.
+		 * when a new configuration value was received from the Nextcloud server.
 		 * This is typically done by detectors, but never by views.
 		 *
 		 * Cancels with false if old and new values already match.
@@ -314,7 +314,7 @@ OCA = OCA || {};
 		},
 
 		/**
-		 * starts a configuration test on the ownCloud server
+		 * starts a configuration test on the Nextcloud server
 		 */
 		requestConfigurationTest: function() {
 			var url = OC.generateUrl('apps/user_ldap/ajax/testConfiguration.php');
diff --git a/apps/user_ldap/js/wizard/wizardDetectorAvailableAttributes.js b/apps/user_ldap/js/wizard/wizardDetectorAvailableAttributes.js
index f0272351749..fd43b032ad5 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorAvailableAttributes.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorAvailableAttributes.js
@@ -11,7 +11,7 @@ OCA = OCA || {};
 
 	/**
 	 * @classdesc an Attributes Detector. It executes the auto-detection of
-	 * available attributes by the ownCloud server, if requirements are met.
+	 * available attributes by the Nextcloud server, if requirements are met.
 	 *
 	 * @constructor
 	 */
diff --git a/apps/user_ldap/js/wizard/wizardDetectorBaseDN.js b/apps/user_ldap/js/wizard/wizardDetectorBaseDN.js
index 70b9923e58d..f81d342b692 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorBaseDN.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorBaseDN.js
@@ -11,7 +11,7 @@ OCA = OCA || {};
 
 	/**
 	 * @classdesc a Base DN Detector. It executes the auto-detection of the base
-	 * DN by the ownCloud server, if requirements are met.
+	 * DN by the Nextcloud server, if requirements are met.
 	 *
 	 * @constructor
 	 */
diff --git a/apps/user_ldap/js/wizard/wizardDetectorFilterGroup.js b/apps/user_ldap/js/wizard/wizardDetectorFilterGroup.js
index cca889839e4..f56550a919e 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorFilterGroup.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorFilterGroup.js
@@ -11,7 +11,7 @@ OCA = OCA || {};
 
 	/**
 	 * @classdesc a Port Detector. It executes the auto-detection of the port
-	 * by the ownCloud server, if requirements are met.
+	 * by the Nextcloud server, if requirements are met.
 	 *
 	 * @constructor
 	 */
diff --git a/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js b/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js
index e796b81e0eb..7012847193b 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js
@@ -11,7 +11,7 @@ OCA = OCA || {};
 
 	/**
 	 * @classdesc a Port Detector. It executes the auto-detection of the port
-	 * by the ownCloud server, if requirements are met.
+	 * by the Nextcloud server, if requirements are met.
 	 *
 	 * @constructor
 	 */
diff --git a/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js b/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js
index d34e244a1f5..3cd2935bd87 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js
@@ -11,7 +11,7 @@ OCA = OCA || {};
 
 	/**
 	 * @classdesc a Port Detector. It executes the auto-detection of the port
-	 * by the ownCloud server, if requirements are met.
+	 * by the Nextcloud server, if requirements are met.
 	 *
 	 * @constructor
 	 */
diff --git a/apps/user_ldap/js/wizard/wizardDetectorGeneric.js b/apps/user_ldap/js/wizard/wizardDetectorGeneric.js
index fd80018943e..2126828c197 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorGeneric.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorGeneric.js
@@ -90,7 +90,7 @@ OCA = OCA || {};
 		},
 
 		/**
-		 * processes the result of the ownCloud server
+		 * processes the result of the Nextcloud server
 		 *
 		 * @param {OCA.LDAP.Wizard.ConfigModel} model
 		 * @param {WizardDetectorGeneric} detector
diff --git a/apps/user_ldap/js/wizard/wizardDetectorGroupCount.js b/apps/user_ldap/js/wizard/wizardDetectorGroupCount.js
index 12d7df7514b..d2f3dd978c5 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorGroupCount.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorGroupCount.js
@@ -11,7 +11,7 @@ OCA = OCA || {};
 
 	/**
 	 * @classdesc a Port Detector. It executes the auto-detection of the port
-	 * by the ownCloud server, if requirements are met.
+	 * by the Nextcloud server, if requirements are met.
 	 *
 	 * @constructor
 	 */
diff --git a/apps/user_ldap/js/wizard/wizardDetectorPort.js b/apps/user_ldap/js/wizard/wizardDetectorPort.js
index ba075189667..50b1a1b4746 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorPort.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorPort.js
@@ -11,7 +11,7 @@ OCA = OCA || {};
 
 	/**
 	 * @classdesc a Port Detector. It executes the auto-detection of the port
-	 * by the ownCloud server, if requirements are met.
+	 * by the Nextcloud server, if requirements are met.
 	 *
 	 * @constructor
 	 */
diff --git a/apps/user_ldap/js/wizard/wizardDetectorSimpleRequestAbstract.js b/apps/user_ldap/js/wizard/wizardDetectorSimpleRequestAbstract.js
index 37e41f42a64..8a1da617aa0 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorSimpleRequestAbstract.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorSimpleRequestAbstract.js
@@ -11,7 +11,7 @@ OCA = OCA || {};
 
 	/**
 	 * @classdesc a Port Detector. It executes the auto-detection of the port
-	 * by the ownCloud server, if requirements are met.
+	 * by the Nextcloud server, if requirements are met.
 	 *
 	 * @constructor
 	 */
diff --git a/apps/user_ldap/js/wizard/wizardDetectorTestAbstract.js b/apps/user_ldap/js/wizard/wizardDetectorTestAbstract.js
index df0b0a2200a..e371dbf0f63 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorTestAbstract.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorTestAbstract.js
@@ -11,7 +11,7 @@ OCA = OCA || {};
 
 	/**
 	 * @classdesc a Port Detector. It executes the auto-detection of the port
-	 * by the ownCloud server, if requirements are met.
+	 * by the Nextcloud server, if requirements are met.
 	 *
 	 * @constructor
 	 */
diff --git a/apps/user_ldap/js/wizard/wizardDetectorTestConfiguration.js b/apps/user_ldap/js/wizard/wizardDetectorTestConfiguration.js
index 1308c182909..aed99539384 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorTestConfiguration.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorTestConfiguration.js
@@ -11,7 +11,7 @@ OCA = OCA || {};
 
 	/**
 	 * @classdesc a Port Detector. It executes the auto-detection of the port
-	 * by the ownCloud server, if requirements are met.
+	 * by the Nextcloud server, if requirements are met.
 	 *
 	 * @constructor
 	 */
diff --git a/apps/user_ldap/js/wizard/wizardTabAdvanced.js b/apps/user_ldap/js/wizard/wizardTabAdvanced.js
index d0922bbff32..7d8d0b70269 100644
--- a/apps/user_ldap/js/wizard/wizardTabAdvanced.js
+++ b/apps/user_ldap/js/wizard/wizardTabAdvanced.js
@@ -332,7 +332,7 @@ OCA = OCA || {};
 		},
 
 		/**
-		 * sets the attribute for the ownCloud user specific home folder location
+		 * sets the attribute for the Nextcloud user specific home folder location
 		 *
 		 * @param {string} attribute
 		 */
diff --git a/apps/user_ldap/js/wizard/wizardTabExpert.js b/apps/user_ldap/js/wizard/wizardTabExpert.js
index 7cfd49ba0f6..634d30212ac 100644
--- a/apps/user_ldap/js/wizard/wizardTabExpert.js
+++ b/apps/user_ldap/js/wizard/wizardTabExpert.js
@@ -65,7 +65,7 @@ OCA = OCA || {};
 		},
 
 		/**
-		 * sets the attribute to be used to create an ownCloud ID (username)
+		 * sets the attribute to be used to create an Nextcloud ID (username)
 		 *
 		 * @param {string} attribute
 		 */
diff --git a/apps/user_ldap/js/wizard/wizardTabGeneric.js b/apps/user_ldap/js/wizard/wizardTabGeneric.js
index 4415172a18c..98e26d303b5 100644
--- a/apps/user_ldap/js/wizard/wizardTabGeneric.js
+++ b/apps/user_ldap/js/wizard/wizardTabGeneric.js
@@ -73,7 +73,7 @@ OCA = OCA || {};
 
 		/**
 		 * the method can be used to display a different error/information
-		 * message than provided by the ownCloud server response. The concrete
+		 * message than provided by the Nextcloud server response. The concrete
 		 * Tab View may optionally implement it. Returning an empty string will
 		 * avoid any notification.
 		 *
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index ff95d96ebdb..dbc4f5b0448 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -407,8 +407,8 @@ class Access extends LDAPUtility implements IUserTools {
 	}
 
 	/**
-	 * returns the LDAP DN for the given internal ownCloud name of the group
-	 * @param string $name the ownCloud name in question
+	 * returns the LDAP DN for the given internal Nextcloud name of the group
+	 * @param string $name the Nextcloud name in question
 	 * @return string|false LDAP DN on success, otherwise false
 	 */
 	public function groupname2dn($name) {
@@ -416,8 +416,8 @@ class Access extends LDAPUtility implements IUserTools {
 	}
 
 	/**
-	 * returns the LDAP DN for the given internal ownCloud name of the user
-	 * @param string $name the ownCloud name in question
+	 * returns the LDAP DN for the given internal Nextcloud name of the user
+	 * @param string $name the Nextcloud name in question
 	 * @return string|false with the LDAP DN on success, otherwise false
 	 */
 	public function username2dn($name) {
@@ -433,10 +433,10 @@ class Access extends LDAPUtility implements IUserTools {
 	}
 
 	/**
-	 * returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
+	 * returns the internal Nextcloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
 	 * @param string $fdn the dn of the group object
 	 * @param string $ldapName optional, the display name of the object
-	 * @return string|false with the name to use in ownCloud, false on DN outside of search DN
+	 * @return string|false with the name to use in Nextcloud, false on DN outside of search DN
 	 */
 	public function dn2groupname($fdn, $ldapName = null) {
 		//To avoid bypassing the base DN settings under certain circumstances
@@ -489,10 +489,10 @@ class Access extends LDAPUtility implements IUserTools {
 	}
 
 	/**
-	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
+	 * returns the internal Nextcloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
 	 * @param string $dn the dn of the user object
 	 * @param string $ldapName optional, the display name of the object
-	 * @return string|false with with the name to use in ownCloud
+	 * @return string|false with with the name to use in Nextcloud
 	 */
 	public function dn2username($fdn, $ldapName = null) {
 		//To avoid bypassing the base DN settings under certain circumstances
@@ -506,11 +506,11 @@ class Access extends LDAPUtility implements IUserTools {
 	}
 
 	/**
-	 * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN
+	 * returns an internal Nextcloud name for the given LDAP DN, false on DN outside of search DN
 	 * @param string $dn the dn of the user object
 	 * @param string $ldapName optional, the display name of the object
 	 * @param bool $isUser optional, whether it is a user object (otherwise group assumed)
-	 * @return string|false with with the name to use in ownCloud
+	 * @return string|false with with the name to use in Nextcloud
 	 */
 	public function dn2ocname($fdn, $ldapName = null, $isUser = true) {
 		if($isUser) {
@@ -521,7 +521,7 @@ class Access extends LDAPUtility implements IUserTools {
 			$nameAttribute = $this->connection->ldapGroupDisplayName;
 		}
 
-		//let's try to retrieve the ownCloud name from the mappings table
+		//let's try to retrieve the Nextcloud name from the mappings table
 		$ocName = $mapper->getNameByDN($fdn);
 		if(is_string($ocName)) {
 			return $ocName;
@@ -591,7 +591,7 @@ class Access extends LDAPUtility implements IUserTools {
 	/**
 	 * gives back the user names as they are used ownClod internally
 	 * @param array $ldapUsers as returned by fetchList()
-	 * @return array an array with the user names to use in ownCloud
+	 * @return array an array with the user names to use in Nextcloud
 	 *
 	 * gives back the user names as they are used ownClod internally
 	 */
@@ -602,7 +602,7 @@ class Access extends LDAPUtility implements IUserTools {
 	/**
 	 * gives back the group names as they are used ownClod internally
 	 * @param array $ldapGroups as returned by fetchList()
-	 * @return array an array with the group names to use in ownCloud
+	 * @return array an array with the group names to use in Nextcloud
 	 *
 	 * gives back the group names as they are used ownClod internally
 	 */
@@ -649,12 +649,12 @@ class Access extends LDAPUtility implements IUserTools {
 				}
 			}
 		}
-		return $ownCloudNames;
+		return $NextcloudNames;
 	}
 
 	/**
 	 * caches the user display name
-	 * @param string $ocName the internal ownCloud username
+	 * @param string $ocName the internal Nextcloud username
 	 * @param string|false $home the home directory path
 	 */
 	public function cacheUserHome($ocName, $home) {
@@ -664,7 +664,7 @@ class Access extends LDAPUtility implements IUserTools {
 
 	/**
 	 * caches a user as existing
-	 * @param string $ocName the internal ownCloud username
+	 * @param string $ocName the internal Nextcloud username
 	 */
 	public function cacheUserExists($ocName) {
 		$this->connection->writeToCache('userExists'.$ocName, true);
@@ -672,7 +672,7 @@ class Access extends LDAPUtility implements IUserTools {
 
 	/**
 	 * caches the user display name
-	 * @param string $ocName the internal ownCloud username
+	 * @param string $ocName the internal Nextcloud username
 	 * @param string $displayName the display name
 	 * @param string $displayName2 the second display name
 	 */
@@ -687,9 +687,9 @@ class Access extends LDAPUtility implements IUserTools {
 	}
 
 	/**
-	 * creates a unique name for internal ownCloud use for users. Don't call it directly.
+	 * creates a unique name for internal Nextcloud use for users. Don't call it directly.
 	 * @param string $name the display name of the object
-	 * @return string|false with with the name to use in ownCloud or false if unsuccessful
+	 * @return string|false with with the name to use in Nextcloud or false if unsuccessful
 	 *
 	 * Instead of using this method directly, call
 	 * createAltInternalOwnCloudName($name, true)
@@ -709,9 +709,9 @@ class Access extends LDAPUtility implements IUserTools {
 	}
 
 	/**
-	 * creates a unique name for internal ownCloud use for groups. Don't call it directly.
+	 * creates a unique name for internal Nextcloud use for groups. Don't call it directly.
 	 * @param string $name the display name of the object
-	 * @return string|false with with the name to use in ownCloud or false if unsuccessful.
+	 * @return string|false with with the name to use in Nextcloud or false if unsuccessful.
 	 *
 	 * Instead of using this method directly, call
 	 * createAltInternalOwnCloudName($name, false)
@@ -747,10 +747,10 @@ class Access extends LDAPUtility implements IUserTools {
 	}
 
 	/**
-	 * creates a unique name for internal ownCloud use.
+	 * creates a unique name for internal Nextcloud use.
 	 * @param string $name the display name of the object
 	 * @param boolean $isUser whether name should be created for a user (true) or a group (false)
-	 * @return string|false with with the name to use in ownCloud or false if unsuccessful
+	 * @return string|false with with the name to use in Nextcloud or false if unsuccessful
 	 */
 	private function createAltInternalOwnCloudName($name, $isUser) {
 		$originalTTL = $this->connection->ldapCacheTTL;
@@ -1141,7 +1141,7 @@ class Access extends LDAPUtility implements IUserTools {
 		$offset = $savedoffset;
 
 		// if we're here, probably no connection resource is returned.
-		// to make ownCloud behave nicely, we simply give back an empty array.
+		// to make Nextcloud behave nicely, we simply give back an empty array.
 		if(is_null($findings)) {
 			return array();
 		}
diff --git a/apps/user_ldap/lib/Command/CheckUser.php b/apps/user_ldap/lib/Command/CheckUser.php
index 236d2e51d0b..af2806e8cc6 100644
--- a/apps/user_ldap/lib/Command/CheckUser.php
+++ b/apps/user_ldap/lib/Command/CheckUser.php
@@ -69,7 +69,7 @@ class CheckUser extends Command {
 			->addArgument(
 					'ocName',
 					InputArgument::REQUIRED,
-					'the user name as used in ownCloud'
+					'the user name as used in Nextcloud'
 				     )
 			->addOption(
 					'force',
@@ -102,7 +102,7 @@ class CheckUser extends Command {
 
 	/**
 	 * checks whether a user is actually mapped
-	 * @param string $ocName the username as used in ownCloud
+	 * @param string $ocName the username as used in Nextcloud
 	 * @throws \Exception
 	 * @return true
 	 */
diff --git a/apps/user_ldap/lib/Command/ShowRemnants.php b/apps/user_ldap/lib/Command/ShowRemnants.php
index 0e6aea6a5ab..365c8967ee0 100644
--- a/apps/user_ldap/lib/Command/ShowRemnants.php
+++ b/apps/user_ldap/lib/Command/ShowRemnants.php
@@ -54,7 +54,7 @@ class ShowRemnants extends Command {
 	protected function configure() {
 		$this
 			->setName('ldap:show-remnants')
-			->setDescription('shows which users are not available on LDAP anymore, but have remnants in ownCloud.')
+			->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.')
 			->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.');
 	}
 
@@ -67,7 +67,7 @@ class ShowRemnants extends Command {
 		/** @var \Symfony\Component\Console\Helper\Table $table */
 		$table = new Table($output);
 		$table->setHeaders(array(
-			'ownCloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
+			'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
 			'Dir', 'Sharer'));
 		$rows = array();
 		$resultSet = $this->dui->getUsers();
diff --git a/apps/user_ldap/lib/FilesystemHelper.php b/apps/user_ldap/lib/FilesystemHelper.php
index 689fcfeda7e..e5b0a9ecef3 100644
--- a/apps/user_ldap/lib/FilesystemHelper.php
+++ b/apps/user_ldap/lib/FilesystemHelper.php
@@ -25,7 +25,7 @@
 namespace OCA\User_LDAP;
 
 /**
- * @brief wraps around static ownCloud core methods
+ * @brief wraps around static Nextcloud core methods
  */
 class FilesystemHelper {
 
@@ -39,7 +39,7 @@ class FilesystemHelper {
 
 	/**
 	 * @brief initializes the filesystem for the given user
-	 * @param string $uid the ownCloud username of the user
+	 * @param string $uid the Nextcloud username of the user
 	 */
 	public function setup($uid) {
 		\OC_Util::setupFS($uid);
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php
index fb9920d3cc2..f1ea831e485 100644
--- a/apps/user_ldap/lib/Group_LDAP.php
+++ b/apps/user_ldap/lib/Group_LDAP.php
@@ -267,7 +267,7 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * translates a primary group ID into an ownCloud internal name
+	 * translates a primary group ID into an Nextcloud internal name
 	 * @param string $gid as given by primaryGroupID on AD
 	 * @param string $dn a DN that belongs to the same domain as the group
 	 * @return string|bool
@@ -296,7 +296,7 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		$dn = $result[0]['dn'][0];
 
 		//and now the group name
-		//NOTE once we have separate ownCloud group IDs and group names we can
+		//NOTE once we have separate Nextcloud group IDs and group names we can
 		//directly read the display name attribute instead of the DN
 		$name = $this->access->dn2groupname($dn);
 
diff --git a/apps/user_ldap/lib/ILDAPWrapper.php b/apps/user_ldap/lib/ILDAPWrapper.php
index e2089fa8a47..4034d0baea4 100644
--- a/apps/user_ldap/lib/ILDAPWrapper.php
+++ b/apps/user_ldap/lib/ILDAPWrapper.php
@@ -196,7 +196,7 @@ interface ILDAPWrapper {
 	 */
 	public function unbind($link);
 
-	//additional required methods in ownCloud
+	//additional required methods in Nextcloud
 
 	/**
 	 * Checks whether the server supports LDAP
diff --git a/apps/user_ldap/lib/LogWrapper.php b/apps/user_ldap/lib/LogWrapper.php
index dd05b58666d..af5323565f8 100644
--- a/apps/user_ldap/lib/LogWrapper.php
+++ b/apps/user_ldap/lib/LogWrapper.php
@@ -25,7 +25,7 @@
 namespace OCA\User_LDAP;
 
 /**
- * @brief wraps around static ownCloud core methods
+ * @brief wraps around static Nextcloud core methods
  */
 class LogWrapper {
 	protected $app = 'user_ldap';
diff --git a/apps/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php
index 1a9138176b0..18430a90cc7 100644
--- a/apps/user_ldap/lib/User/Manager.php
+++ b/apps/user_ldap/lib/User/Manager.php
@@ -175,7 +175,7 @@ class Manager {
 
 	/**
 	 * Checks whether the specified user is marked as deleted
-	 * @param string $id the ownCloud user name
+	 * @param string $id the Nextcloud user name
 	 * @return bool
 	 */
 	public function isDeletedUser($id) {
@@ -198,7 +198,7 @@ class Manager {
 	}
 
 	/**
-	 * @brief returns a User object by it's ownCloud username
+	 * @brief returns a User object by it's Nextcloud username
 	 * @param string $id the DN or username of the user
 	 * @return \OCA\User_LDAP\User\User|\OCA\User_LDAP\User\OfflineUser|null
 	 */
@@ -215,7 +215,7 @@ class Manager {
 	}
 
 	/**
-	 * @brief returns a User object by it's DN or ownCloud username
+	 * @brief returns a User object by it's DN or Nextcloud username
 	 * @param string $id the DN or username of the user
 	 * @return \OCA\User_LDAP\User\User|\OCA\User_LDAP\User\OfflineUser|null
 	 * @throws \Exception when connection could not be established
diff --git a/apps/user_ldap/lib/User/OfflineUser.php b/apps/user_ldap/lib/User/OfflineUser.php
index 4ee3bd09911..0e60a29514e 100644
--- a/apps/user_ldap/lib/User/OfflineUser.php
+++ b/apps/user_ldap/lib/User/OfflineUser.php
@@ -112,7 +112,7 @@ class OfflineUser {
 	}
 
 	/**
-	 * getter for ownCloud internal name
+	 * getter for Nextcloud internal name
 	 * @return string
 	 */
 	public function getOCName() {
diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
index 5d4af1fd09c..4419c4983d4 100644
--- a/apps/user_ldap/lib/User/User.php
+++ b/apps/user_ldap/lib/User/User.php
@@ -251,7 +251,7 @@ class User {
 	}
 
 	/**
-	 * @brief returns the ownCloud internal username of the user
+	 * @brief returns the Nextcloud internal username of the user
 	 * @return string
 	 */
 	public function getUsername() {
@@ -429,7 +429,7 @@ class User {
 	}
 
 	/**
-	 * fetches the email from LDAP and stores it as ownCloud user value
+	 * fetches the email from LDAP and stores it as Nextcloud user value
 	 * @param string $valueFromLDAP if known, to save an LDAP read request
 	 * @return null
 	 */
@@ -462,7 +462,7 @@ class User {
 	 * Overall process goes as follow:
 	 * 1. fetch the quota from LDAP and check if it's parseable with the "verifyQuotaValue" function
 	 * 2. if the value can't be fetched, is empty or not parseable, use the default LDAP quota
-	 * 3. if the default LDAP quota can't be parsed, use the ownCloud's default quota (use 'default')
+	 * 3. if the default LDAP quota can't be parsed, use the Nextcloud's default quota (use 'default')
 	 * 4. check if the target user exists and set the quota for the user.
 	 *
 	 * In order to improve performance and prevent an unwanted extra LDAP call, the $valueFromLDAP
@@ -470,10 +470,10 @@ class User {
 	 * quota for the user coming from the LDAP server (step 1 of the process) It can be useful to
 	 * fetch all the user's attributes in one call and use the fetched values in this function.
 	 * The expected value for that parameter is a string describing the quota for the user. Valid
-	 * values are 'none' (unlimited), 'default' (the ownCloud's default quota), '1234' (quota in
+	 * values are 'none' (unlimited), 'default' (the Nextcloud's default quota), '1234' (quota in
 	 * bytes), '1234 MB' (quota in MB - check the \OC_Helper::computerFileSize method for more info)
 	 *
-	 * fetches the quota from LDAP and stores it as ownCloud user value
+	 * fetches the quota from LDAP and stores it as Nextcloud user value
 	 * @param string $valueFromLDAP the quota attribute's value can be passed,
 	 * to save the readAttribute request
 	 * @return null
@@ -541,7 +541,7 @@ class User {
 	}
 
 	/**
-	 * @brief attempts to get an image from LDAP and sets it as ownCloud avatar
+	 * @brief attempts to get an image from LDAP and sets it as Nextcloud avatar
 	 * @return null
 	 */
 	public function updateAvatar() {
@@ -558,7 +558,7 @@ class User {
 	}
 
 	/**
-	 * @brief sets an image as ownCloud avatar
+	 * @brief sets an image as Nextcloud avatar
 	 * @return null
 	 */
 	private function setOwnCloudAvatar() {
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index cfd2450a122..44de3f5da40 100644
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -60,8 +60,8 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 	}
 
 	/**
-	 * checks whether the user is allowed to change his avatar in ownCloud
-	 * @param string $uid the ownCloud user name
+	 * checks whether the user is allowed to change his avatar in Nextcloud
+	 * @param string $uid the Nextcloud user name
 	 * @return boolean either the user can or cannot
 	 */
 	public function canChangeAvatar($uid) {
@@ -244,7 +244,7 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 	/**
 	 * checks whether a user is still available on LDAP
 	 *
-	 * @param string|\OCA\User_LDAP\User\User $user either the ownCloud user
+	 * @param string|\OCA\User_LDAP\User\User $user either the Nextcloud user
 	 * name or an instance of that user
 	 * @return bool
 	 * @throws \Exception
diff --git a/apps/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php
index 2cdf401880e..6417841f245 100644
--- a/apps/user_ldap/lib/User_Proxy.php
+++ b/apps/user_ldap/lib/User_Proxy.php
@@ -163,7 +163,7 @@ class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface,
 
 	/**
 	 * check if a user exists on LDAP
-	 * @param string|\OCA\User_LDAP\User\User $user either the ownCloud user
+	 * @param string|\OCA\User_LDAP\User\User $user either the Nextcloud user
 	 * name or an instance of that user
 	 * @return boolean
 	 */
@@ -225,8 +225,8 @@ class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface,
 	}
 
 	/**
-	 * checks whether the user is allowed to change his avatar in ownCloud
-	 * @param string $uid the ownCloud user name
+	 * checks whether the user is allowed to change his avatar in Nextcloud
+	 * @param string $uid the Nextcloud user name
 	 * @return boolean either the user can or cannot
 	 */
 	public function canChangeAvatar($uid) {
diff --git a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php
index 918dad6d5d0..0dc80e87238 100644
--- a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php
+++ b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php
@@ -87,7 +87,7 @@ class ExceptionOnLostConnection {
 	}
 
 	/**
-	 * prepares everything for the test run. Includes loading ownCloud and
+	 * prepares everything for the test run. Includes loading Nextcloud and
 	 * the LDAP backend, as well as getting information about toxiproxy.
 	 * Also creates an instance of the LDAP class, the testee
 	 *
diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php
index 2200ac327a1..9db4cafea41 100644
--- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php
+++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php
@@ -79,7 +79,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
 
 	/**
 	 * homeDirectory on LDAP is empty. Return values of getHome should be
-	 * identical to user name, following ownCloud default.
+	 * identical to user name, following Nextcloud default.
 	 *
 	 * @return bool
 	 */
@@ -135,7 +135,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
 
 	/**
 	 * homeDirectory on LDAP is set to "attr:" which is effectively empty.
-	 * Return values of getHome should be ownCloud default.
+	 * Return values of getHome should be Nextcloud default.
 	 *
 	 * @return bool
 	 */