rename

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

81 files changed, 598 insertions, 478 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b60f29e..db1ab70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,21 @@
 # Changelog
 
 
+### v0.4.0
+
+- fullnextsearch -> fulltextsearch
+- Pagination
+- settings panel
+
+
+
 ### v0.3.2
 
 - UI: remove personal settings
 - DB: fill err field on new indexes
 
+
+
 ### v0.3.1
 
 - bugfixes.
diff --git a/Makefile b/Makefile
index c032ce9..ad62dbc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-app_name=fullnextsearch
+app_name=fulltextsearch
 
 project_dir=$(CURDIR)/../$(app_name)
 build_dir=$(CURDIR)/build/artifacts
@@ -8,7 +8,7 @@ sign_dir=$(build_dir)/sign
 package_name=$(app_name)
 cert_dir=$(HOME)/.nextcloud/certificates
 codecov_token_dir=$(HOME)/.nextcloud/codecov_token
-version+=0.3.2
+version+=0.4.0
 
 all: appstore
 
diff --git a/README.md b/README.md
index 2bb8a05..34b79a5 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# FullNextSearch
+# FullTextSearch
 
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/fullnextsearch/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/fullnextsearch/?b=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/fulltextsearch/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/fulltextsearch/?b=master)
 
 **BETA VERSION**  
 
-_FullNextSearch_ is the core App of a full-text search framework for your Nextcloud. 
+_FullTextSearch_ is the core App of a full-text search framework for your Nextcloud. 
 To have it operate, and get content indexed, some other Apps are needed: 
 
 - Some **Providers Apps** to extract content from your Nextcloud. 
@@ -15,5 +15,5 @@ _Note: There is no limit to the number of Platform-App to be installed, however
 
 ### Documentation
 
-[Can be found on the Wiki](https://github.com/nextcloud/fullnextsearch/wiki)
+[Can be found on the Wiki](https://github.com/nextcloud/fulltextsearch/wiki)
 
diff --git a/appinfo/app.php b/appinfo/app.php
index c59124a..a6a971e 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\AppInfo;
+namespace OCA\FullTextSearch\AppInfo;
 
 use OCP\AppFramework\QueryException;
 
diff --git a/appinfo/database.xml b/appinfo/database.xml
index 67cad02..2e18279 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!--
-  ~ FullNextSearch - Full Text Search your Nextcloud.
+  ~ FullTextSearch - Full text search framework for Nextcloud
   ~
   ~ This file is licensed under the Affero General Public License version 3 or
   ~ later. See the COPYING file.
   ~
   ~ @author Maxence Lange <maxence@artificial-owl.com>
-  ~ @copyright 2017
+  ~ @copyright 2018
   ~ @license GNU AGPL version 3 or any later version
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 	<charset>utf8</charset>
 
 	<table>
-		<name>*dbprefix*fullnextsearch_indexes</name>
+		<name>*dbprefix*fulltextsearch_indexes</name>
 
 		<declaration>
 			<field>
@@ -94,7 +94,7 @@
 	</table>
 
 	<table>
-		<name>*dbprefix*fullnextsearch_ticks</name>
+		<name>*dbprefix*fulltextsearch_ticks</name>
 
 		<declaration>
 			<field>
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 88d3c5f..9ba561f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0"?>
 <info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
-	<id>fullnextsearch</id>
-	<name>Full Next Search (BETA)</name>
-	<summary>Core App of the modular content indexer.</summary>
+	<id>fulltextsearch</id>
+	<name>Full text search (BETA)</name>
+	<summary>Core of the full-text search framework for Nextcloud</summary>
 	<description><![CDATA[
 
-FullNextSearch is the core App of a full-text search framework for your Nextcloud.
+Core App of the full-text search framework for your Nextcloud.
 
 ]]>
 	</description>
-	<version>0.3.2</version>
+	<version>0.4.0</version>
 	<licence>agpl</licence>
 	<author>Maxence Lange</author>
-	<namespace>FullNextSearch</namespace>
+	<namespace>FullTextSearch</namespace>
 	<documentation>
-		<admin>https://github.com/nextcloud/fullnextsearch/wiki</admin>
+		<admin>https://github.com/nextcloud/fulltextsearch/wiki</admin>
 	</documentation>
 	<category>tools</category>
-	<website>https://github.com/nextcloud/fullnextsearch</website>
-	<bugs>https://github.com/nextcloud/fullnextsearch/issues</bugs>
-	<repository>https://github.com/nextcloud/fullnextsearch.git</repository>
-	<screenshot>https://raw.githubusercontent.com/nextcloud/fullnextsearch/master/screenshots/0.3.0.png</screenshot>
+	<website>https://github.com/nextcloud/fulltextsearch</website>
+	<bugs>https://github.com/nextcloud/fulltextsearch/issues</bugs>
+	<repository>https://github.com/nextcloud/fulltextsearch.git</repository>
+	<screenshot>https://raw.githubusercontent.com/nextcloud/fulltextsearch/master/screenshots/0.3.0.png</screenshot>
 	<dependencies>
 		<nextcloud min-version="12" max-version="14"/>
 	</dependencies>
 
 	<background-jobs>
-		<job>OCA\FullNextSearch\Cron\Index</job>
+		<job>OCA\FullTextSearch\Cron\Index</job>
 	</background-jobs>
 
 	<commands>
-		<command>OCA\FullNextSearch\Command\Stop</command>
-		<command>OCA\FullNextSearch\Command\Index</command>
-		<command>OCA\FullNextSearch\Command\Live</command>
-		<command>OCA\FullNextSearch\Command\Reset</command>
-		<command>OCA\FullNextSearch\Command\Search</command>
+		<command>OCA\FullTextSearch\Command\Stop</command>
+		<command>OCA\FullTextSearch\Command\Index</command>
+		<command>OCA\FullTextSearch\Command\Live</command>
+		<command>OCA\FullTextSearch\Command\Reset</command>
+		<command>OCA\FullTextSearch\Command\Search</command>
 	</commands>
 
 	<settings>
-		<admin>OCA\FullNextSearch\Settings\Admin</admin>
-		<admin-section>OCA\FullNextSearch\Settings\AdminSection</admin-section>
+		<admin>OCA\FullTextSearch\Settings\Admin</admin>
+		<admin-section>OCA\FullTextSearch\Settings\AdminSection</admin-section>
 	</settings>
 
 </info>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 014a616..89789f5 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
 return [
diff --git a/css/nextsearch.css b/css/nextsearch.css
index 2b7ff6f..d4da377 100644
--- a/css/nextsearch.css
+++ b/css/nextsearch.css
@@ -100,11 +100,11 @@
 }
 
 .icon-page-prev {
-	background-image: url('/apps/fullnextsearch/img/page-prev.svg');
+	background-image: url('/apps/fulltextsearch/img/page-prev.svg');
 }
 
 .icon-page-next {
-	background-image: url('/apps/fullnextsearch/img/page-next.svg');
+	background-image: url('/apps/fulltextsearch/img/page-next.svg');
 }
 
 .icon-page-next, .icon-page-prev {
@@ -114,14 +114,14 @@
 	height: 16px;
 }
 
-.icon-fullnextsearch, .icon-close-fullnextsearch {
+.icon-fulltextsearch, .icon-close-fulltextsearch {
 	position: absolute;
 	right: 10px;
 	top: 10px;
 	cursor: pointer;
 }
 
-.icon-more-fullnextsearch {
+.icon-more-fulltextsearch {
 	position: absolute;
 	right: 40px;
 	top: 10px;
diff --git a/img/fullnextsearch.svg b/img/fulltextsearch.svg
index 0724ed2..0724ed2 100644
--- a/img/fullnextsearch.svg
+++ b/img/fulltextsearch.svg
diff --git a/img/fullnextsearch_black.svg b/img/fulltextsearch_black.svg
index 28595aa..28595aa 100644
--- a/img/fullnextsearch_black.svg
+++ b/img/fulltextsearch_black.svg
diff --git a/js/admin.elements.js b/js/admin.elements.js
index 777e255..3c20264 100644
--- a/js/admin.elements.js
+++ b/js/admin.elements.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/js/admin.js b/js/admin.js
index 611d3d7..0be95e1 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/js/admin.settings.js b/js/admin.settings.js
index 11e83d0..2de8f17 100644
--- a/js/admin.settings.js
+++ b/js/admin.settings.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -42,7 +42,7 @@ var fns_admin_settings = {
 
 		$.ajax({
 			method: 'GET',
-			url: OC.generateUrl('/apps/fullnextsearch/admin/settings')
+			url: OC.generateUrl('/apps/fulltextsearch/admin/settings')
 		}).done(function (res) {
 			fns_admin_settings.updateSettingPage(res);
 		});
@@ -144,7 +144,7 @@ var fns_admin_settings = {
 
 		$.ajax({
 			method: 'POST',
-			url: OC.generateUrl('/apps/fullnextsearch/admin/settings'),
+			url: OC.generateUrl('/apps/fulltextsearch/admin/settings'),
 			data: {
 				data: data
 			}
diff --git a/js/fullnextsearch.js b/js/fullnextsearch.js
index 8b2966c..d161778 100644
--- a/js/fullnextsearch.js
+++ b/js/fullnextsearch.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/js/nextsearch.v1.api.js b/js/nextsearch.v1.api.js
index ece1a83..0e7533f 100644
--- a/js/nextsearch.v1.api.js
+++ b/js/nextsearch.v1.api.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -40,7 +40,7 @@ var api = {
 
 		$.ajax({
 			method: 'GET',
-			url: OC.generateUrl('/apps/fullnextsearch/v1/search'),
+			url: OC.generateUrl('/apps/fulltextsearch/v1/search'),
 			data: {
 				request: JSON.stringify(request)
 			}
@@ -60,7 +60,7 @@ var api = {
 
 		$.ajax({
 			method: 'GET',
-			url: OC.generateUrl('/apps/fullnextsearch/options/' + providerId)
+			url: OC.generateUrl('/apps/fulltextsearch/options/' + providerId)
 		}).done(function (res) {
 			searchbar.onOptionsLoaded(res);
 			api.onCallback(callback, res);
diff --git a/js/nextsearch.v1.js b/js/nextsearch.v1.js
index 5c742c9..1c9b30b 100644
--- a/js/nextsearch.v1.js
+++ b/js/nextsearch.v1.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/js/nextsearch.v1.navigation.js b/js/nextsearch.v1.navigation.js
index 71e2d45..1e5c8ec 100644
--- a/js/nextsearch.v1.navigation.js
+++ b/js/nextsearch.v1.navigation.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -282,7 +282,7 @@ var nav = {
 			}
 
 			if (!divTemplate.length) {
-				console.log('FullNextSearch Error: template_entry is not defined');
+				console.log('FullTextSearch Error: template_entry is not defined');
 				return;
 			}
 
diff --git a/js/nextsearch.v1.result.js b/js/nextsearch.v1.result.js
index b4c0c6e..31443a8 100644
--- a/js/nextsearch.v1.result.js
+++ b/js/nextsearch.v1.result.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
index ab86eeb..ba79fc2 100644
--- a/js/nextsearch.v1.searchbar.js
+++ b/js/nextsearch.v1.searchbar.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -53,9 +53,9 @@ var searchbar = {
 		searchbox.search_div = $('<div>', {class: 'next_search_div'});
 		divHeaderRight.prepend(searchbox.search_div);
 
-		searchbox.search_icon = $('<div>', {class: 'icon-fullnextsearch'});
+		searchbox.search_icon = $('<div>', {class: 'icon-fulltextsearch'});
 		searchbox.search_icon.css('background-image',
-			"url('/apps/fullnextsearch/img/fullnextsearch.svg')");
+			"url('/apps/fulltextsearch/img/fulltextsearch.svg')");
 		searchbox.search_icon.fadeTo(0, 0.7);
 		searchbox.search_div.append(searchbox.search_icon);
 
@@ -71,7 +71,7 @@ var searchbar = {
 		searchbox.search_more = $('<div>', {class: 'search_more'});
 		searchbox.search_more.fadeTo(0, 0);
 
-		searchbox.search_icon_more = $('<div>', {class: 'icon-more-white icon-more-fullnextsearch'});
+		searchbox.search_icon_more = $('<div>', {class: 'icon-more-white icon-more-fulltextsearch'});
 		searchbox.search_icon_more.fadeTo(0, 0);
 		searchbox.search_icon_more.on('click', function () {
 			if (curr.moreDisplayed) {
@@ -84,7 +84,7 @@ var searchbar = {
 		});
 		searchbox.search_form.append(searchbox.search_icon_more);
 
-		searchbox.search_icon_close = $('<div>', {class: 'icon-close-white icon-close-fullnextsearch'});
+		searchbox.search_icon_close = $('<div>', {class: 'icon-close-white icon-close-fulltextsearch'});
 		searchbox.search_icon_close.fadeTo(0, 0);
 		searchbox.search_icon_close.on('click', function () {
 			next_settings.lockSearchbox = false;
@@ -171,7 +171,7 @@ var searchbar = {
 	},
 
 
-	// TODO: do we really need this initSearch, or should we use the one from fullnextsearch.js !?
+	// TODO: do we really need this initSearch, or should we use the one from fulltextsearch.js !?
 	initSearch: function (force) {
 		var search = searchbox.search_input.val();
 
diff --git a/js/nextsearch.v1.settings.js b/js/nextsearch.v1.settings.js
index 71e715f..53bd808 100644
--- a/js/nextsearch.v1.settings.js
+++ b/js/nextsearch.v1.settings.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/lib/Api/v1/NextSearch.php b/lib/Api/v1/FullTextSearch.php
index 71eefda..5e45858 100644
--- a/lib/Api/v1/NextSearch.php
+++ b/lib/Api/v1/FullTextSearch.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,22 +22,21 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Api\v1;
+namespace OCA\FullTextSearch\Api\v1;
 
 
-use OCA\FullNextSearch\AppInfo\Application;
-use OCA\FullNextSearch\Model\ExtendedIndex;
-use OCA\FullNextSearch\Model\Index;
-use OCA\FullNextSearch\Service\IndexService;
-use OCA\FullNextSearch\Service\ProviderService;
-use OCA\FullNextSearch\Service\SearchService;
+use OCA\FullTextSearch\AppInfo\Application;
+use OCA\FullTextSearch\Model\ExtendedIndex;
+use OCA\FullTextSearch\Model\Index;
+use OCA\FullTextSearch\Service\IndexService;
+use OCA\FullTextSearch\Service\ProviderService;
+use OCA\FullTextSearch\Service\SearchService;
 use OCP\AppFramework\QueryException;
 use OCP\Util;
 
-class NextSearch {
+class FullTextSearch {
 
 	const API_VERSION = [0, 1, 0];
 
@@ -59,7 +58,7 @@ class NextSearch {
 
 
 	/**
-	 * FullNextSearch::version();
+	 * FullTextSearch::version();
 	 *
 	 * returns the current version of the API
 	 *
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 04db022..1ca4e76 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,18 +22,18 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\AppInfo;
+namespace OCA\FullTextSearch\AppInfo;
 
-use OCA\FullNextSearch\Capabilities;
-use OCA\FullNextSearch\Service\ConfigService;
+use OCA\FullTextSearch\Capabilities;
+use OCA\FullTextSearch\Service\ConfigService;
 use OCP\AppFramework\App;
+use OCP\AppFramework\QueryException;
 
 class Application extends App {
 
-	const APP_NAME = 'fullnextsearch';
+	const APP_NAME = 'fulltextsearch';
 
 	/**
 	 * @param array $params
@@ -58,7 +58,7 @@ class Application extends App {
 	/**
 	 * Register Navigation Tab
 	 *
-	 * @throws \OCP\AppFramework\QueryException
+	 * @throws QueryException
 	 */
 	public function registerNavigation() {
 
@@ -71,20 +71,20 @@ class Application extends App {
 		$this->getContainer()
 			 ->getServer()
 			 ->getNavigationManager()
-			 ->add($this->fullNextSearchNavigation());
+			 ->add($this->fullTextSearchNavigation());
 	}
 
 
-	public function fullNextSearchNavigation() {
+	public function fullTextSearchNavigation() {
 		$urlGen = \OC::$server->getURLGenerator();
 		$navName = \OC::$server->getL10N(self::APP_NAME)
-							   ->t('Full Next Search');
+							   ->t('Full text search');
 
 		return [
 			'id'    => self::APP_NAME,
 			'order' => 5,
-			'href'  => $urlGen->linkToRoute('fullnextsearch.Navigation.navigate'),
-			'icon'  => $urlGen->imagePath(self::APP_NAME, 'fullnextsearch.svg'),
+			'href'  => $urlGen->linkToRoute('fulltextsearch.Navigation.navigate'),
+			'icon'  => $urlGen->imagePath(self::APP_NAME, 'fulltextsearch.svg'),
 			'name'  => $navName
 		];
 	}
diff --git a/lib/AppInfo/Application.php~ b/lib/AppInfo/Application.php~
new file mode 100644
index 0000000..4a18087
--- /dev/null
+++ b/lib/AppInfo/Application.php~
@@ -0,0 +1,98 @@
+<?php
+/**
+ * FullTextSearch - Full Text Search your Nextcloud.
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2017
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ */
+
+namespace OCA\FullTextSearch\AppInfo;
+
+use OCA\FullTextSearch\Capabilities;
+use OCA\FullTextSearch\Service\ConfigService;
+use OCP\AppFramework\App;
+
+class Application extends App {
+
+	const APP_NAME = 'fulltextsearch';
+
+	/**
+	 * @param array $params
+	 */
+	public function __construct(array $params = array()) {
+		parent::__construct(self::APP_NAME, $params);
+
+		$container = $this->getContainer();
+		$container->registerCapability(Capabilities::class);
+
+		$this->registerHooks();
+	}
+
+
+	/**
+	 * Register Hooks
+	 */
+	public function registerHooks() {
+	}
+
+
+	/**
+	 * Register Navigation Tab
+	 *
+	 * @throws \OCP\AppFramework\QueryException
+	 */
+	public function registerNavigation() {
+
+		/** @var ConfigService $configService */
+		$configService = \OC::$server->query(ConfigService::class);
+		if ($configService->getAppValue(ConfigService::APP_NAVIGATION) !== '1') {
+			return;
+		}
+
+		$this->getContainer()
+			 ->getServer()
+			 ->getNavigationManager()
+			 ->add($this->fullNextSearchNavigation());
+	}
+
+
+	public function fullNextSearchNavigation() {
+		$urlGen = \OC::$server->getURLGenerator();
+		$navName = \OC::$server->getL10N(self::APP_NAME)
+							   ->t('Full Next Search');
+
+		return [
+			'id'    => self::APP_NAME,
+			'order' => 5,
+			'href'  => $urlGen->linkToRoute('fulltextsearch.Navigation.navigate'),
+			'icon'  => $urlGen->imagePath(self::APP_NAME, 'fulltextsearch.svg'),
+			'name'  => $navName
+		];
+	}
+
+
+	public function registerSettingsAdmin() {
+		\OCP\App::registerAdmin(self::APP_NAME, 'lib/admin');
+	}
+
+}
+
diff --git a/lib/Capabilities.php b/lib/Capabilities.php
index 29c8807..dbfdd5e 100644
--- a/lib/Capabilities.php
+++ b/lib/Capabilities.php
@@ -1,17 +1,40 @@
 <?php
+/**
+ * FullTextSearch - Full text search framework for Nextcloud
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
-
-namespace OCA\FullNextSearch;
+namespace OCA\FullTextSearch;
 
 use Exception;
-use OCA\FullNextSearch\Service\ProviderService;
+use OCA\FullTextSearch\Service\ProviderService;
 use OCP\Capabilities\ICapability;
 
 
 /**
  * Class Capabilities
  *
- * @package OCA\FullNextSearch
+ * @package OCA\FullTextSearch
  */
 class Capabilities implements ICapability {
 
@@ -34,7 +57,7 @@ class Capabilities implements ICapability {
 	 * Return this classes capabilities
 	 *
 	 * Result to be expected:
-	 *    {"fullnextsearch":{"remote":true,"providers":[{"id":"files","name":"Files"}]}}
+	 *    {"fulltextsearch":{"remote":true,"providers":[{"id":"files","name":"Files"}]}}
 	 *
 	 * if 'remote' is false, it means administrator does not allow search request with no CSRF check.
 	 *
@@ -50,7 +73,7 @@ class Capabilities implements ICapability {
 		$providers = $this->providerService->getConfiguredProviders();
 
 		return [
-			'fullnextsearch' => [
+			'fulltextsearch' => [
 				'remote'    => true,
 				'providers' => $this->providerService->serialize($providers)
 			]
diff --git a/lib/Command/Index.php b/lib/Command/Index.php
index 5e26822..7af325b 100644
--- a/lib/Command/Index.php
+++ b/lib/Command/Index.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,20 +22,19 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Command;
+namespace OCA\FullTextSearch\Command;
 
 use Exception;
-use OCA\FullNextSearch\INextSearchProvider;
-use OCA\FullNextSearch\Model\ExtendedBase;
-use OCA\FullNextSearch\Model\Runner;
-use OCA\FullNextSearch\Service\IndexService;
-use OCA\FullNextSearch\Service\MiscService;
-use OCA\FullNextSearch\Service\PlatformService;
-use OCA\FullNextSearch\Service\ProviderService;
-use OCA\FullNextSearch\Service\RunningService;
+use OCA\FullTextSearch\INextSearchProvider;
+use OCA\FullTextSearch\Model\ExtendedBase;
+use OCA\FullTextSearch\Model\Runner;
+use OCA\FullTextSearch\Service\IndexService;
+use OCA\FullTextSearch\Service\MiscService;
+use OCA\FullTextSearch\Service\PlatformService;
+use OCA\FullTextSearch\Service\ProviderService;
+use OCA\FullTextSearch\Service\RunningService;
 use OCP\IUserManager;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -95,7 +94,7 @@ class Index extends ExtendedBase {
 	 */
 	protected function configure() {
 		parent::configure();
-		$this->setName('fullnextsearch:index')
+		$this->setName('fulltextsearch:index')
 			 ->setDescription('Index files');
 	}
 
diff --git a/lib/Command/Live.php b/lib/Command/Live.php
index 76b1414..01c6f4c 100644
--- a/lib/Command/Live.php
+++ b/lib/Command/Live.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,21 +22,20 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Command;
+namespace OCA\FullTextSearch\Command;
 
 use Exception;
-use OCA\FullNextSearch\Exceptions\InterruptException;
-use OCA\FullNextSearch\Exceptions\TickDoesNotExistException;
-use OCA\FullNextSearch\Model\ExtendedBase;
-use OCA\FullNextSearch\Model\Runner;
-use OCA\FullNextSearch\Service\IndexService;
-use OCA\FullNextSearch\Service\MiscService;
-use OCA\FullNextSearch\Service\PlatformService;
-use OCA\FullNextSearch\Service\ProviderService;
-use OCA\FullNextSearch\Service\RunningService;
+use OCA\FullTextSearch\Exceptions\InterruptException;
+use OCA\FullTextSearch\Exceptions\TickDoesNotExistException;
+use OCA\FullTextSearch\Model\ExtendedBase;
+use OCA\FullTextSearch\Model\Runner;
+use OCA\FullTextSearch\Service\IndexService;
+use OCA\FullTextSearch\Service\MiscService;
+use OCA\FullTextSearch\Service\PlatformService;
+use OCA\FullTextSearch\Service\ProviderService;
+use OCA\FullTextSearch\Service\RunningService;
 use OCP\IUserManager;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -96,7 +95,7 @@ class Live extends ExtendedBase {
 	 */
 	protected function configure() {
 		parent::configure();
-		$this->setName('fullnextsearch:live')
+		$this->setName('fulltextsearch:live')
 			 ->setDescription('Index files');
 	}
 
diff --git a/lib/Command/Reset.php b/lib/Command/Reset.php
index ce895e9..92505dc 100644
--- a/lib/Command/Reset.php
+++ b/lib/Command/Reset.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,17 +22,16 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Command;
+namespace OCA\FullTextSearch\Command;
 
 use Exception;
-use OCA\FullNextSearch\Model\ExtendedBase;
-use OCA\FullNextSearch\Model\Runner;
-use OCA\FullNextSearch\Service\IndexService;
-use OCA\FullNextSearch\Service\MiscService;
-use OCA\FullNextSearch\Service\RunningService;
+use OCA\FullTextSearch\Model\ExtendedBase;
+use OCA\FullTextSearch\Model\Runner;
+use OCA\FullTextSearch\Service\IndexService;
+use OCA\FullTextSearch\Service\MiscService;
+use OCA\FullTextSearch\Service\RunningService;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -70,7 +69,7 @@ class Reset extends ExtendedBase {
 
 	protected function configure() {
 		parent::configure();
-		$this->setName('fullnextsearch:reset')
+		$this->setName('fulltextsearch:reset')
 			 ->setDescription('reset index')
 			 ->addArgument('provider', InputArgument::OPTIONAL, 'provider');
 	}
@@ -85,7 +84,6 @@ class Reset extends ExtendedBase {
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
 
-
 		try {
 			$this->runner->sourceIsCommandLine($this, $output);
 			$this->runner->start();
diff --git a/lib/Command/Search.php b/lib/Command/Search.php
index ac99e6b..9e1398b 100644
--- a/lib/Command/Search.php
+++ b/lib/Command/Search.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,18 +22,17 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Command;
+namespace OCA\FullTextSearch\Command;
 
 use Exception;
 use OC\Core\Command\Base;
-use OCA\FullNextSearch\Model\IndexDocument;
-use OCA\FullNextSearch\Model\SearchRequest;
-use OCA\FullNextSearch\Model\SearchResult;
-use OCA\FullNextSearch\Service\MiscService;
-use OCA\FullNextSearch\Service\SearchService;
+use OCA\FullTextSearch\Model\IndexDocument;
+use OCA\FullTextSearch\Model\SearchRequest;
+use OCA\FullTextSearch\Model\SearchResult;
+use OCA\FullTextSearch\Service\MiscService;
+use OCA\FullTextSearch\Service\SearchService;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -66,7 +65,7 @@ class Search extends Base {
 
 	protected function configure() {
 		parent::configure();
-		$this->setName('fullnextsearch:search')
+		$this->setName('fulltextsearch:search')
 			 ->setDescription('Search something')
 			 ->addArgument('user', InputArgument::OPTIONAL, 'user')
 			 ->addArgument('string', InputArgument::OPTIONAL, 'needle');
@@ -87,7 +86,7 @@ class Search extends Base {
 		$request = SearchRequest::fromArray(['search' => $input->getArgument('string')]);
 
 		try {
-			$result = $this->searchService->search('files', $input->getArgument('user'), $request);
+			$result = $this->searchService->search($input->getArgument('user'), $request);
 
 			foreach ($result as $searchResult) {
 				$this->displaySearchResult($searchResult);
diff --git a/lib/Command/Stop.php b/lib/Command/Stop.php
index 3dbda2c..63b039b 100644
--- a/lib/Command/Stop.php
+++ b/lib/Command/Stop.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,14 +22,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Command;
+namespace OCA\FullTextSearch\Command;
 
-use OCA\FullNextSearch\Model\ExtendedBase;
-use OCA\FullNextSearch\Service\MiscService;
-use OCA\FullNextSearch\Service\RunningService;
+use OCA\FullTextSearch\Model\ExtendedBase;
+use OCA\FullTextSearch\Service\MiscService;
+use OCA\FullTextSearch\Service\RunningService;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -59,7 +58,7 @@ class Stop extends ExtendedBase {
 
 	protected function configure() {
 		parent::configure();
-		$this->setName('fullnextsearch:stop')
+		$this->setName('fulltextsearch:stop')
 			 ->setDescription('stop all indexing');
 	}
 
diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
index 875b906..c123aff 100644
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,16 +22,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Controller;
+namespace OCA\FullTextSearch\Controller;
 
 use Exception;
-use OCA\FullNextSearch\AppInfo\Application;
-use OCA\FullNextSearch\Model\SearchRequest;
-use OCA\FullNextSearch\Service\MiscService;
-use OCA\FullNextSearch\Service\SearchService;
+use OCA\FullTextSearch\AppInfo\Application;
+use OCA\FullTextSearch\Model\SearchRequest;
+use OCA\FullTextSearch\Service\MiscService;
+use OCA\FullTextSearch\Service\SearchService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
diff --git a/lib/Controller/NavigationController.php b/lib/Controller/NavigationController.php
index ff3d64e..d18e600 100644
--- a/lib/Controller/NavigationController.php
+++ b/lib/Controller/NavigationController.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,14 +22,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Controller;
+namespace OCA\FullTextSearch\Controller;
 
-use OCA\FullNextSearch\AppInfo\Application;
-use OCA\FullNextSearch\Service\ConfigService;
-use OCA\FullNextSearch\Service\MiscService;
+use OCA\FullTextSearch\AppInfo\Application;
+use OCA\FullTextSearch\Service\ConfigService;
+use OCA\FullTextSearch\Service\MiscService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 80d2631..52e6b72 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,16 +22,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Controller;
+namespace OCA\FullTextSearch\Controller;
 
 use Exception;
-use OCA\FullNextSearch\AppInfo\Application;
-use OCA\FullNextSearch\Service\ConfigService;
-use OCA\FullNextSearch\Service\MiscService;
-use OCA\FullNextSearch\Service\SettingsService;
+use OCA\FullTextSearch\AppInfo\Application;
+use OCA\FullTextSearch\Service\ConfigService;
+use OCA\FullTextSearch\Service\MiscService;
+use OCA\FullTextSearch\Service\SettingsService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
diff --git a/lib/Controller/TemplatesController.php b/lib/Controller/TemplatesController.php
index f6d1d83..bef23e2 100644
--- a/lib/Controller/TemplatesController.php
+++ b/lib/Controller/TemplatesController.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,15 +24,15 @@
  *
  */
 
-namespace OCA\FullNextSearch\Controller;
+namespace OCA\FullTextSearch\Controller;
 
 use Exception;
 use OC\AppFramework\Http;
-use OCA\FullNextSearch\AppInfo\Application;
-use OCA\FullNextSearch\Exceptions\ProviderDoesNotExistException;
-use OCA\FullNextSearch\Service\ConfigService;
-use OCA\FullNextSearch\Service\MiscService;
-use OCA\FullNextSearch\Service\ProviderService;
+use OCA\FullTextSearch\AppInfo\Application;
+use OCA\FullTextSearch\Exceptions\ProviderDoesNotExistException;
+use OCA\FullTextSearch\Service\ConfigService;
+use OCA\FullTextSearch\Service\MiscService;
+use OCA\FullTextSearch\Service\ProviderService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\TemplateResponse;
diff --git a/lib/Cron/Index.php b/lib/Cron/Index.php
index d9b9df7..b0c3d06 100644
--- a/lib/Cron/Index.php
+++ b/lib/Cron/Index.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -23,24 +23,24 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Cron;
+namespace OCA\FullTextSearch\Cron;
 
 use Exception;
 use OC\BackgroundJob\TimedJob;
-use OCA\FullNextSearch\AppInfo\Application;
-use OCA\FullNextSearch\Exceptions\InterruptException;
-use OCA\FullNextSearch\Model\Runner;
-use OCA\FullNextSearch\Service\IndexService;
-use OCA\FullNextSearch\Service\MiscService;
-use OCA\FullNextSearch\Service\PlatformService;
-use OCA\FullNextSearch\Service\ProviderService;
-use OCA\FullNextSearch\Service\RunningService;
+use OCA\FullTextSearch\AppInfo\Application;
+use OCA\FullTextSearch\Exceptions\InterruptException;
+use OCA\FullTextSearch\Model\Runner;
+use OCA\FullTextSearch\Service\IndexService;
+use OCA\FullTextSearch\Service\MiscService;
+use OCA\FullTextSearch\Service\PlatformService;
+use OCA\FullTextSearch\Service\ProviderService;
+use OCA\FullTextSearch\Service\RunningService;
 use OCP\AppFramework\QueryException;
 use OCP\IUserManager;
 
+
 class Index extends TimedJob {
 
 	/** @var IUserManager */
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index b879bae..2eb3a26 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,24 +22,23 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Db;
+namespace OCA\FullTextSearch\Db;
 
 
 use Doctrine\DBAL\Query\QueryBuilder;
-use OCA\FullNextSearch\Model\Index;
-use OCA\FullNextSearch\Service\ConfigService;
-use OCA\FullNextSearch\Service\MiscService;
+use OCA\FullTextSearch\Model\Index;
+use OCA\FullTextSearch\Service\ConfigService;
+use OCA\FullTextSearch\Service\MiscService;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IL10N;
 
 class CoreRequestBuilder {
 
-	const TABLE_INDEXES = 'fullnextsearch_indexes';
-	const TABLE_TICKS = 'fullnextsearch_ticks';
+	const TABLE_INDEXES = 'fulltextsearch_indexes';
+	const TABLE_TICKS = 'fulltextsearch_ticks';
 
 	/** @var IDBConnection */
 	protected $dbConnection;
diff --git a/lib/Db/IndexesRequest.php b/lib/Db/IndexesRequest.php
index c070dfa..fbf63c0 100644
--- a/lib/Db/IndexesRequest.php
+++ b/lib/Db/IndexesRequest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,16 +22,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Db;
+namespace OCA\FullTextSearch\Db;
 
 
-use OCA\FullNextSearch\Exceptions\IndexDoesNotExistException;
-use OCA\FullNextSearch\INextSearchProvider;
-use OCA\FullNextSearch\Model\ExtendedIndex;
-use OCA\FullNextSearch\Model\Index;
+use OCA\FullTextSearch\Exceptions\IndexDoesNotExistException;
+use OCA\FullTextSearch\INextSearchProvider;
+use OCA\FullTextSearch\Model\ExtendedIndex;
+use OCA\FullTextSearch\Model\Index;
 
 class IndexesRequest extends IndexesRequestBuilder {
 
diff --git a/lib/Db/IndexesRequestBuilder.php b/lib/Db/IndexesRequestBuilder.php
index bd62f23..53d8b62 100644
--- a/lib/Db/IndexesRequestBuilder.php
+++ b/lib/Db/IndexesRequestBuilder.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,15 +22,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Db;
+namespace OCA\FullTextSearch\Db;
 
 
-use OCA\FullNextSearch\Model\ExtendedIndex;
-use OCA\FullNextSearch\Service\ConfigService;
-use OCA\FullNextSearch\Service\MiscService;
+use OCA\FullTextSearch\Model\ExtendedIndex;
+use OCA\FullTextSearch\Service\ConfigService;
+use OCA\FullTextSearch\Service\MiscService;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IL10N;
diff --git a/lib/Db/TickRequest.php b/lib/Db/TickRequest.php
index 3e4b589..ba6dfe5 100644
--- a/lib/Db/TickRequest.php
+++ b/lib/Db/TickRequest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,15 +22,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Db;
+namespace OCA\FullTextSearch\Db;
 
 
-use OCA\FullNextSearch\Exceptions\TickDoesNotExistException;
-use OCA\FullNextSearch\Model\ExtendedTick;
-use OCA\FullNextSearch\Model\Tick;
+use OCA\FullTextSearch\Exceptions\TickDoesNotExistException;
+use OCA\FullTextSearch\Model\ExtendedTick;
+use OCA\FullTextSearch\Model\Tick;
 
 class TickRequest extends TickRequestBuilder {
 
diff --git a/lib/Db/TickRequestBuilder.php b/lib/Db/TickRequestBuilder.php
index ecf44e7..bbce090 100644
--- a/lib/Db/TickRequestBuilder.php
+++ b/lib/Db/TickRequestBuilder.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,15 +22,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Db;
+namespace OCA\FullTextSearch\Db;
 
 
-use OCA\FullNextSearch\Model\ExtendedTick;
-use OCA\FullNextSearch\Service\ConfigService;
-use OCA\FullNextSearch\Service\MiscService;
+use OCA\FullTextSearch\Model\ExtendedTick;
+use OCA\FullTextSearch\Service\ConfigService;
+use OCA\FullTextSearch\Service\MiscService;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IL10N;
diff --git a/lib/Exceptions/DatabaseException.php b/lib/Exceptions/DatabaseException.php
index e524f57..b285337 100644
--- a/lib/Exceptions/DatabaseException.php
+++ b/lib/Exceptions/DatabaseException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class DatabaseException extends \Exception {
 
diff --git a/lib/Exceptions/EmptySearchException.php b/lib/Exceptions/EmptySearchException.php
index 98da469..cfec8d9 100644
--- a/lib/Exceptions/EmptySearchException.php
+++ b/lib/Exceptions/EmptySearchException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class EmptySearchException extends \Exception {
 
diff --git a/lib/Exceptions/IndexDoesNotExistException.php b/lib/Exceptions/IndexDoesNotExistException.php
index fecb3cf..d113814 100644
--- a/lib/Exceptions/IndexDoesNotExistException.php
+++ b/lib/Exceptions/IndexDoesNotExistException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class IndexDoesNotExistException extends \Exception {
 
diff --git a/lib/Exceptions/InterruptException.php b/lib/Exceptions/InterruptException.php
index cdd0353..6a6f680 100644
--- a/lib/Exceptions/InterruptException.php
+++ b/lib/Exceptions/InterruptException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class InterruptException extends \Exception {
 
diff --git a/lib/Exceptions/NoResultException.php b/lib/Exceptions/NoResultException.php
index 8588ae9..5bcefd7 100644
--- a/lib/Exceptions/NoResultException.php
+++ b/lib/Exceptions/NoResultException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class NoResultException extends \Exception {
 
diff --git a/lib/Exceptions/PlatformDoesNotExistException.php b/lib/Exceptions/PlatformDoesNotExistException.php
index c38277a..e69e03a 100644
--- a/lib/Exceptions/PlatformDoesNotExistException.php
+++ b/lib/Exceptions/PlatformDoesNotExistException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class PlatformDoesNotExistException extends \Exception {
 
diff --git a/lib/Exceptions/PlatformIsNotCompatibleException.php b/lib/Exceptions/PlatformIsNotCompatibleException.php
index 79cff1e..ee7ebe2 100644
--- a/lib/Exceptions/PlatformIsNotCompatibleException.php
+++ b/lib/Exceptions/PlatformIsNotCompatibleException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class PlatformIsNotCompatibleException extends \Exception {
 
diff --git a/lib/Exceptions/PlatformMustBeSingleException.php b/lib/Exceptions/PlatformMustBeSingleException.php
index 7e09e32..04b386e 100644
--- a/lib/Exceptions/PlatformMustBeSingleException.php
+++ b/lib/Exceptions/PlatformMustBeSingleException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class PlatformMustBeSingleException extends \Exception {
 
diff --git a/lib/Exceptions/PlatformNotDefinedException.php b/lib/Exceptions/PlatformNotDefinedException.php
index f707e1d..2f8ff37 100644
--- a/lib/Exceptions/PlatformNotDefinedException.php
+++ b/lib/Exceptions/PlatformNotDefinedException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class PlatformNotDefinedException extends \Exception {
 
diff --git a/lib/Exceptions/PlatformNotSelectedException.php b/lib/Exceptions/PlatformNotSelectedException.php
index 0217dc9..3c7025e 100644
--- a/lib/Exceptions/PlatformNotSelectedException.php
+++ b/lib/Exceptions/PlatformNotSelectedException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class PlatformNotSelectedException extends \Exception {
 
diff --git a/lib/Exceptions/ProviderDoesNotExistException.php b/lib/Exceptions/ProviderDoesNotExistException.php
index b3c01dd..01f51a1 100644
--- a/lib/Exceptions/ProviderDoesNotExistException.php
+++ b/lib/Exceptions/ProviderDoesNotExistException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class ProviderDoesNotExistException extends \Exception {
 
diff --git a/lib/Exceptions/ProviderIsNotCompatibleException.php b/lib/Exceptions/ProviderIsNotCompatibleException.php
index 7e3914b..b0d7cca 100644
--- a/lib/Exceptions/ProviderIsNotCompatibleException.php
+++ b/lib/Exceptions/ProviderIsNotCompatibleException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class ProviderIsNotCompatibleException extends \Exception {
 
diff --git a/lib/Exceptions/ProviderIsNotUniqueException.php b/lib/Exceptions/ProviderIsNotUniqueException.php
index dd5d0fc..13a1032 100644
--- a/lib/Exceptions/ProviderIsNotUniqueException.php
+++ b/lib/Exceptions/ProviderIsNotUniqueException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class ProviderIsNotUniqueException extends \Exception {
 
diff --git a/lib/Exceptions/ProviderOptionsDoesNotExistException.php b/lib/Exceptions/ProviderOptionsDoesNotExistException.php
index c3e96c6..305f311 100644
--- a/lib/Exceptions/ProviderOptionsDoesNotExistException.php
+++ b/lib/Exceptions/ProviderOptionsDoesNotExistException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class ProviderOptionsDoesNotExistException extends \Exception {
 
diff --git a/lib/Exceptions/RunnerAlreadyUpException.php b/lib/Exceptions/RunnerAlreadyUpException.php
index 43710cd..4571740 100644
--- a/lib/Exceptions/RunnerAlreadyUpException.php
+++ b/lib/Exceptions/RunnerAlreadyUpException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class RunnerAlreadyUpException extends \Exception {
 
diff --git a/lib/Exceptions/TickDoesNotExistException.php b/lib/Exceptions/TickDoesNotExistException.php
index 9eb259d..7edbc17 100644
--- a/lib/Exceptions/TickDoesNotExistException.php
+++ b/lib/Exceptions/TickDoesNotExistException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class TickDoesNotExistException extends \Exception {
 
diff --git a/lib/Exceptions/TickIsNotAliveException.php b/lib/Exceptions/TickIsNotAliveException.php
index 4b96795..338a804 100644
--- a/lib/Exceptions/TickIsNotAliveException.php
+++ b/lib/Exceptions/TickIsNotAliveException.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Exceptions;
+namespace OCA\FullTextSearch\Exceptions;
 
 class TickIsNotAliveException extends \Exception {
 
diff --git a/lib/INextSearchPlatform.php b/lib/INextSearchPlatform.php
index bb49ac2..462d5a8 100644
--- a/lib/INextSearchPlatform.php
+++ b/lib/INextSearchPlatform.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,18 +22,17 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch;
+namespace OCA\FullTextSearch;
 
 
-use OCA\FullNextSearch\Model\DocumentAccess;
-use OCA\FullNextSearch\Model\Index;
-use OCA\FullNextSearch\Model\IndexDocument;
-use OCA\FullNextSearch\Model\Runner;
-use OCA\FullNextSearch\Model\SearchRequest;
-use OCA\FullNextSearch\Model\SearchResult;
+use OCA\FullTextSearch\Model\DocumentAccess;
+use OCA\FullTextSearch\Model\Index;
+use OCA\FullTextSearch\Model\IndexDocument;
+use OCA\FullTextSearch\Model\Runner;
+use OCA\FullTextSearch\Model\SearchRequest;
+use OCA\FullTextSearch\Model\SearchResult;
 
 interface INextSearchPlatform {
 
diff --git a/lib/INextSearchProvider.php b/lib/INextSearchProvider.php
index e195e4f..ca55804 100644
--- a/lib/INextSearchProvider.php
+++ b/lib/INextSearchProvider.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,17 +21,16 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
+ *  
  */
 
-namespace OCA\FullNextSearch;
+namespace OCA\FullTextSearch;
 
-use OCA\FullNextSearch\Model\Index;
-use OCA\FullNextSearch\Model\IndexDocument;
-use OCA\FullNextSearch\Model\Runner;
-use OCA\FullNextSearch\Model\SearchRequest;
-use OCA\FullNextSearch\Model\SearchResult;
+use OCA\FullTextSearch\Model\Index;
+use OCA\FullTextSearch\Model\IndexDocument;
+use OCA\FullTextSearch\Model\Runner;
+use OCA\FullTextSearch\Model\SearchRequest;
+use OCA\FullTextSearch\Model\SearchResult;
 use OCP\AppFramework\Http\TemplateResponse;
 
 interface INextSearchProvider {
diff --git a/lib/Model/DocumentAccess.php b/lib/Model/DocumentAccess.php
index c2b542a..7c61b53 100644
--- a/lib/Model/DocumentAccess.php
+++ b/lib/Model/DocumentAccess.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Model;
+namespace OCA\FullTextSearch\Model;
 
 
 class DocumentAccess implements \JsonSerializable {
diff --git a/lib/Model/ExtendedBase.php b/lib/Model/ExtendedBase.php
index 6f7f3da..2b5c25e 100644
--- a/lib/Model/ExtendedBase.php
+++ b/lib/Model/ExtendedBase.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,14 +22,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
 
-namespace OCA\FullNextSearch\Model;
+namespace OCA\FullTextSearch\Model;
 
 use OC\Core\Command\Base;
-use OCA\FullNextSearch\Exceptions\InterruptException;
+use OCA\FullTextSearch\Exceptions\InterruptException;
 use Symfony\Component\Console\Output\OutputInterface;
 
 
diff --git a/lib/Model/ExtendedIndex.php b/lib/Model/ExtendedIndex.php
index 9dea110..a26377e 100644
--- a/lib/Model/ExtendedIndex.php
+++ b/lib/Model/ExtendedIndex.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,12 +21,11 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
+ *  
  */
 
 
-namespace OCA\FullNextSearch\Model;
+namespace OCA\FullTextSearch\Model;
 
 
 class ExtendedIndex extends Index {
diff --git a/lib/Model/ExtendedTick.php b/lib/Model/ExtendedTick.php
index 806bdf9..8c70c6c 100644
--- a/lib/Model/ExtendedTick.php
+++ b/lib/Model/ExtendedTick.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,11 +22,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
 
-namespace OCA\FullNextSearch\Model;
+namespace OCA\FullTextSearch\Model;
 
 
 class ExtendedTick extends Tick {
diff --git a/lib/Model/Index.php b/lib/Model/Index.php
index 4cf1b2c..c9525ca 100644
--- a/lib/Model/Index.php
+++ b/lib/Model/Index.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Model;
+namespace OCA\FullTextSearch\Model;
 
 class Index implements \JsonSerializable {
 
diff --git a/lib/Model/IndexDocument.php b/lib/Model/IndexDocument.php
index 01fabcb..5f27b76 100644
--- a/lib/Model/IndexDocument.php
+++ b/lib/Model/IndexDocument.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,11 +21,10 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
+ *  
  */
 
-namespace OCA\FullNextSearch\Model;
+namespace OCA\FullTextSearch\Model;
 
 class IndexDocument implements \JsonSerializable {
 
diff --git a/lib/Model/ProviderIndexes.php b/lib/Model/ProviderIndexes.php
index dc838c2..8b747fc 100644
--- a/lib/Model/ProviderIndexes.php
+++ b/lib/Model/ProviderIndexes.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,11 +22,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
 
-namespace OCA\FullNextSearch\Model;
+namespace OCA\FullTextSearch\Model;
 
 class ProviderIndexes {
 
diff --git a/lib/Model/Runner.php b/lib/Model/Runner.php
index cf6c15b..7dea51f 100644
--- a/lib/Model/Runner.php
+++ b/lib/Model/Runner.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,19 +21,18 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
+ *  
  */
 
 
-namespace OCA\FullNextSearch\Model;
+namespace OCA\FullTextSearch\Model;
 
 use Exception;
-use OCA\FullNextSearch\Exceptions\InterruptException;
-use OCA\FullNextSearch\Exceptions\RunnerAlreadyUpException;
-use OCA\FullNextSearch\Exceptions\TickDoesNotExistException;
-use OCA\FullNextSearch\Exceptions\TickIsNotAliveException;
-use OCA\FullNextSearch\Service\RunningService;
+use OCA\FullTextSearch\Exceptions\InterruptException;
+use OCA\FullTextSearch\Exceptions\RunnerAlreadyUpException;
+use OCA\FullTextSearch\Exceptions\TickDoesNotExistException;
+use OCA\FullTextSearch\Exceptions\TickIsNotAliveException;
+use OCA\FullTextSearch\Service\RunningService;
 use Symfony\Component\Console\Output\OutputInterface;
 
 
diff --git a/lib/Model/SearchRequest.php b/lib/Model/SearchRequest.php
index 31a25a2..4c535eb 100644
--- a/lib/Model/SearchRequest.php
+++ b/lib/Model/SearchRequest.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,12 +21,12 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *  
  */
 
-namespace OCA\FullNextSearch\Model;
+namespace OCA\FullTextSearch\Model;
 
-use OCA\FullNextSearch\Service\MiscService;
+use OCA\FullTextSearch\Service\MiscService;
 
 class SearchRequest implements \JsonSerializable {
 
diff --git a/lib/Model/SearchResult.php b/lib/Model/SearchResult.php
index 12ad75e..fdd739e 100644
--- a/lib/Model/SearchResult.php
+++ b/lib/Model/SearchResult.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,12 +22,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Model;
+namespace OCA\FullTextSearch\Model;
 
-use OCA\FullNextSearch\INextSearchProvider;
+use OCA\FullTextSearch\INextSearchProvider;
 
 class SearchResult implements \JsonSerializable {
 
diff --git a/lib/Model/Tick.php b/lib/Model/Tick.php
index 676e03f..865bb86 100644
--- a/lib/Model/Tick.php
+++ b/lib/Model/Tick.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,11 +22,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
 
-namespace OCA\FullNextSearch\Model;
+namespace OCA\FullTextSearch\Model;
 
 
 class Tick {
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
index 5d7c80f..953b9dd 100644
--- a/lib/Service/ConfigService.php
+++ b/lib/Service/ConfigService.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,13 +22,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Service;
+namespace OCA\FullTextSearch\Service;
 
-use OCA\FullNextSearch\AppInfo\Application;
-use OCA\FullNextSearch\Exceptions\ProviderOptionsDoesNotExistException;
+use OCA\FullTextSearch\AppInfo\Application;
+use OCA\FullTextSearch\Exceptions\ProviderOptionsDoesNotExistException;
 use OCP\IConfig;
 use OCP\PreConditionNotMetException;
 use OCP\Util;
diff --git a/lib/Service/IndexService.php b/lib/Service/IndexService.php
index f27c3b7..b864107 100644
--- a/lib/Service/IndexService.php
+++ b/lib/Service/IndexService.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,26 +21,25 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
+ *  
  */
 
-namespace OCA\FullNextSearch\Service;
+namespace OCA\FullTextSearch\Service;
 
 use Exception;
-use OCA\FullNextSearch\Db\IndexesRequest;
-use OCA\FullNextSearch\Exceptions\DatabaseException;
-use OCA\FullNextSearch\Exceptions\IndexDoesNotExistException;
-use OCA\FullNextSearch\Exceptions\InterruptException;
-use OCA\FullNextSearch\Exceptions\NoResultException;
-use OCA\FullNextSearch\Exceptions\TickDoesNotExistException;
-use OCA\FullNextSearch\INextSearchPlatform;
-use OCA\FullNextSearch\INextSearchProvider;
-use OCA\FullNextSearch\Model\ExtendedIndex;
-use OCA\FullNextSearch\Model\Index;
-use OCA\FullNextSearch\Model\IndexDocument;
-use OCA\FullNextSearch\Model\ProviderIndexes;
-use OCA\FullNextSearch\Model\Runner;
+use OCA\FullTextSearch\Db\IndexesRequest;
+use OCA\FullTextSearch\Exceptions\DatabaseException;
+use OCA\FullTextSearch\Exceptions\IndexDoesNotExistException;
+use OCA\FullTextSearch\Exceptions\InterruptException;
+use OCA\FullTextSearch\Exceptions\NoResultException;
+use OCA\FullTextSearch\Exceptions\TickDoesNotExistException;
+use OCA\FullTextSearch\INextSearchPlatform;
+use OCA\FullTextSearch\INextSearchProvider;
+use OCA\FullTextSearch\Model\ExtendedIndex;
+use OCA\FullTextSearch\Model\Index;
+use OCA\FullTextSearch\Model\IndexDocument;
+use OCA\FullTextSearch\Model\ProviderIndexes;
+use OCA\FullTextSearch\Model\Runner;
 
 class IndexService {
 
diff --git a/lib/Service/MiscService.php b/lib/Service/MiscService.php
index ff90746..9b35995 100644
--- a/lib/Service/MiscService.php
+++ b/lib/Service/MiscService.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,12 +22,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Service;
+namespace OCA\FullTextSearch\Service;
 
-use OCA\FullNextSearch\AppInfo\Application;
+use OCA\FullTextSearch\AppInfo\Application;
 use OCP\ILogger;
 
 class MiscService {
diff --git a/lib/Service/PlatformService.php b/lib/Service/PlatformService.php
index 14a32db..d1bd51a 100644
--- a/lib/Service/PlatformService.php
+++ b/lib/Service/PlatformService.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,19 +21,18 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
+ *  
  */
 
-namespace OCA\FullNextSearch\Service;
+namespace OCA\FullTextSearch\Service;
 
 use Exception;
 use OC\App\AppManager;
 use OC_App;
-use OCA\FullNextSearch\Exceptions\PlatformDoesNotExistException;
-use OCA\FullNextSearch\Exceptions\PlatformIsNotCompatibleException;
-use OCA\FullNextSearch\Exceptions\PlatformNotSelectedException;
-use OCA\FullNextSearch\INextSearchPlatform;
+use OCA\FullTextSearch\Exceptions\PlatformDoesNotExistException;
+use OCA\FullTextSearch\Exceptions\PlatformIsNotCompatibleException;
+use OCA\FullTextSearch\Exceptions\PlatformNotSelectedException;
+use OCA\FullTextSearch\INextSearchPlatform;
 use OCP\AppFramework\QueryException;
 
 class PlatformService {
@@ -195,12 +194,12 @@ class PlatformService {
 	 */
 	private function loadPlatformsFromApp($appId) {
 		$appInfo = OC_App::getAppInfo($appId);
-		if (!is_array($appInfo) || !key_exists('fullnextsearch', $appInfo)
-			|| !key_exists('platform', $appInfo['fullnextsearch'])) {
+		if (!is_array($appInfo) || !key_exists('fulltextsearch', $appInfo)
+			|| !key_exists('platform', $appInfo['fulltextsearch'])) {
 			return;
 		}
 
-		$platforms = $appInfo['fullnextsearch']['platform'];
+		$platforms = $appInfo['fulltextsearch']['platform'];
 		if (!is_array($platforms)) {
 			$platforms = [$platforms];
 		}
diff --git a/lib/Service/ProviderService.php b/lib/Service/ProviderService.php
index f73f493..94e8a4d 100644
--- a/lib/Service/ProviderService.php
+++ b/lib/Service/ProviderService.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,19 +22,18 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Service;
+namespace OCA\FullTextSearch\Service;
 
 use Exception;
 use OC\App\AppManager;
 use OC_App;
-use OCA\FullNextSearch\Exceptions\ProviderDoesNotExistException;
-use OCA\FullNextSearch\Exceptions\ProviderIsNotCompatibleException;
-use OCA\FullNextSearch\Exceptions\ProviderIsNotUniqueException;
-use OCA\FullNextSearch\Exceptions\ProviderOptionsDoesNotExistException;
-use OCA\FullNextSearch\INextSearchProvider;
+use OCA\FullTextSearch\Exceptions\ProviderDoesNotExistException;
+use OCA\FullTextSearch\Exceptions\ProviderIsNotCompatibleException;
+use OCA\FullTextSearch\Exceptions\ProviderIsNotUniqueException;
+use OCA\FullTextSearch\Exceptions\ProviderOptionsDoesNotExistException;
+use OCA\FullTextSearch\INextSearchProvider;
 use OCP\AppFramework\QueryException;
 
 class ProviderService {
@@ -236,12 +235,12 @@ class ProviderService {
 	 */
 	private function loadProvidersFromApp($appId) {
 		$appInfo = OC_App::getAppInfo($appId);
-		if (!is_array($appInfo) || !key_exists('fullnextsearch', $appInfo)
-			|| !key_exists('provider', $appInfo['fullnextsearch'])) {
+		if (!is_array($appInfo) || !key_exists('fulltextsearch', $appInfo)
+			|| !key_exists('provider', $appInfo['fulltextsearch'])) {
 			return;
 		}
 
-		$providers = $appInfo['fullnextsearch']['provider'];
+		$providers = $appInfo['fulltextsearch']['provider'];
 		$this->loadProvidersFromList($providers);
 	}
 
diff --git a/lib/Service/RunningService.php b/lib/Service/RunningService.php
index ec47bae..dff1e87 100644
--- a/lib/Service/RunningService.php
+++ b/lib/Service/RunningService.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,17 +22,16 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Service;
+namespace OCA\FullTextSearch\Service;
 
-use OCA\FullNextSearch\Db\TickRequest;
-use OCA\FullNextSearch\Exceptions\RunnerAlreadyUpException;
-use OCA\FullNextSearch\Exceptions\TickDoesNotExistException;
-use OCA\FullNextSearch\Exceptions\TickIsNotAliveException;
-use OCA\FullNextSearch\Model\ExtendedTick;
-use OCA\FullNextSearch\Model\Runner;
+use OCA\FullTextSearch\Db\TickRequest;
+use OCA\FullTextSearch\Exceptions\RunnerAlreadyUpException;
+use OCA\FullTextSearch\Exceptions\TickDoesNotExistException;
+use OCA\FullTextSearch\Exceptions\TickIsNotAliveException;
+use OCA\FullTextSearch\Model\ExtendedTick;
+use OCA\FullTextSearch\Model\Runner;
 
 class RunningService {
 
diff --git a/lib/Service/SearchService.php b/lib/Service/SearchService.php
index 0431f7b..344eaad 100644
--- a/lib/Service/SearchService.php
+++ b/lib/Service/SearchService.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,22 +21,21 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
+ *  
  */
 
-namespace OCA\FullNextSearch\Service;
+namespace OCA\FullTextSearch\Service;
 
 use Exception;
 use OC\App\AppManager;
 use OCA\Circles\Api\v1\Circles;
-use OCA\FullNextSearch\Exceptions\EmptySearchException;
-use OCA\FullNextSearch\Exceptions\ProviderDoesNotExistException;
-use OCA\FullNextSearch\INextSearchPlatform;
-use OCA\FullNextSearch\INextSearchProvider;
-use OCA\FullNextSearch\Model\DocumentAccess;
-use OCA\FullNextSearch\Model\SearchRequest;
-use OCA\FullNextSearch\Model\SearchResult;
+use OCA\FullTextSearch\Exceptions\EmptySearchException;
+use OCA\FullTextSearch\Exceptions\ProviderDoesNotExistException;
+use OCA\FullTextSearch\INextSearchPlatform;
+use OCA\FullTextSearch\INextSearchProvider;
+use OCA\FullTextSearch\Model\DocumentAccess;
+use OCA\FullTextSearch\Model\SearchRequest;
+use OCA\FullTextSearch\Model\SearchResult;
 use OCP\IGroupManager;
 use OCP\IUser;
 use OCP\IUserManager;
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index 2fe25a0..d035c7a 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Service;
+namespace OCA\FullTextSearch\Service;
 
 use Exception;
 use OCP\IConfig;
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index 9710165..3ab45dc 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,15 +22,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
-namespace OCA\FullNextSearch\Settings;
+namespace OCA\FullTextSearch\Settings;
 
 use Exception;
-use OCA\FullNextSearch\AppInfo\Application;
-use OCA\FullNextSearch\Service\ConfigService;
-use OCA\FullNextSearch\Service\MiscService;
+use OCA\FullTextSearch\AppInfo\Application;
+use OCA\FullTextSearch\Service\ConfigService;
+use OCA\FullTextSearch\Service\MiscService;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IL10N;
 use OCP\IURLGenerator;
diff --git a/lib/Settings/AdminSection.php b/lib/Settings/AdminSection.php
index cbd4263..9365477 100644
--- a/lib/Settings/AdminSection.php
+++ b/lib/Settings/AdminSection.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,13 +21,12 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
+ *  
  */
 
-namespace OCA\FullNextSearch\Settings;
+namespace OCA\FullTextSearch\Settings;
 
-use OCA\FullNextSearch\AppInfo\Application;
+use OCA\FullTextSearch\AppInfo\Application;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
@@ -60,7 +59,7 @@ class AdminSection implements IIconSection {
 	 * {@inheritdoc}
 	 */
 	public function getName() {
-		return $this->l10n->t('Full Next Search');
+		return $this->l10n->t('Full text search');
 	}
 
 	/**
@@ -74,6 +73,6 @@ class AdminSection implements IIconSection {
 	 * {@inheritdoc}
 	 */
 	public function getIcon() {
-		return $this->urlGenerator->imagePath(Application::APP_NAME, 'fullnextsearch_black.svg');
+		return $this->urlGenerator->imagePath(Application::APP_NAME, 'fulltextsearch_black.svg');
 	}
 }
diff --git a/templates/navigate.php b/templates/navigate.php
index 328a119..12ae046 100644
--- a/templates/navigate.php
+++ b/templates/navigate.php
@@ -1,19 +1,40 @@
 <?php
-
-
-use OCA\FullNextSearch\Api\v1\NextSearch;
+/**
+ * FullTextSearch - Full text search framework for Nextcloud
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+use OCA\FullTextSearch\Api\v1\FullTextSearch;
 use OCP\Util;
 
-NextSearch::addJavascriptAPI();
-Util::addScript(NextSearch::appName(), 'fullnextsearch');
-Util::addStyle(NextSearch::appName(), 'fullnextsearch');
+FullTextSearch::addJavascriptAPI();
+Util::addScript(FullTextSearch::appName(), 'fulltextsearch');
+Util::addStyle(FullTextSearch::appName(), 'fulltextsearch');
 
 ?>
 
 <div id="search_header">
 	<input id="search_input" placeholder="<?php p($l->t('Search on %s', [$_['themingName']])); ?>">
-<!--	<input id="search_submit" type="submit"-->
-<!--		   value="--><?php //p($l->t('Search on %s', [$_['themingName']])); ?><!--">-->
 </div>
 
 
diff --git a/templates/settings.admin.php b/templates/settings.admin.php
index 5d32d8b..237e61f 100644
--- a/templates/settings.admin.php
+++ b/templates/settings.admin.php
@@ -1,6 +1,30 @@
 <?php
+/**
+ * FullTextSearch - Full text search framework for Nextcloud
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
-use OCA\FullNextSearch\AppInfo\Application;
+use OCA\FullTextSearch\AppInfo\Application;
 use OCP\Util;
 
 Util::addScript(Application::APP_NAME, 'admin.elements');
@@ -14,14 +38,14 @@ Util::addStyle(Application::APP_NAME, 'admin');
 
 <div id="fns" class="section">
 	<span>
-		<a href="https://github.com/nextcloud/fullnextsearch/wiki" target="_blank">
+		<a href="https://github.com/nextcloud/fulltextsearch/wiki" target="_blank">
 			Please check the wiki</a>
-		for documentation related to the installation and the configuration of the Full Text Search within your Nextcloud
+		for documentation related to the installation and the configuration of the Full text search within your Nextcloud
 
 	</span>
 	&nbsp;<br/>
 	&nbsp;<br/>
-	<h2><?php p($l->t('Full Next Search')) ?></h2>
+	<h2><?php p($l->t('Full text search')) ?></h2>
 	<div class="div-table">
 
 		<div class="div-table-row">