diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index e1a816e7fee..32e4f3d3dd6 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -36,7 +36,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 
 <header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
 		<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
-		   title="" id="owncloud">
+		   title="" id="nextcloud">
 			<div class="logo-icon svg">
 			</div>
 		</a>
diff --git a/core/css/header.css b/core/css/header.css
index 19ecf77bcd3..f81a71070f0 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -46,7 +46,7 @@
 
 /* LOGO and APP NAME -------------------------------------------------------- */
 
-#owncloud {
+#nextcloud {
 	position: absolute;
 	top: 0;
 	left: 0;
@@ -57,12 +57,12 @@
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	opacity: 1;
 }
-#owncloud:focus {
+#nextcloud:focus {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=75)";
 	opacity: .75;
 }
-#owncloud:hover,
-#owncloud:active {
+#nextcloud:hover,
+#nextcloud:active {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	opacity: 1;
 }
diff --git a/core/js/js.js b/core/js/js.js
index 714529fe5d1..b8535518f02 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -69,8 +69,8 @@ var OCP = {},
 	TAG_FAVORITE: '_$!<Favorite>!$_',
 	/* jshint camelcase: false */
 	/**
-	 * Relative path to ownCloud root.
-	 * For example: "/owncloud"
+	 * Relative path to Nextcloud root.
+	 * For example: "/nextcloud"
 	 *
 	 * @type string
 	 *
@@ -240,7 +240,7 @@ var OCP = {},
 	},
 
 	/**
-	 * Protocol that is used to access this ownCloud instance
+	 * Protocol that is used to access this Nextcloud instance
 	 * @return {string} Used protocol
 	 */
 	getProtocol: function() {
@@ -248,7 +248,7 @@ var OCP = {},
 	},
 
 	/**
-	 * Returns the host used to access this ownCloud instance
+	 * Returns the host used to access this Nextcloud instance
 	 * Host is sometimes the same as the hostname but now always.
 	 *
 	 * Examples:
@@ -265,7 +265,7 @@ var OCP = {},
 	},
 
 	/**
-	 * Returns the hostname used to access this ownCloud instance
+	 * Returns the hostname used to access this Nextcloud instance
 	 * The hostname is always stripped of the port
 	 *
 	 * @return {string} hostname
@@ -276,7 +276,7 @@ var OCP = {},
 	},
 
 	/**
-	 * Returns the port number used to access this ownCloud instance
+	 * Returns the port number used to access this Nextcloud instance
 	 *
 	 * @return {int} port number
 	 *
@@ -287,9 +287,9 @@ var OCP = {},
 	},
 
 	/**
-	 * Returns the web root path where this ownCloud instance
+	 * Returns the web root path where this Nextcloud instance
 	 * is accessible, with a leading slash.
-	 * For example "/owncloud".
+	 * For example "/nextcloud".
 	 *
 	 * @return {string} web root path
 	 *
@@ -1404,7 +1404,7 @@ function initCore() {
 	// move triangle of apps dropdown to align with app name triangle
 	// 2 is the additional offset between the triangles
 	if($('#navigation').length) {
-		$('#header #owncloud + .menutoggle').one('click', function(){
+		$('#header #nextcloud + .menutoggle').one('click', function(){
 			var caretPosition = $('.header-appname + .icon-caret').offset().left - 2;
 			if(caretPosition > 255) {
 				// if the app name is longer than the menu, just put the triangle in the middle
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 1d0ac5fa146..2db333c1977 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -43,7 +43,7 @@
 	</div>
 	<header role="banner"><div id="header">
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
-				id="owncloud" tabindex="1">
+				id="nextcloud" tabindex="1">
 				<div class="logo-icon">
 					<h1 class="hidden-visually">
 						<?php p($theme->getName()); ?>