Move to Gallery namespace

47 files changed, 179 insertions, 311 deletions

diff --git a/.travis.yml b/.travis.yml
index 6af8add8..f41e22fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,11 +12,11 @@ branches:
 #before_install:
 #  - cd ..
 #  - git clone https://github.com/owncloud/core.git
-#  - mv galleryplus core/apps/
+#  - mv gallery core/apps/
 #  - cd core
 #  - git submodule init
 #  - git submodule update
-#  - cd apps/galleryplus
+#  - cd apps/gallery
 
 script: ant test
 #  - phpunit tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 730f3166..6aea7b28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-owncloud-galleryplus (13.0.0)
+owncloud-gallery (13.0.0)
 * Caching and JS performance improvements (@oparoz)
 * Make the app compatible with the "back" button #160 (@oparoz,@setnes)
 * Fix broken view when going back to a nested folder #206 (@oparoz)
@@ -8,7 +8,7 @@ owncloud-galleryplus (13.0.0)
 * Render native SVGs directly and use fallback for older browsers (@oparoz)
 * fix image titles / labels #191 (@jancborchardt )
 
-owncloud-galleryplus (12)
+owncloud-gallery (12)
 * Use IDs instead of paths to retrieve thumbnails #27 (@oparoz)
 * Cache albums instead of parsing the folders every time #41 (@oparoz)
 * Dont send back media type icon #174 (@oparoz)
@@ -28,21 +28,21 @@ owncloud-galleryplus (12)
 * Fix EOF for some patches (@setnes, @oparoz)
 * Fix bullet point style for Markdown text #147 (@oparoz)
 
-owncloud-galleryplus (8.1.11)
+owncloud-gallery (8.1.11)
 * Keep the browsing position in the Files app when exiting the slideshow #126 (@oparoz)
 
-owncloud-galleryplus (2.0.10)
+owncloud-gallery (2.0.10)
 * Add the possibility to enable external shares via the configuration file (only works on 8.1) (@oparoz)
 * Fix slideshow loading for when the app is installed in a custom folder #121 (@oparoz)
 * Don't load the slideshow on the files public page for single items #123 (@oparoz)
 * Make album labels tighter #117 (@oparoz)
 * Only load supported image formats in the Files slideshow #127 (@oparoz)
 
-owncloud-galleryplus (2.0.9)
+owncloud-gallery (2.0.9)
 * Restore the ability to see images located on local, shared folders #120 (@oparoz)
 * Fix Url builder for public side (@oparoz)
 
-owncloud-galleryplus (2.0.8)
+owncloud-gallery (2.0.8)
 * Introduce album configuration via a text file #85 (@oparoz)
 * Introduce buttons to sort content by name and upload date #90 and #91 (@oparoz)
 * Introduce image labels #106 (@oparoz)
@@ -53,10 +53,10 @@ owncloud-galleryplus (2.0.8)
 * Fix searching algorithm to only return a maximum of 4 images per album #112 (@oparoz)
 * Javascript cleanup #57 (@oparoz)
 
-owncloud-galleryplus (2.0.7)
+owncloud-gallery (2.0.7)
 * Improved IE11 compatibility
 
-owncloud-galleryplus (2.0.6)
+owncloud-gallery (2.0.6)
 * Fix the logic implemented to limit the number of thumbnails to preload #60 (@oparoz)
 * Fix all thumbnails instead of just the square ones. Preview in core can return previews of the wrong dimensions, so we fix them (@oparoz)
 * Always fill the albums with up to 4 pictures if we find enough at a lower level #65 (@oparoz)
@@ -65,7 +65,7 @@ owncloud-galleryplus (2.0.6)
 * Only return pictures of the first 2nd level sub-folder which contains pictures bug #79 (@oparoz)
 * Always show the Gallery button in the files app, making it possible to start the Gallery from any folder #73 (@oparoz)
 
-owncloud-galleryplus (2.0.5)
+owncloud-gallery (2.0.5)
 * Fix performance issues related to the initialisation of the view by only loading folders and media files belonging to the current folder #17 (@oparoz)
 * Don't scan folders containing a '.nomedia' file #58 (@oparoz based on @jsalatiel's idea)
 * Don't scan folders stored on external storage (@oparoz)
@@ -77,11 +77,11 @@ owncloud-galleryplus (2.0.5)
 * Calculate picture size properly on High DPI devices (@oparoz)
 * Fix controls on mobile devices (@oparoz)
 
-owncloud-galleryplus (2.0.0)
+owncloud-gallery (2.0.0)
 * ownCloud 8 only
 * Includes patch to previsualise Raw files (@oparoz)
 
-owncloud-galleryplus (1.0.3)
+owncloud-gallery (1.0.3)
 * First release using the AppFramework (@oparoz)
 * ownCloud 7 compatible (@oparoz)
 * Supports all the media types ownCloud has been configured to convert to PNG (@oparoz)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5d62b809..7fad88fb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,16 +3,16 @@
 ### Short version
 
 * Make sure you have installed and configured both ownCloud and Gallery
-* Make sure your issue was not reported before and that it isn't a [known issue](https://github.com/owncloud/galleryplus/blob/master/README.md#known-issues)
+* Make sure your issue was not reported before and that it isn't a [known issue](https://github.com/owncloud/gallery/blob/master/README.md#known-issues)
 * Use the [**issue template**](https://raw.githubusercontent.com/owncloud/core/master/issue_template.md) when reporting issues.
 
 ### Long version
 
-* Read the section in the README about [server and browser requirements](https://github.com/owncloud/galleryplus/blob/master/README.md#requirements)
+* Read the section in the README about [server and browser requirements](https://github.com/owncloud/gallery/blob/master/README.md#requirements)
 * Make sure you have disabled the original Pictures app
-* Read the [known issue](https://github.com/owncloud/galleryplus/blob/master/README.md#known-issues) section in the README
-* Get the latest version of the app from [the releases page](https://github.com/owncloud/galleryplus/releases)
-* [Check if they have already been reported](https://github.com/owncloud/galleryplus/issues)
+* Read the [known issue](https://github.com/owncloud/gallery/blob/master/README.md#known-issues) section in the README
+* Get the latest version of the app from [the releases page](https://github.com/owncloud/gallery/releases)
+* [Check if they have already been reported](https://github.com/owncloud/gallery/issues)
 * Please search the existing issues first, it is likely that your issue was already reported or even fixed.
   - Click on "issues" in the column on the right and type any word in the top search/command bar.
   - You can also filter by appending e. g. "state:open" or "state:closed" to the search string.
diff --git a/README.md b/README.md
index fe408f75..1fe5f9aa 100644
--- a/README.md
+++ b/README.md
@@ -83,8 +83,8 @@ There are many ways in which you can help make Gallery a better product
 * Read the section about server and browser requirements
 * Make sure you've disabled the original Pictures app
 * Read the "Known issues" section below
-* Get the latest version of the app from [the releases page](https://github.com/owncloud/galleryplus/releases)
-* [Check if they have already been reported](https://github.com/owncloud/galleryplus/issues)
+* Get the latest version of the app from [the releases page](https://github.com/owncloud/gallery/releases)
+* [Check if they have already been reported](https://github.com/owncloud/gallery/issues)
 
 ### Known issues
 
@@ -154,21 +154,21 @@ Read about it in the [Administration Manual](https://doc.owncloud.org/server/8.0
 
 ### Installing from archive
 
-* Go to the [the releases page](https://github.com/owncloud/galleryplus/releases)
+* Go to the [the releases page](https://github.com/owncloud/gallery/releases)
 * Download the latest release/archive to your server's **owncloud/apps/** directory
 * Unpack the app
-* **IMPORTANT**: Rename it to galleryplus
+* **IMPORTANT**: Rename it to gallery
 
 ### Installing from Git
 
 In your terminal go into the **owncloud/apps/** directory and then run the following command:
 ```
-$ git clone -b dev https://github.com/owncloud/galleryplus.git
+$ git clone -b dev https://github.com/owncloud/gallery.git
 ```
 
 Now you can activate it in the apps menu. It's called Gallery
 
-To update the app go inside you **owncloud/apps/galleryplus/** directory and type:
+To update the app go inside you **owncloud/apps/gallery/** directory and type:
 ```
 $ git pull --rebase origin dev
 ```
diff --git a/appinfo/app.php b/appinfo/app.php
index 55c1b70c..171cad9c 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus application
+ * ownCloud - gallery application
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -12,7 +12,7 @@
  * @copyright Robin Appelman 2014-2015
  */
 
-namespace OCA\GalleryPlus\AppInfo;
+namespace OCA\Gallery\AppInfo;
 
 use OCP\Util;
 
@@ -52,7 +52,7 @@ $c->query('OCP\INavigationManager')
  *
  * The string has to match the app's folder name
  */
-Util::addTranslations('galleryplus');
+Util::addTranslations('gallery');
 
 // Hack which only loads the scripts in the Files app
 $request = $c->query('Request');
diff --git a/appinfo/application.php b/appinfo/application.php
index 6b38651d..f3188f17 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\AppInfo;
+namespace OCA\Gallery\AppInfo;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
@@ -19,24 +19,24 @@ use OCP\IContainer;
 use OCP\AppFramework\App;
 use OCP\AppFramework\IAppContainer;
 
-use OCA\GalleryPlus\Controller\PageController;
-use OCA\GalleryPlus\Controller\ConfigController;
-use OCA\GalleryPlus\Controller\FilesController;
-use OCA\GalleryPlus\Controller\PreviewController;
-use OCA\GalleryPlus\Controller\PublicConfigController;
-use OCA\GalleryPlus\Controller\PublicFilesController;
-use OCA\GalleryPlus\Controller\PublicPreviewController;
-use OCA\GalleryPlus\Environment\Environment;
-use OCA\GalleryPlus\Preview\Preview;
-use OCA\GalleryPlus\Service\FilesService;
-use OCA\GalleryPlus\Service\ConfigService;
-use OCA\GalleryPlus\Service\ConfigParser;
-use OCA\GalleryPlus\Service\SearchMediaService;
-use OCA\GalleryPlus\Service\ThumbnailService;
-use OCA\GalleryPlus\Service\PreviewService;
-use OCA\GalleryPlus\Service\DownloadService;
-use OCA\GalleryPlus\Middleware\SharingCheckMiddleware;
-use OCA\GalleryPlus\Middleware\EnvCheckMiddleware;
+use OCA\Gallery\Controller\PageController;
+use OCA\Gallery\Controller\ConfigController;
+use OCA\Gallery\Controller\FilesController;
+use OCA\Gallery\Controller\PreviewController;
+use OCA\Gallery\Controller\PublicConfigController;
+use OCA\Gallery\Controller\PublicFilesController;
+use OCA\Gallery\Controller\PublicPreviewController;
+use OCA\Gallery\Environment\Environment;
+use OCA\Gallery\Preview\Preview;
+use OCA\Gallery\Service\FilesService;
+use OCA\Gallery\Service\ConfigService;
+use OCA\Gallery\Service\ConfigParser;
+use OCA\Gallery\Service\SearchMediaService;
+use OCA\Gallery\Service\ThumbnailService;
+use OCA\Gallery\Service\PreviewService;
+use OCA\Gallery\Service\DownloadService;
+use OCA\Gallery\Middleware\SharingCheckMiddleware;
+use OCA\Gallery\Middleware\EnvCheckMiddleware;
 
 use OCA\OcUtility\AppInfo\Application as OcUtility;
 use OCA\OcUtility\Service\SmarterLogger as SmarterLogger;
@@ -44,7 +44,7 @@ use OCA\OcUtility\Service\SmarterLogger as SmarterLogger;
 /**
  * Class Application
  *
- * @package OCA\GalleryPlus\AppInfo
+ * @package OCA\Gallery\AppInfo
  */
 class Application extends App {
 
@@ -54,7 +54,7 @@ class Application extends App {
 	 * @param array $urlParams
 	 */
 	public function __construct(array $urlParams = []) {
-		parent::__construct('galleryplus', $urlParams);
+		parent::__construct('gallery', $urlParams);
 
 		$container = $this->getContainer();
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index ed773ce9..0fd70157 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <info>
-	<id>galleryplus</id>
+	<id>gallery</id>
 	<name>Gallery</name>
 	<description>Media gallery for ownCloud with the following features:
 
@@ -31,7 +31,7 @@
 	<licence>AGPL</licence>
 	<author>Olivier Paroz, Robin Appelman</author>
 	<version>13.0.0</version>
-	<namespace>GalleryPlus</namespace>
+	<namespace>Gallery</namespace>
 	<category>Multimedia</category>
 	<ocsid>169116</ocsid>
 	<dependencies>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index c39590f3..9a115acf 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\AppInfo;
+namespace OCA\Gallery\AppInfo;
 
 /**
  * Application routes
diff --git a/composer.json b/composer.json
index 074d717b..52b7f10d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
-  "name": "interfasys/galleryplus",
+  "name": "owncloud/gallery",
   "type": "project",
   "description": "Media gallery for ownCloud which includes previews for all media types supported by your ownCloud installation.",
   "license": "AGPL 3.0",
-  "homepage": "https://github.com/interfasys/galleryplus",
+  "homepage": "https://github.com/owncloud/gallery",
   "authors": [
     {
       "name": "Olivier Paroz",
@@ -19,9 +19,9 @@
     }
   ],
   "support": {
-    "issues": "https://github.com/interfasys/galleryplus/issues",
-    "wiki": "https://github.com/interfasys/galleryplus/wiki",
-    "source": "https://github.com/interfasys/galleryplus"
+    "issues": "https://github.com/owncloud/gallery/issues",
+    "wiki": "https://github.com/owncloud/gallery/wiki",
+    "source": "https://github.com/owncloud/gallery"
   },
   "require": {
     "symfony/yaml": "~2.6"
diff --git a/controller/configcontroller.php b/controller/configcontroller.php
index be448e0d..f0846954 100644
--- a/controller/configcontroller.php
+++ b/controller/configcontroller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2015
  */
 
-namespace OCA\GalleryPlus\Controller;
+namespace OCA\Gallery\Controller;
 
 use OCP\IRequest;
 use OCP\ILogger;
@@ -18,13 +18,13 @@ use OCP\ILogger;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 
-use OCA\GalleryPlus\Service\ConfigService;
-use OCA\GalleryPlus\Service\PreviewService;
+use OCA\Gallery\Service\ConfigService;
+use OCA\Gallery\Service\PreviewService;
 
 /**
  * Class ConfigController
  *
- * @package OCA\GalleryPlus\Controller
+ * @package OCA\Gallery\Controller
  */
 class ConfigController extends Controller {
 
diff --git a/controller/filescontroller.php b/controller/filescontroller.php
index 9e7e8510..b23befb4 100644
--- a/controller/filescontroller.php
+++ b/controller/filescontroller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -12,7 +12,7 @@
  * @copyright Robin Appelman 2012-2014
  */
 
-namespace OCA\GalleryPlus\Controller;
+namespace OCA\Gallery\Controller;
 
 use OCP\IRequest;
 use OCP\Files\Folder;
@@ -21,14 +21,14 @@ use OCP\ILogger;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 
-use OCA\GalleryPlus\Service\FilesService;
-use OCA\GalleryPlus\Service\ConfigService;
-use OCA\GalleryPlus\Service\SearchMediaService;
+use OCA\Gallery\Service\FilesService;
+use OCA\Gallery\Service\ConfigService;
+use OCA\Gallery\Service\SearchMediaService;
 
 /**
  * Class FilesController
  *
- * @package OCA\GalleryPlus\Controller
+ * @package OCA\Gallery\Controller
  */
 class FilesController extends Controller {
 
diff --git a/controller/jsonhttperror.php b/controller/jsonhttperror.php
index 3600c3ea..ff8dbe55 100644
--- a/controller/jsonhttperror.php
+++ b/controller/jsonhttperror.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -12,22 +12,22 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Controller;
+namespace OCA\Gallery\Controller;
 
 use Exception;
 
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
 
-use OCA\GalleryPlus\Environment\NotFoundEnvException;
-use OCA\GalleryPlus\Service\NotFoundServiceException;
-use OCA\GalleryPlus\Service\ForbiddenServiceException;
+use OCA\Gallery\Environment\NotFoundEnvException;
+use OCA\Gallery\Service\NotFoundServiceException;
+use OCA\Gallery\Service\ForbiddenServiceException;
 
 /**
  * Our classes extend both Controller and ApiController, so we need to use
  * traits to add some common methods
  *
- * @package OCA\GalleryPlus\Controller
+ * @package OCA\Gallery\Controller
  */
 trait JsonHttpError {
 
diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php
index 87d99c7c..4d629673 100644
--- a/controller/pagecontroller.php
+++ b/controller/pagecontroller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -12,7 +12,7 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Controller;
+namespace OCA\Gallery\Controller;
 
 use OCP\IURLGenerator;
 use OCP\IRequest;
@@ -24,16 +24,16 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 
-use OCA\GalleryPlus\Environment\Environment;
-use OCA\GalleryPlus\Http\ImageResponse;
-use OCA\GalleryPlus\Service\ServiceException;
-use OCA\GalleryPlus\Service\DownloadService;
+use OCA\Gallery\Environment\Environment;
+use OCA\Gallery\Http\ImageResponse;
+use OCA\Gallery\Service\ServiceException;
+use OCA\Gallery\Service\DownloadService;
 
 /**
  * Generates templates for the landing page from within ownCloud, the public
  * gallery and error pages
  *
- * @package OCA\GalleryPlus\Controller
+ * @package OCA\Gallery\Controller
  */
 class PageController extends Controller {
 
@@ -96,11 +96,11 @@ class PageController extends Controller {
 	 */
 	public function index() {
 		$appName = $this->appName;
-		if (\OCP\App::isEnabled('gallery')) {
+		if (\OCP\App::isEnabled('galleryplus')) {
 			$url = $this->urlGenerator->linkToRoute(
 				$appName . '.page.error_page',
 				[
-					'message' => "You need to disable the Pictures app before being able to use the Gallery app",
+					'message' => "You need to disable the Gallery+ app before being able to use the official Gallery app",
 					'code'    => Http::STATUS_INTERNAL_SERVER_ERROR
 				]
 			);
@@ -113,7 +113,7 @@ class PageController extends Controller {
 			// Will render the page using the template found in templates/index.php
 			$response = new TemplateResponse($appName, 'index', $params);
 			$this->addContentSecurityToResponse($response);
-			
+
 			return $response;
 		}
 	}
@@ -218,7 +218,7 @@ class PageController extends Controller {
 		// Will render the page using the template found in templates/public.php
 		$response = new TemplateResponse($this->appName, 'public', $params, 'public');
 		$this->addContentSecurityToResponse($response);
-		
+
 		return $response;
 	}
 
diff --git a/controller/pathmanipulation.php b/controller/pathmanipulation.php
index 2b697a4f..dba814a5 100644
--- a/controller/pathmanipulation.php
+++ b/controller/pathmanipulation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,12 +10,12 @@
  * @copyright Olivier Paroz 2015
  */
 
-namespace OCA\GalleryPlus\Controller;
+namespace OCA\Gallery\Controller;
 
 use OCP\AppFramework\Http;
 
 /**
- * @package OCA\GalleryPlus\Controller
+ * @package OCA\Gallery\Controller
  */
 trait PathManipulation {
 
diff --git a/controller/previewcontroller.php b/controller/previewcontroller.php
index 97eca1a7..90acdff9 100644
--- a/controller/previewcontroller.php
+++ b/controller/previewcontroller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -12,7 +12,7 @@
  * @copyright Robin Appelman 2012-2014
  */
 
-namespace OCA\GalleryPlus\Controller;
+namespace OCA\Gallery\Controller;
 
 use OCP\IRequest;
 use OCP\IURLGenerator;
@@ -25,17 +25,17 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\JSONResponse;
 
-use OCA\GalleryPlus\Http\ImageResponse;
-use OCA\GalleryPlus\Service\ServiceException;
-use OCA\GalleryPlus\Service\NotFoundServiceException;
-use OCA\GalleryPlus\Service\ThumbnailService;
-use OCA\GalleryPlus\Service\PreviewService;
-use OCA\GalleryPlus\Service\DownloadService;
+use OCA\Gallery\Http\ImageResponse;
+use OCA\Gallery\Service\ServiceException;
+use OCA\Gallery\Service\NotFoundServiceException;
+use OCA\Gallery\Service\ThumbnailService;
+use OCA\Gallery\Service\PreviewService;
+use OCA\Gallery\Service\DownloadService;
 
 /**
  * Class PreviewController
  *
- * @package OCA\GalleryPlus\Controller
+ * @package OCA\Gallery\Controller
  */
 class PreviewController extends Controller {
 
diff --git a/controller/publicconfigcontroller.php b/controller/publicconfigcontroller.php
index dff098f9..ce2d70d9 100644
--- a/controller/publicconfigcontroller.php
+++ b/controller/publicconfigcontroller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2015
  */
 
-namespace OCA\GalleryPlus\Controller;
+namespace OCA\Gallery\Controller;
 
 /**
  * Class PublicConfigController
@@ -18,7 +18,7 @@ namespace OCA\GalleryPlus\Controller;
  * Note: Type casting only works if the "@param" parameters are also included in this class as
  * their not yet inherited
  *
- * @package OCA\GalleryPlus\Controller
+ * @package OCA\Gallery\Controller
  */
 class PublicConfigController extends ConfigController {
 
diff --git a/controller/publicfilescontroller.php b/controller/publicfilescontroller.php
index 861a8a95..518aa667 100644
--- a/controller/publicfilescontroller.php
+++ b/controller/publicfilescontroller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Controller;
+namespace OCA\Gallery\Controller;
 
 /**
  * Class PublicFilesController
@@ -18,7 +18,7 @@ namespace OCA\GalleryPlus\Controller;
  * Note: Type casting only works if the "@param" parameters are also included in this class as
  * their not yet inherited
  *
- * @package OCA\GalleryPlus\Controller
+ * @package OCA\Gallery\Controller
  */
 class PublicFilesController extends FilesController {
 
diff --git a/controller/publicpreviewcontroller.php b/controller/publicpreviewcontroller.php
index 66f4e790..18275e9f 100644
--- a/controller/publicpreviewcontroller.php
+++ b/controller/publicpreviewcontroller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Controller;
+namespace OCA\Gallery\Controller;
 
 /**
  * Class PublicPreviewController
@@ -18,7 +18,7 @@ namespace OCA\GalleryPlus\Controller;
  * Note: Type casting only works if the "@param" parameters are also included in this class as
  * their not yet inherited
  *
- * @package OCA\GalleryPlus\Controller
+ * @package OCA\Gallery\Controller
  */
 class PublicPreviewController extends PreviewController {
 
diff --git a/environment/environment.php b/environment/environment.php
index 91a3c191..a2f0c9e3 100644
--- a/environment/environment.php
+++ b/environment/environment.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -12,7 +12,7 @@
  * @copyright Authors of \OCA\Files_Sharing\Helper 2014-2015
  */
 
-namespace OCA\GalleryPlus\Environment;
+namespace OCA\Gallery\Environment;
 
 use OCP\IServerContainer;
 use OCP\IUserManager;
@@ -28,7 +28,7 @@ use OCP\Files\NotFoundException;
  *
  * @todo remove the serverContainer once OCP\IUserManager has a getUserFolder() method
  *
- * @package OCA\GalleryPlus\Environment
+ * @package OCA\Gallery\Environment
  */
 class Environment {
 
diff --git a/environment/environmentexception.php b/environment/environmentexception.php
index 0f585101..da5fa568 100644
--- a/environment/environmentexception.php
+++ b/environment/environmentexception.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2015
  */
 
-namespace OCA\GalleryPlus\Environment;
+namespace OCA\Gallery\Environment;
 
 use Exception;
 
diff --git a/environment/notfoundenvexception.php b/environment/notfoundenvexception.php
index ed9c23c0..6504a11e 100644
--- a/environment/notfoundenvexception.php
+++ b/environment/notfoundenvexception.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2015
  */
 
-namespace OCA\GalleryPlus\Environment;
+namespace OCA\Gallery\Environment;
 
 /**
  * Thrown when the service cannot reply to a request
diff --git a/http/imageresponse.php b/http/imageresponse.php
index 2d8f5218..d7cde78d 100644
--- a/http/imageresponse.php
+++ b/http/imageresponse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Http;
+namespace OCA\Gallery\Http;
 
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http;
@@ -18,7 +18,7 @@ use OCP\AppFramework\Http;
 /**
  * A renderer for images
  *
- * @package OCA\GalleryPlus\Http
+ * @package OCA\Gallery\Http
  */
 class ImageResponse extends Response {
 
diff --git a/js/bower.json b/js/bower.json
index c8d8de06..1f67648e 100644
--- a/js/bower.json
+++ b/js/bower.json
@@ -1,6 +1,6 @@
 {
-  "name": "galleryplus",
-  "homepage": "https://github.com/interfasys/galleryplus",
+  "name": "gallery",
+  "homepage": "https://github.com/owncloud/gallery",
   "authors": [
     "Olivier Paroz <owncloud@interfasys.ch>"
   ],
diff --git a/js/eventsource.js b/js/eventsource.js
index 77a85b53..0c7343a9 100644
--- a/js/eventsource.js
+++ b/js/eventsource.js
@@ -1,5 +1,5 @@
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/js/gallery.js b/js/gallery.js
index e0a18508..69ac8609 100644
--- a/js/gallery.js
+++ b/js/gallery.js
@@ -8,7 +8,7 @@
 		albumMap: {},
 		/** Used to pick an image based on the URL */
 		imageMap: {},
-		appName: 'galleryplus',
+		appName: 'gallery',
 		token: undefined,
 		activeSlideShow: null,
 		buttonsWidth: 320,
diff --git a/js/gallerybutton.js b/js/gallerybutton.js
index 1ac46650..5d8b88cb 100644
--- a/js/gallerybutton.js
+++ b/js/gallerybutton.js
@@ -28,7 +28,7 @@ GalleryButton.buildGalleryUrl = function (dir) {
 		tokenPath = 's/{token}';
 	}
 	GalleryButton.url =
-		OC.generateUrl('apps/galleryplus/' + tokenPath, params) + '#' + encodeURIComponent(dir);
+		OC.generateUrl('apps/gallery/' + tokenPath, params) + '#' + encodeURIComponent(dir);
 };
 
 $(document).ready(function () {
diff --git a/js/galleryfileaction.js b/js/galleryfileaction.js
index 3f562b98..80467be6 100644
--- a/js/galleryfileaction.js
+++ b/js/galleryfileaction.js
@@ -25,7 +25,7 @@
 				extension = '.public';
 			}
 			var query = OC.buildQueryString(params);
-			return OC.generateUrl('apps/galleryplus/' + endPoint + extension + path, null) + '?' +
+			return OC.generateUrl('apps/gallery/' + endPoint + extension + path, null) + '?' +
 				query;
 		},
 
diff --git a/js/slideshow.js b/js/slideshow.js
index 30861e4f..23ed11f0 100644
--- a/js/slideshow.js
+++ b/js/slideshow.js
@@ -325,7 +325,7 @@
 			var defer = $.Deferred();
 			if (!this.$slideshowTemplate) {
 				var self = this;
-				var url = OC.generateUrl('apps/galleryplus/slideshow', null);
+				var url = OC.generateUrl('apps/gallery/slideshow', null);
 				$.get(url, function (tmpl) {
 					var template = $(tmpl);
 					var tmplButton;
diff --git a/middleware/checkexception.php b/middleware/checkexception.php
index 3fa64ee9..6432e40d 100644
--- a/middleware/checkexception.php
+++ b/middleware/checkexception.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -11,12 +11,12 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Middleware;
+namespace OCA\Gallery\Middleware;
 
 /**
  * Thrown when one of the tests in the "check" middlewares fails
  *
- * @package OCA\GalleryPlus\Middleware
+ * @package OCA\Gallery\Middleware
  */
 class CheckException extends \Exception {
 
diff --git a/middleware/checkmiddleware.php b/middleware/checkmiddleware.php
index 4bf899af..c88e327a 100644
--- a/middleware/checkmiddleware.php
+++ b/middleware/checkmiddleware.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -12,7 +12,7 @@
  * @copyright Bernhard Posselt 2012-2015
  */
 
-namespace OCA\GalleryPlus\Middleware;
+namespace OCA\Gallery\Middleware;
 
 use OCP\IURLGenerator;
 use OCP\IRequest;
@@ -27,7 +27,7 @@ use OCP\AppFramework\Middleware;
  * Checks that we have a valid token linked to a valid resource and that the
  * user is authorised to access it
  *
- * @package OCA\GalleryPlus\Middleware
+ * @package OCA\Gallery\Middleware
  */
 abstract class CheckMiddleware extends Middleware {
 
diff --git a/middleware/envcheckmiddleware.php b/middleware/envcheckmiddleware.php
index ba6f5d67..9a6b9b87 100644
--- a/middleware/envcheckmiddleware.php
+++ b/middleware/envcheckmiddleware.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -14,7 +14,7 @@
  * @copyright Authors of \OCA\Files_Sharing\Helper 2014-2015
  */
 
-namespace OCA\GalleryPlus\Middleware;
+namespace OCA\Gallery\Middleware;
 
 use OCP\IRequest;
 use OCP\IURLGenerator;
@@ -26,8 +26,8 @@ use OCP\Security\IHasher;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Utility\IControllerMethodReflector;
 
-use OCA\GalleryPlus\Environment\Environment;
-use OCA\GalleryPlus\Service\ServiceException;
+use OCA\Gallery\Environment\Environment;
+use OCA\Gallery\Service\ServiceException;
 
 /**
  * Checks that we have a valid token linked to a valid resource and that the
@@ -35,7 +35,7 @@ use OCA\GalleryPlus\Service\ServiceException;
  *
  * Once all checks have been passed, the environment is ready to use
  *
- * @package OCA\GalleryPlus\Middleware
+ * @package OCA\Gallery\Middleware
  */
 class EnvCheckMiddleware extends CheckMiddleware {
 
diff --git a/middleware/sharingcheckmiddleware.php b/middleware/sharingcheckmiddleware.php
index d1c05a5e..23dd3f1b 100644
--- a/middleware/sharingcheckmiddleware.php
+++ b/middleware/sharingcheckmiddleware.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -12,7 +12,7 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Middleware;
+namespace OCA\Gallery\Middleware;
 
 use OCP\IConfig;
 use OCP\IRequest;
diff --git a/patches/bitmap-max-preview.pull.13635.patch b/patches/bitmap-max-preview.pull.13635.patch
deleted file mode 100644
index 760dd0f6..00000000
--- a/patches/bitmap-max-preview.pull.13635.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 4bf9150f5d360953abd28b73d12d079c32cfd51c Mon Sep 17 00:00:00 2001
-From: Olivier Paroz <github@oparoz.com>
-Date: Wed, 11 Mar 2015 17:35:33 +0100
-Subject: [PATCH] The bitmap preview class now takes maxX and maxY into
- consideration
-
-This is a fix for owncloud#13607
-and is part of the global programme: owncloud#13609
-
-I originally filled the whole area with a transparent background, but
-this creates resizing issues as it doesn't reflect the proper image
-ratio.
----
- lib/private/preview/bitmap.php | 82 +++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 74 insertions(+), 8 deletions(-)
-
-diff --git a/lib/private/preview/bitmap.php b/lib/private/preview/bitmap.php
-index 25f65cf..9171228 100644
---- a/lib/private/preview/bitmap.php
-+++ b/lib/private/preview/bitmap.php
-@@ -1,6 +1,8 @@
- <?php
- /**
-  * Copyright (c) 2013-2014 Georg Ehrke georg@ownCloud.com
-+ * Copyright (c) 2014-2015 Olivier Paroz <owncloud@interfasys.ch>
-+ * 
-  * This file is licensed under the Affero General Public License version 3 or
-  * later.
-  * See the COPYING-README file.
-@@ -8,30 +10,94 @@
- 
- namespace OC\Preview;
- 
-+use Imagick;
-+
-+/**
-+ * Creates a PNG preview using ImageMagick via the PECL extension
-+ *
-+ * @package OC\Preview
-+ */
- abstract class Bitmap extends Provider {
-+
-+	/**
-+	 * @type array
-+	 */
-+	private $maxDims;
-+
- 	/**
- 	 * {@inheritDoc}
- 	 */
- 	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-+		$this->maxDims = [$maxX, $maxY];
-+
- 		$tmpPath = $fileview->toTmpFile($path);
-+		if (!$tmpPath) {
-+			return false;
-+		}
- 
--		//create imagick object from bitmap or vector file
-+		// Creates \Imagick object from bitmap or vector file
- 		try {
--			// Layer 0 contains either the bitmap or
--			// a flat representation of all vector layers
--			$bp = new \Imagick($tmpPath . '[0]');
--
--			$bp->setImageFormat('png');
-+			$bp = $this->getResizedPreview($tmpPath);
- 		} catch (\Exception $e) {
--			\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
-+			\OC_Log::write('core', 'ImageMagick says: ' . $e->getmessage(), \OC_Log::ERROR);
- 			return false;
- 		}
- 
- 		unlink($tmpPath);
- 
- 		//new bitmap image object
--		$image = new \OC_Image($bp);
-+		$image = new \OC_Image();
-+		$image->loadFromData($bp);
- 		//check if image object is valid
- 		return $image->valid() ? $image : false;
- 	}
-+
-+	/**
-+	 * Returns a preview of maxX times maxY dimensions in PNG format
-+	 *
-+	 * 	* The default resolution is already 72dpi, no need to change it for a bitmap output
-+	 * 	* It's possible to have proper colour conversion using profileimage().
-+	 * 	ICC profiles are here: http://www.color.org/srgbprofiles.xalter
-+	 * 	* It's possible to Gamma-correct an image via gammaImage()
-+	 *
-+	 * @param string $tmpPath the location of the file to convert
-+	 *
-+	 * @return \Imagick
-+	 */
-+	private function getResizedPreview($tmpPath) {
-+		$bp = new Imagick();
-+
-+		// Layer 0 contains either the bitmap or a flat representation of all vector layers
-+		$bp->readImage($tmpPath . '[0]');
-+
-+		$bp = $this->resize($bp);
-+
-+		$bp->setImageFormat('png');
-+
-+		return $bp;
-+	}
-+
-+	/**
-+	 * Returns a resized \Imagick object
-+	 *
-+	 * If you want to know more on the various methods available to resize an
-+	 * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
-+	 *
-+	 * @param \Imagick $bp
-+	 *
-+	 * @return \Imagick
-+	 */
-+	private function resize($bp) {
-+		list($maxX, $maxY) = $this->maxDims;
-+		list($previewWidth, $previewHeight) = array_values($bp->getImageGeometry());
-+
-+		// We only need to resize a preview which doesn't fit in the maximum dimensions
-+		if ($previewWidth > $maxX || $previewHeight > $maxY) {
-+			// TODO: LANCZOS is the default filter, CATROM could bring similar results faster
-+			$bp->resizeImage($maxX, $maxY, imagick::FILTER_LANCZOS, 1, true);
-+		}
-+
-+		return $bp;
-+	}
-+
- }
diff --git a/preview/preview.php b/preview/preview.php
index 8faaaa1e..3db38a99 100644
--- a/preview/preview.php
+++ b/preview/preview.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Preview;
+namespace OCA\Gallery\Preview;
 
 use OCP\IConfig;
 use OCP\Image;
@@ -23,7 +23,7 @@ use OCP\ILogger;
  *
  * @todo On OC8.2, replace \OC\Preview with IPreview
  *
- * @package OCA\GalleryPlus\Preview
+ * @package OCA\Gallery\Preview
  */
 class Preview {
 
diff --git a/service/base64encode.php b/service/base64encode.php
index 327e977c..ef91cc8a 100644
--- a/service/base64encode.php
+++ b/service/base64encode.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,12 +10,12 @@
  * @copyright Olivier Paroz 2015
  */
 
-namespace OCA\GalleryPlus\Service;
+namespace OCA\Gallery\Service;
 
 /**
  * Base64 encoding utility method
  *
- * @package OCA\GalleryPlus\Service
+ * @package OCA\Gallery\Service
  */
 trait Base64Encode {
 
diff --git a/service/configparser.php b/service/configparser.php
index e240ef4b..81cd150c 100644
--- a/service/configparser.php
+++ b/service/configparser.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2015
  */
 
-namespace OCA\GalleryPlus\Service;
+namespace OCA\Gallery\Service;
 
 use Symfony\Component\Yaml\Yaml;
 
@@ -20,7 +20,7 @@ use OCP\Files\File;
 /**
  * Parses configuration files
  *
- * @package OCA\GalleryPlus\Service
+ * @package OCA\Gallery\Service
  */
 class ConfigParser {
 
diff --git a/service/configservice.php b/service/configservice.php
index 30e72b44..44248b17 100644
--- a/service/configservice.php
+++ b/service/configservice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,12 +10,12 @@
  * @copyright Olivier Paroz 2015
  */
 
-namespace OCA\GalleryPlus\Service;
+namespace OCA\Gallery\Service;
 
 use OCP\Files\Folder;
 use OCP\ILogger;
 
-use OCA\GalleryPlus\Environment\Environment;
+use OCA\Gallery\Environment\Environment;
 
 /**
  * Finds configurations files and returns a configuration array
@@ -23,7 +23,7 @@ use OCA\GalleryPlus\Environment\Environment;
  * Checks the current and parent folders for configuration files and the privacy flag
  * Supports explicit inheritance
  *
- * @package OCA\GalleryPlus\Service
+ * @package OCA\Gallery\Service
  */
 class ConfigService extends FilesService {
 
diff --git a/service/downloadservice.php b/service/downloadservice.php
index 65cadbf1..fcb3163d 100644
--- a/service/downloadservice.php
+++ b/service/downloadservice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2015
  */
 
-namespace OCA\GalleryPlus\Service;
+namespace OCA\Gallery\Service;
 
 use OCP\Files\File;
 
@@ -18,7 +18,7 @@ use OCP\Files\File;
 /**
  * Prepares the file to download
  *
- * @package OCA\GalleryPlus\Service
+ * @package OCA\Gallery\Service
  */
 class DownloadService extends Service {
 
diff --git a/service/filesservice.php b/service/filesservice.php
index 75607547..0e7c4fe8 100644
--- a/service/filesservice.php
+++ b/service/filesservice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,17 +10,17 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Service;
+namespace OCA\Gallery\Service;
 
 use OCP\Files\Folder;
 use OCP\Files\Node;
 
-use OCA\GalleryPlus\Environment\NotFoundEnvException;
+use OCA\Gallery\Environment\NotFoundEnvException;
 
 /**
  * Contains various methods to retrieve information from the filesystem
  *
- * @package OCA\GalleryPlus\Service
+ * @package OCA\Gallery\Service
  */
 class FilesService extends Service {
 	/**
diff --git a/service/forbiddenserviceexception.php b/service/forbiddenserviceexception.php
index 8eb4c8e7..4ce36feb 100644
--- a/service/forbiddenserviceexception.php
+++ b/service/forbiddenserviceexception.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Service;
+namespace OCA\Gallery\Service;
 
 /**
  * Thrown when the service cannot reply to a request
diff --git a/service/notfoundserviceexception.php b/service/notfoundserviceexception.php
index fcd01478..8d6589db 100644
--- a/service/notfoundserviceexception.php
+++ b/service/notfoundserviceexception.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Service;
+namespace OCA\Gallery\Service;
 
 /**
  * Thrown when the service cannot reply to a request
diff --git a/service/previewservice.php b/service/previewservice.php
index 160995ee..c0953260 100644
--- a/service/previewservice.php
+++ b/service/previewservice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,19 +10,19 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Service;
+namespace OCA\Gallery\Service;
 
 use OCP\Files\File;
 use OCP\Template;
 use OCP\ILogger;
 
-use OCA\GalleryPlus\Environment\Environment;
-use OCA\GalleryPlus\Preview\Preview;
+use OCA\Gallery\Environment\Environment;
+use OCA\Gallery\Preview\Preview;
 
 /**
  * Generates previews
  *
- * @package OCA\GalleryPlus\Service
+ * @package OCA\Gallery\Service
  */
 class PreviewService extends Service {
 
diff --git a/service/searchmediaservice.php b/service/searchmediaservice.php
index bd91af00..c4b6976d 100644
--- a/service/searchmediaservice.php
+++ b/service/searchmediaservice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Service;
+namespace OCA\Gallery\Service;
 
 use OCP\Files\Folder;
 use OCP\Files\File;
@@ -19,7 +19,7 @@ use OCP\Files\Node;
 /**
  * Searches the instance for media files which can be shown
  *
- * @package OCA\GalleryPlus\Service
+ * @package OCA\Gallery\Service
  */
 class SearchMediaService extends FilesService {
 
diff --git a/service/service.php b/service/service.php
index 1ab3b479..575b9a28 100644
--- a/service/service.php
+++ b/service/service.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,18 +10,18 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Service;
+namespace OCA\Gallery\Service;
 
 use OCP\Files\Node;
 
 use OCP\ILogger;
 
-use OCA\GalleryPlus\Environment\Environment;
+use OCA\Gallery\Environment\Environment;
 
 /**
  * Contains methods which all services will need
  *
- * @package OCA\GalleryPlus\Service
+ * @package OCA\Gallery\Service
  */
 abstract class Service {
 
diff --git a/service/serviceexception.php b/service/serviceexception.php
index cd540e0d..a5960428 100644
--- a/service/serviceexception.php
+++ b/service/serviceexception.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,7 +10,7 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Service;
+namespace OCA\Gallery\Service;
 
 use Exception;
 
diff --git a/service/thumbnailservice.php b/service/thumbnailservice.php
index a526604f..85cbcb6b 100644
--- a/service/thumbnailservice.php
+++ b/service/thumbnailservice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - galleryplus
+ * ownCloud - gallery
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -10,12 +10,12 @@
  * @copyright Olivier Paroz 2014-2015
  */
 
-namespace OCA\GalleryPlus\Service;
+namespace OCA\Gallery\Service;
 
 /**
  * Deals with any thumbnail specific requests
  *
- * @package OCA\GalleryPlus\Service
+ * @package OCA\Gallery\Service
  */
 class ThumbnailService {
 
diff --git a/templates/authenticate.php b/templates/authenticate.php
index 666e7d01..e324cd49 100644
--- a/templates/authenticate.php
+++ b/templates/authenticate.php
@@ -5,7 +5,7 @@
 /**
  * @var $l OC_L10N
  */
-style('galleryplus', 'authenticate');
+style('gallery', 'authenticate');
 ?>
 <form method="post">
 	<fieldset>