diff --git a/README.md b/README.md
index 7b78015..0e6a28f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ownCloud SMS
+# Phone Sync (for NextCloud & ownCloud)
 
 ownCloud SMS provides a webinterface to display your SMS conversations. SMS conversations are pushed by your Android devices using the [Android client](https://github.com/nerzhul/ownCloud-SMS-App), available on [Google Play Store](https://play.google.com/store/apps/details?id=fr.unix_experience.owncloud_sms).
 
@@ -25,4 +25,4 @@ The app is available in both, [Nextcloud appstore](https://apps.nextcloud.com/ap
 - **Client:** https://github.com/nerzhul/ownCloud-SMS-App/issues
 
 ## :notebook: License
-ownCloud SMS (ocsms) web application is currently licensed under [AGPL license](https://github.com/nerzhul/ocsms/blob/master/LICENSE.md).
+Phone Sync web application is currently licensed under [AGPL license](https://github.com/nerzhul/ocsms/blob/master/LICENSE.md).
diff --git a/appinfo/app.php b/appinfo/app.php
index ae5d3da..4377fe7 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 namespace OCA\OcSms\AppInfo;
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 70c8d53..b4fba50 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
 	      xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
     <id>ocsms</id>
-    <name>Nextcloud SMS</name>
+    <name>Phone Sync</name>
     <summary>An app to sync SMS with your cloud</summary>
     <description>An app to sync SMS with your cloud</description>
     <licence>agpl</licence>
diff --git a/appinfo/ocsmsapp.php b/appinfo/ocsmsapp.php
index 868ede5..375ec8f 100644
--- a/appinfo/ocsmsapp.php
+++ b/appinfo/ocsmsapp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/appinfo/routes.php b/appinfo/routes.php
index f0d4cb4..da18e0f 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 namespace OCA\OcSms\AppInfo;
diff --git a/controller/apicontroller.php b/controller/apicontroller.php
index cd7ab39..389a375 100644
--- a/controller/apicontroller.php
+++ b/controller/apicontroller.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 namespace OCA\OcSms\Controller;
diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
index 7d75b59..c079a53 100644
--- a/controller/settingscontroller.php
+++ b/controller/settingscontroller.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 namespace OCA\OcSms\Controller;
diff --git a/controller/smscontroller.php b/controller/smscontroller.php
index 4eecc46..3ff1cc3 100644
--- a/controller/smscontroller.php
+++ b/controller/smscontroller.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 namespace OCA\OcSms\Controller;
diff --git a/db/configmapper.php b/db/configmapper.php
index 9af8f95..c526c61 100644
--- a/db/configmapper.php
+++ b/db/configmapper.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 namespace OCA\OcSms\Db;
diff --git a/db/conversationstatemapper.php b/db/conversationstatemapper.php
index bac0d9d..32d0fe8 100644
--- a/db/conversationstatemapper.php
+++ b/db/conversationstatemapper.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 namespace OCA\OcSms\Db;
diff --git a/db/sms.php b/db/sms.php
index 3d90fcf..81c92af 100644
--- a/db/sms.php
+++ b/db/sms.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 namespace OCA\OcSms\Db;
diff --git a/db/smsmapper.php b/db/smsmapper.php
index 4fe83fd..630ed97 100644
--- a/db/smsmapper.php
+++ b/db/smsmapper.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 namespace OCA\OcSms\Db;
diff --git a/issue_template.md b/issue_template.md
index b1e5845..81a28cf 100644
--- a/issue_template.md
+++ b/issue_template.md
@@ -1,8 +1,8 @@
 <!--
-Thanks for reporting issues back to us! 
+Thanks for reporting issues back to us!
 
 To make it possible for us to help you please fill out below information carefully.
---> 
+-->
 
 ### Steps to reproduce
 1.
@@ -17,7 +17,7 @@ Tell us what happens instead
 
 ### Server configuration
 
-**ownCloud version:** 
+**NextCloud/ownCloud version:**
 
 **PHP version:**
 
diff --git a/js/public/app.js b/js/public/app.js
index 4704df8..56e3949 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -1,11 +1,11 @@
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 
@@ -50,7 +50,7 @@ app.directive('toInt', function() {
 	};
 });
 
-// Imported from ownCloud contact app
+// Imported from contact app
 app.filter('peerColor', function() {
 	return function(input) {
 		if (typeof input == 'undefined') {
@@ -484,7 +484,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
 				return;
 			}
 			else if (Notification.permission === "granted") {
-				new Notification("ownCloud SMS - " + msg);
+				new Notification("Phone Sync - " + msg);
 			}
 			else if (Notification.permission !== 'denied') {
 				Notification.requestPermission(function (permission) {
@@ -492,7 +492,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
 						Notification.permission = permission;
 					}
 					if (permission === "granted") {
-						new Notification("ownCloud SMS - " + msg);
+						new Notification("Phone Sync - " + msg);
 					}
 				});
 			}
diff --git a/lib/contactcache.php b/lib/contactcache.php
index a52e7c2..49dfeec 100644
--- a/lib/contactcache.php
+++ b/lib/contactcache.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
  * @contributor: stagprom <https://github.com/stagprom/>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 namespace OCA\OcSms\Lib;
diff --git a/lib/countrycodes.php b/lib/countrycodes.php
index 2288427..68bc45b 100644
--- a/lib/countrycodes.php
+++ b/lib/countrycodes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
  * @contributor: stagprom <https://github.com/stagprom/>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 namespace OCA\OcSms\Lib;
diff --git a/lib/migration/fixconversationreadstates.php b/lib/migration/fixconversationreadstates.php
index c9be22f..30e2dcd 100644
--- a/lib/migration/fixconversationreadstates.php
+++ b/lib/migration/fixconversationreadstates.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 
diff --git a/lib/phonenumberformatter.php b/lib/phonenumberformatter.php
index a45cf5f..3ab4c81 100644
--- a/lib/phonenumberformatter.php
+++ b/lib/phonenumberformatter.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
  * @contributor: stagprom <https://github.com/stagprom/>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 namespace OCA\OcSms\Lib;
diff --git a/tests/autoloader.php b/tests/autoloader.php
index 2a465a0..28e611d 100644
--- a/tests/autoloader.php
+++ b/tests/autoloader.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * ownCloud - ocsms
+ * NextCloud - Phone Sync
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Loic Blot <loic.blot@unix-experience.fr>
- * @copyright Loic Blot 2014-2016
+ * @copyright Loic Blot 2014-2017
  */
 
 require_once __DIR__ . '/../../../3rdparty/Pimple/Pimple.php';