diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php
index 6e15f9afbc..ccf5c0685c 100644
--- a/core/Command/Db/ConvertType.php
+++ b/core/Command/Db/ConvertType.php
@@ -61,7 +61,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 Nextcloud database to the newly configured one')
 			->addArgument(
 				'type',
 				InputArgument::REQUIRED,
diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php
index 952034fd22..5ba366345b 100644
--- a/core/Command/Upgrade.php
+++ b/core/Command/Upgrade.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @copyright Copyright (c) 2016, Nextcloud, Inc.
  *
  * @author Andreas Fischer <bantu@owncloud.com>
  * @author Björn Schießle <bjoern@schiessle.org>
@@ -299,8 +299,8 @@ class Upgrade extends Command {
 
 			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 core 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/nextcloud.log). If you want to re-run the '
 				. 'upgrade procedure, remove the "maintenance mode" from '
@@ -308,7 +308,7 @@ class Upgrade extends Command {
 				, 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;
 		}
 	}