diff --git a/apps/dav/lib/connector/sabre/dummygetresponseplugin.php b/apps/dav/lib/connector/sabre/dummygetresponseplugin.php
index b10d5aaab36..0eb11bbca83 100644
--- a/apps/dav/lib/connector/sabre/dummygetresponseplugin.php
+++ b/apps/dav/lib/connector/sabre/dummygetresponseplugin.php
@@ -57,7 +57,7 @@ class DummyGetResponsePlugin extends \Sabre\DAV\ServerPlugin {
 	 */
 	function httpGet(RequestInterface $request, ResponseInterface $response) {
 		$string = 'This is the WebDAV interface. It can only be accessed by ' .
-			'WebDAV clients such as the ownCloud desktop sync client.';
+			'WebDAV clients such as the Nextcloud desktop sync client.';
 		$stream = fopen('php://memory','r+');
 		fwrite($stream, $string);
 		rewind($stream);
diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php
index 77c552ee789..b79e8be2d69 100644
--- a/apps/federation/templates/settings-admin.php
+++ b/apps/federation/templates/settings-admin.php
@@ -8,17 +8,17 @@ style('federation', 'settings-admin')
 ?>
 <div id="ocFederationSettings" class="section">
 	<h2><?php p($l->t('Federation')); ?></h2>
-	<em><?php p($l->t('ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></em>
+	<em><?php p($l->t('Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></em>
 
 	<p>
 		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
-		<label for="autoAddServers">Add server automatically once a federated share was created successfully</label>
+		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')) ?></label>
 	</p>
 
-	<h3>Trusted ownCloud Servers</h3>
+	<h3><?php p($l->t('Trusted Nextcloud Servers')) ?></h3>
 	<p id="ocFederationAddServer">
-		<button id="ocFederationAddServerButton" class="">+ Add ownCloud server</button>
-		<input id="serverUrl" class="hidden" type="text" value="" placeholder="ownCloud Server" name="server_url"/>
+		<button id="ocFederationAddServerButton" class=""><?php p($l->t('+ Add Nextcloud server')) ?></button>
+		<input id="serverUrl" class="hidden" type="text" value="" placeholder="Nextcloud Server" name="server_url"/>
 		<span class="msg"></span>
 	</p>
 	<ul id="listOfTrustedServers">
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index ae00b01dca2..b9235b7ebcc 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -73,7 +73,7 @@ $thumbSize = 1024;
 					?>
 					<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/settings/js/apps.js b/settings/js/apps.js
index e6631762fd4..18c2ffd2f67 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -119,7 +119,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					$('#apps-list-empty').removeClass('hidden').find('h2').text(t('settings', 'No apps found for your version'));
 				}
 
-				$('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use.')});
+				$('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use.')});
 				$('.app-level .approved').tipsy({fallback: t('settings', 'Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.')});
 				$('.app-level .experimental').tipsy({fallback: t('settings', 'This app is not checked for security issues and is new or known to be unstable. Install at your own risk.')});
 			},
diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php
index c88c90f6b6b..5a16e5750b6 100644
--- a/settings/templates/settings.development.notice.php
+++ b/settings/templates/settings.development.notice.php
@@ -8,12 +8,12 @@
 				'{linkclose}',
 			],
 			[
-				'<a href="https://owncloud.org/contact" target="_blank" rel="noreferrer">',
-				'<a href="https://github.com/owncloud" target="_blank" rel="noreferrer">',
+				'<a href="https://nextcloud.com/contact" target="_blank" rel="noreferrer">',
+				'<a href="https://github.com/nextcloud" target="_blank" rel="noreferrer">',
 				'<a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank" rel="noreferrer">',
 				'</a>',
 			],
-			$l->t('Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title="Affero General Public License">AGPL</abbr>{linkclose}.')
+			$l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title="Affero General Public License">AGPL</abbr>{linkclose}.')
 		)); ?>
 	</p>
 <?php endif; ?>