From 8abf6e0ed1c50c1ace8e83bd5940ae7156726ba4 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 20 Jun 2016 18:50:56 +0200
Subject: fixed code

---
 apps/dav/appinfo/info.xml                                  |  2 +-
 apps/encryption/lib/keymanager.php                         |  2 +-
 apps/federatedfilesharing/appinfo/info.xml                 |  2 +-
 apps/files_external/appinfo/info.xml                       |  2 +-
 apps/files_sharing/appinfo/info.xml                        |  4 ++--
 apps/files_sharing/templates/public.php                    |  2 +-
 apps/provisioning_api/appinfo/info.xml                     |  6 +++---
 apps/updatenotification/appinfo/info.xml                   |  2 +-
 apps/user_ldap/appinfo/info.xml                            |  4 ++--
 console.php                                                |  8 ++++----
 core/command/app/checkcode.php                             |  4 ++--
 core/command/db/converttype.php                            |  2 +-
 core/command/encryption/changekeystorageroot.php           |  2 +-
 core/command/encryption/decryptall.php                     |  2 +-
 core/command/encryption/encryptall.php                     |  2 +-
 core/command/maintenance/install.php                       |  2 +-
 core/command/upgrade.php                                   |  6 +++---
 core/controller/setupcontroller.php                        |  2 +-
 core/js/setupchecks.js                                     |  2 +-
 core/js/tests/specs/setupchecksSpec.js                     |  2 +-
 core/skeleton/welcome.txt                                  |  2 +-
 core/templates/singleuser.user.php                         |  2 +-
 index.php                                                  |  2 +-
 lib/base.php                                               | 10 +++++-----
 lib/private/console/application.php                        |  6 +++---
 tests/core/command/encryption/changekeystorageroottest.php |  2 +-
 26 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index 4ed401e5c5b..cda97887d30 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>dav</id>
 	<name>WebDAV</name>
-	<description>ownCloud WebDAV endpoint</description>
+	<description>WebDAV endpoint</description>
 	<licence>AGPL</licence>
 	<author>owncloud.org</author>
 	<version>0.1.6</version>
diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php
index 6720d19fe1b..fca10f67350 100644
--- a/apps/encryption/lib/keymanager.php
+++ b/apps/encryption/lib/keymanager.php
@@ -669,7 +669,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 instance');
 		}
 
 		return $password;
diff --git a/apps/federatedfilesharing/appinfo/info.xml b/apps/federatedfilesharing/appinfo/info.xml
index d88ea2640e1..9d32db547a0 100644
--- a/apps/federatedfilesharing/appinfo/info.xml
+++ b/apps/federatedfilesharing/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
     <id>federatedfilesharing</id>
     <name>Federated File Sharing</name>
-    <description>Provide federated file sharing across ownCloud servers</description>
+    <description>Provide federated file sharing across Nextcloud servers</description>
     <licence>AGPL</licence>
     <author>Bjoern Schiessle, Roeland Jago Douma</author>
     <version>0.1.0</version>
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 1cd4f602075..6b794e1a4a3 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 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 directory, which they can access and use like any other 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_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 29ae15e4722..f39a861f213 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -3,8 +3,8 @@
 	<id>files_sharing</id>
 	<name>Share Files</name>
 	<description>
-		This application enables users to share files within ownCloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within ownCloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of ownCloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.
-Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the ownCloud Documentation.
+		This application enables users to share files. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of the instance. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.
+Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the documentation.
 
 	</description>
 	<licence>AGPL</licence>
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index ea200916edb..ffd6b7b615d 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -84,7 +84,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 						?>
 						<span id="save" data-protected="<?php p($_['protected']) ?>"
 							  data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>">
-						<button id="save-button"><?php p($l->t('Add to your ownCloud')) ?></button>
+						<button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button>
 						<form class="save-form hidden" action="#">
 							<input type="text" id="remote_address" placeholder="example.com/owncloud"/>
 							<button id="save-button-confirm" class="icon-confirm svg" disabled></button>
diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml
index e75f032008c..d5f3fabf7ce 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/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml
index 2991829e19b..033d2994e16 100644
--- a/apps/updatenotification/appinfo/info.xml
+++ b/apps/updatenotification/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>updatenotification</id>
 	<name>Update notification</name>
-	<description>Displays update notifications for ownCloud and provides the SSO for the updater.</description>
+	<description>Displays update notifications for Nextcloud and provides the SSO for the updater.</description>
 	<licence>AGPL</licence>
 	<author>Lukas Reschke</author>
 	<version>0.1.0</version>
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 864eaebe4d0..50fe67c1b87 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -2,9 +2,9 @@
 <info>
 	<id>user_ldap</id>
 	<name>LDAP user and group backend</name>
-	<description>This application enables administrators to connect ownCloud to an LDAP-based user directory for authentication and provisioning users, groups and user attributes. Admins can configure this application to connect to one or more LDAP directories or Active Directories via an LDAP interface. Attributes such as user quota, email, avatar pictures, group memberships and more can be pulled into ownCloud from a directory with the appropriate queries and filters.
+	<description>This application enables administrators to connect Nextcloud to an LDAP-based user directory for authentication and provisioning users, groups and user attributes. Admins can configure this application to connect to one or more LDAP directories or Active Directories via an LDAP interface. Attributes such as user quota, email, avatar pictures, group memberships and more can be pulled into Nextcloud from a directory with the appropriate queries and filters.
 
-A user logs into ownCloud with their LDAP or AD credentials, and is granted access based on an authentication request handled by the LDAP or AD server. ownCloud does not store LDAP or AD passwords, rather these credentials are used to authenticate a user and then ownCloud uses a session for the user ID. More information is available in the LDAP User and Group Backend documentation.
+A user logs into Nextcloud with their LDAP or AD credentials, and is granted access based on an authentication request handled by the LDAP or AD server. Nextcloud does not store LDAP or AD passwords, rather these credentials are used to authenticate a user and then Nextcloud uses a session for the user ID. More information is available in the LDAP User and Group Backend documentation.
 
 	</description>
 	<licence>AGPL</licence>
diff --git a/console.php b/console.php
index fc571b03f1e..af395536f79 100644
--- a/console.php
+++ b/console.php
@@ -37,7 +37,7 @@ define('OC_CONSOLE', 1);
 // Show warning if a PHP version below 5.4.0 is used, this has to happen here
 // because base.php will already use 5.4 syntax.
 if (version_compare(PHP_VERSION, '5.4.0') === -1) {
-	echo 'This version of ownCloud requires at least PHP 5.4.0'.PHP_EOL;
+	echo 'This version of Nextcloud requires at least PHP 5.4.0'.PHP_EOL;
 	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'.PHP_EOL;
 	return;
 }
@@ -71,11 +71,11 @@ try {
 
 	$oldWorkingDir = getcwd();
 	if ($oldWorkingDir === false) {
-		echo "This script can be run from the ownCloud root directory only." . PHP_EOL;
+		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
 		echo "Can't determine current working dir - the script will continue to work but be aware of the above fact." . PHP_EOL;
 	} else if ($oldWorkingDir !== __DIR__ && !chdir(__DIR__)) {
-		echo "This script can be run from the ownCloud root directory only." . PHP_EOL;
-		echo "Can't change to ownCloud root directory." . PHP_EOL;
+		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
+		echo "Can't change to Nextcloud root directory." . PHP_EOL;
 		exit(1);
 	}
 
diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php
index 78f4390e70a..84dbb94998e 100644
--- a/core/command/app/checkcode.php
+++ b/core/command/app/checkcode.php
@@ -132,11 +132,11 @@ class CheckCode extends Command {
 			});
 
 			$infoChecker->listen('InfoChecker', 'missingRequirement', function($minMax) use ($output) {
-				$output->writeln("<comment>ownCloud $minMax version requirement missing (will be an error in ownCloud 11 and later)</comment>");
+				$output->writeln("<comment>Nextcloud $minMax version requirement missing (will be an error in the future)</comment>");
 			});
 
 			$infoChecker->listen('InfoChecker', 'duplicateRequirement', function($minMax) use ($output) {
-				$output->writeln("<error>Duplicate $minMax ownCloud version requirement found</error>");
+				$output->writeln("<error>Duplicate $minMax Nextcloud version requirement found</error>");
 			});
 
 			$infoChecker->listen('InfoChecker', 'differentVersions', function($versionFile, $infoXML) use ($output) {
diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
index 864499dcce0..bbefbe17585 100644
--- a/core/command/db/converttype.php
+++ b/core/command/db/converttype.php
@@ -60,7 +60,7 @@ class ConvertType extends Command {
 	protected function configure() {
 		$this
 			->setName('db:convert-type')
-			->setDescription('Convert the ownCloud database to the newly configured one')
+			->setDescription('Convert the database to the newly configured one')
 			->addArgument(
 				'type',
 				InputArgument::REQUIRED,
diff --git a/core/command/encryption/changekeystorageroot.php b/core/command/encryption/changekeystorageroot.php
index 801a08b42a8..3213665fc81 100644
--- a/core/command/encryption/changekeystorageroot.php
+++ b/core/command/encryption/changekeystorageroot.php
@@ -142,7 +142,7 @@ class ChangeKeyStorageRoot extends Command {
 
 		$result = $this->rootView->file_put_contents(
 			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
-			'ownCloud will detect this folder as key storage root only if this file exists'
+			'Nextcloud will detect this folder as key storage root only if this file exists'
 		);
 
 		if ($result === false) {
diff --git a/core/command/encryption/decryptall.php b/core/command/encryption/decryptall.php
index 0a126db5b17..faf5501918b 100644
--- a/core/command/encryption/decryptall.php
+++ b/core/command/encryption/decryptall.php
@@ -128,7 +128,7 @@ class DecryptAll extends Command {
 			}
 
 			$output->writeln("\n");
-			$output->writeln('You are about to start to decrypt all files stored in your ownCloud.');
+			$output->writeln('You are about to start to decrypt all files stored in your Nextcloud.');
 			$output->writeln('It will depend on the encryption module and your setup if this is possible.');
 			$output->writeln('Depending on the number and size of your files this can take some time');
 			$output->writeln('Please make sure that no user access his files during this process!');
diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
index 02f74a9dea4..1336f3c2b9f 100644
--- a/core/command/encryption/encryptall.php
+++ b/core/command/encryption/encryptall.php
@@ -108,7 +108,7 @@ class EncryptAll extends Command {
 		}
 
 		$output->writeln("\n");
-		$output->writeln('You are about to start to encrypt all files stored in your ownCloud.');
+		$output->writeln('You are about to start to encrypt all files stored in your Nextcloud.');
 		$output->writeln('It will depend on the encryption module you use which files get encrypted.');
 		$output->writeln('Depending on the number and size of your files this can take some time');
 		$output->writeln('Please make sure that no user access his files during this process!');
diff --git a/core/command/maintenance/install.php b/core/command/maintenance/install.php
index 12a61d6341a..266b50a3fea 100644
--- a/core/command/maintenance/install.php
+++ b/core/command/maintenance/install.php
@@ -46,7 +46,7 @@ class Install extends Command {
 	protected function configure() {
 		$this
 			->setName('maintenance:install')
-			->setDescription('install ownCloud')
+			->setDescription('install Nextcloud')
 			->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite')
 			->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
 			->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index a60eee9e327..562839e80b9 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -253,8 +253,8 @@ class Upgrade extends Base {
 
 			return self::ERROR_SUCCESS;
 		} else if($this->config->getSystemValue('maintenance', false)) {
-			//Possible scenario: ownCloud core is updated but an app failed
-			$output->writeln('<warning>ownCloud is in maintenance mode</warning>');
+			//Possible scenario: Nextcloud server is updated but an app failed
+			$output->writeln('<warning>Nextcloud is in maintenance mode</warning>');
 			$output->write('<comment>Maybe an upgrade is already in process. Please check the '
 				. 'logfile (data/owncloud.log). If you want to re-run the '
 				. 'upgrade procedure, remove the "maintenance mode" from '
@@ -262,7 +262,7 @@ class Upgrade extends Base {
 				, true);
 			return self::ERROR_MAINTENANCE_MODE;
 		} else {
-			$output->writeln('<info>ownCloud is already latest version</info>');
+			$output->writeln('<info>Nextcloud is already latest version</info>');
 			return self::ERROR_UP_TO_DATE;
 		}
 	}
diff --git a/core/controller/setupcontroller.php b/core/controller/setupcontroller.php
index f25c6f39a0b..48f62be80e4 100644
--- a/core/controller/setupcontroller.php
+++ b/core/controller/setupcontroller.php
@@ -105,7 +105,7 @@ class SetupController {
 
 	public function loadAutoConfig($post) {
 		if( file_exists($this->autoConfigFile)) {
-			\OCP\Util::writeLog('core', 'Autoconfig file found, setting up ownCloud…', \OCP\Util::INFO);
+			\OCP\Util::writeLog('core', 'Autoconfig file found, setting up Nextcloud…', \OCP\Util::INFO);
 			$AUTOCONFIG = array();
 			include $this->autoConfigFile;
 			$post = array_merge ($post, $AUTOCONFIG);
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 2995802ad96..72e5c529a38 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -123,7 +123,7 @@
 					}
 					if(!data.forwardedForHeadersWorking) {
 						messages.push({
-							msg: t('core', 'The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target="_blank" href="{docLink}">documentation</a>.', {docLink: data.reverseProxyDocs}),
+							msg: t('core', 'The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target="_blank" href="{docLink}">documentation</a>.', {docLink: data.reverseProxyDocs}),
 							type: OC.SetupChecks.MESSAGE_TYPE_WARNING
 						});
 					}
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index e0293d0c031..0d7bdf509bf 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -320,7 +320,7 @@ describe('OC.SetupChecks tests', function() {
 
 			async.done(function( data, s, x ){
 				expect(data).toEqual([{
-					msg: 'The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target="_blank" href="https://docs.owncloud.org/foo/bar.html">documentation</a>.',
+					msg: 'The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target="_blank" href="https://docs.owncloud.org/foo/bar.html">documentation</a>.',
 					type: OC.SetupChecks.MESSAGE_TYPE_WARNING
 				}]);
 				done();
diff --git a/core/skeleton/welcome.txt b/core/skeleton/welcome.txt
index c86eaf91bbe..52927111416 100644
--- a/core/skeleton/welcome.txt
+++ b/core/skeleton/welcome.txt
@@ -1,4 +1,4 @@
-Welcome to your ownCloud account!
+Welcome to your Nextcloud account!
 
 This is just an example file for developers and git users. 
 The packaged and released versions will come with better examples.
diff --git a/core/templates/singleuser.user.php b/core/templates/singleuser.user.php
index bf076eb8d61..ba01c9385f2 100644
--- a/core/templates/singleuser.user.php
+++ b/core/templates/singleuser.user.php
@@ -1,6 +1,6 @@
 <ul>
 	<li class='update'>
-		<?php p($l->t('This ownCloud instance is currently in single user mode.')) ?><br><br>
+		<?php p($l->t('This Nextcloud instance is currently in single user mode.')) ?><br><br>
 		<?php p($l->t('This means only administrators can use the instance.')) ?><br><br>
 		<?php p($l->t('Contact your system administrator if this message persists or appeared unexpectedly.')) ?>
 		<br><br>
diff --git a/index.php b/index.php
index f3bf699f3c1..f1ea9db3499 100644
--- a/index.php
+++ b/index.php
@@ -27,7 +27,7 @@
 // Show warning if a PHP version below 5.4.0 is used, this has to happen here
 // because base.php will already use 5.4 syntax.
 if (version_compare(PHP_VERSION, '5.4.0') === -1) {
-	echo 'This version of ownCloud requires at least PHP 5.4.0<br/>';
+	echo 'This version of Nextcloud requires at least PHP 5.4.0<br/>';
 	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
 	return;
 }
diff --git a/lib/base.php b/lib/base.php
index fd3b005b484..472bf1b9601 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -197,8 +197,8 @@ class OC {
 			}
 		}
 		if (empty(OC::$THIRDPARTYROOT) || !file_exists(OC::$THIRDPARTYROOT)) {
-			throw new \RuntimeException('3rdparty directory not found! Please put the ownCloud 3rdparty'
-				. ' folder in the ownCloud folder or the folder above.'
+			throw new \RuntimeException('3rdparty directory not found! Please put the Nextcloud 3rdparty'
+				. ' folder in the Nextcloud folder or the folder above.'
 				. ' You can also configure the location in the config.php file.');
 		}
 
@@ -223,15 +223,15 @@ class OC {
 		}
 
 		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']));
 			}
 		}
diff --git a/lib/private/console/application.php b/lib/private/console/application.php
index 7f12db4eca6..d23f41f487e 100644
--- a/lib/private/console/application.php
+++ b/lib/private/console/application.php
@@ -87,10 +87,10 @@ class Application {
 		require_once __DIR__ . '/../../../core/register_command.php';
 		if ($this->config->getSystemValue('installed', false)) {
 			if (\OCP\Util::needUpgrade()) {
-				$output->writeln("ownCloud or one of the apps require upgrade - only a limited number of commands are available");
+				$output->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available");
 				$output->writeln("You may use your browser or the occ upgrade command to do the upgrade");
 			} elseif ($this->config->getSystemValue('maintenance', false)) {
-				$output->writeln("ownCloud is in maintenance mode - no app have been loaded");
+				$output->writeln("Nextcloud is in maintenance mode - no app have been loaded");
 			} else {
 				OC_App::loadApps();
 				foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
@@ -106,7 +106,7 @@ class Application {
 				}
 			}
 		} else {
-			$output->writeln("ownCloud is not installed - only a limited number of commands are available");
+			$output->writeln("Nextcloud is not installed - only a limited number of commands are available");
 		}
 		$input = new ArgvInput();
 		if ($input->getFirstArgument() !== 'check') {
diff --git a/tests/core/command/encryption/changekeystorageroottest.php b/tests/core/command/encryption/changekeystorageroottest.php
index 6cb52cdea99..7308545d108 100644
--- a/tests/core/command/encryption/changekeystorageroottest.php
+++ b/tests/core/command/encryption/changekeystorageroottest.php
@@ -173,7 +173,7 @@ class ChangeKeyStorageRootTest extends TestCase {
 
 		$this->view->expects($this->once())->method('file_put_contents')
 			->with('newRoot/' . \OC\Encryption\Keys\Storage::KEY_STORAGE_MARKER,
-				'ownCloud will detect this folder as key storage root only if this file exists');
+				'Nextcloud will detect this folder as key storage root only if this file exists');
 
 		$this->invokePrivate($this->changeKeyStorageRoot, 'prepareNewRoot', ['newRoot']);
 	}
-- 
cgit v1.2.3