diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 02e2ab62..efdda954 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -25,7 +25,7 @@ namespace OCA\Passman\AppInfo;
 
 use OC\Files\View;
 use OC\ServerContainer;
-use OCA\Passman\controller\ShareController;
+use OCA\Passman\Controller\ShareController;
 use OCA\Passman\Middleware\APIMiddleware;
 use OCA\Passman\Middleware\ShareMiddleware;
 use OCA\Passman\Notifier;
diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php
index 8376408d..e6d450b7 100644
--- a/lib/Controller/AdminController.php
+++ b/lib/Controller/AdminController.php
@@ -9,7 +9,7 @@
  * @copyright Sander Brand 2016
  */
 
-namespace OCA\Passman\controller;
+namespace OCA\Passman\Controller;
 
 use OCA\Passman\Db\Credential;
 use OCA\Passman\Db\CredentialRevision;
diff --git a/lib/Controller/CredentialController.php b/lib/Controller/CredentialController.php
index bb81937f..87c029c6 100644
--- a/lib/Controller/CredentialController.php
+++ b/lib/Controller/CredentialController.php
@@ -9,7 +9,7 @@
  * @copyright Sander Brand 2016
  */
 
-namespace OCA\Passman\controller;
+namespace OCA\Passman\Controller;
 
 use OCA\Passman\Activity;
 use OCA\Passman\Db\Credential;
diff --git a/lib/Controller/FileController.php b/lib/Controller/FileController.php
index 9ffc469a..b5e55e76 100644
--- a/lib/Controller/FileController.php
+++ b/lib/Controller/FileController.php
@@ -9,7 +9,7 @@
  * @copyright Sander Brand 2016
  */
 
-namespace OCA\Passman\controller;
+namespace OCA\Passman\Controller;
 
 use OCA\Passman\Service\FileService;
 use OCP\AppFramework\ApiController;
diff --git a/lib/Controller/IconController.php b/lib/Controller/IconController.php
index 66f0f786..0bf9d221 100644
--- a/lib/Controller/IconController.php
+++ b/lib/Controller/IconController.php
@@ -9,7 +9,7 @@
  * @copyright Sander Brand 2016
  */
 
-namespace OCA\Passman\controller;
+namespace OCA\Passman\Controller;
 
 use Doctrine\DBAL\Exception\DriverException;
 use OC\App\AppManager;
diff --git a/lib/Controller/InternalController.php b/lib/Controller/InternalController.php
index 110772e2..79c9cf26 100644
--- a/lib/Controller/InternalController.php
+++ b/lib/Controller/InternalController.php
@@ -9,7 +9,7 @@
  * @copyright Sander Brand 2016
  */
 
-namespace OCA\Passman\controller;
+namespace OCA\Passman\Controller;
 
 use OCA\Passman\Service\CredentialService;
 use OCP\App\IAppManager;
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 79eb9474..5e456ea3 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -9,7 +9,7 @@
  * @copyright Sander Brand 2016
  */
 
-namespace OCA\Passman\controller;
+namespace OCA\Passman\Controller;
 
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index eb4aa2b8..875a105d 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -9,7 +9,7 @@
  * @copyright Sander Brand 2016
  */
 
-namespace OCA\Passman\controller;
+namespace OCA\Passman\Controller;
 
 use OCA\Passman\Service\SettingsService;
 use OCP\AppFramework\ApiController;
diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php
index 813847ad..a8a97401 100644
--- a/lib/Controller/ShareController.php
+++ b/lib/Controller/ShareController.php
@@ -9,7 +9,7 @@
  * @copyright Sander Brand 2016
  */
 
-namespace OCA\Passman\controller;
+namespace OCA\Passman\Controller;
 
 use OCA\Passman\Activity;
 use OCA\Passman\Db\File;
diff --git a/lib/Controller/TranslationController.php b/lib/Controller/TranslationController.php
index 5791cfb8..ccdf5765 100644
--- a/lib/Controller/TranslationController.php
+++ b/lib/Controller/TranslationController.php
@@ -9,7 +9,7 @@
  * @copyright Sander Brand 2016
  */
 
-namespace OCA\Passman\controller;
+namespace OCA\Passman\Controller;
 
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http\JSONResponse;
diff --git a/lib/Controller/VaultController.php b/lib/Controller/VaultController.php
index 681de8a8..77d1da18 100644
--- a/lib/Controller/VaultController.php
+++ b/lib/Controller/VaultController.php
@@ -9,7 +9,7 @@
  * @copyright Sander Brand 2016
  */
 
-namespace OCA\Passman\controller;
+namespace OCA\Passman\Controller;
 
 use OCA\Passman\Db\Credential;
 use OCA\Passman\Service\CredentialService;
diff --git a/middleware/ShareMiddleware.php b/middleware/ShareMiddleware.php
index 1235a00e..d69aa5e8 100644
--- a/middleware/ShareMiddleware.php
+++ b/middleware/ShareMiddleware.php
@@ -2,7 +2,7 @@
 
 namespace OCA\Passman\Middleware;
 
-use OCA\Passman\controller\ShareController;
+use OCA\Passman\Controller\ShareController;
 use OCA\Passman\Service\SettingsService;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
diff --git a/tests/unit/controller/FileControllerTest.php b/tests/unit/controller/FileControllerTest.php
index 68ea0005..c6946ed0 100644
--- a/tests/unit/controller/FileControllerTest.php
+++ b/tests/unit/controller/FileControllerTest.php
@@ -31,7 +31,7 @@ use PHPUnit_Framework_TestCase;
  * Class FileControllerTest
  *
  * @package OCA\Passman\Controller
- * @coversDefaultClass \OCA\Passman\controller\FileController
+ * @coversDefaultClass \OCA\Passman\Controller\FileController
  */
 class FileControllerTest extends PHPUnit_Framework_TestCase {
 
diff --git a/tests/unit/controller/InternalControllerTest.php b/tests/unit/controller/InternalControllerTest.php
index 025f0603..7f5ad49b 100644
--- a/tests/unit/controller/InternalControllerTest.php
+++ b/tests/unit/controller/InternalControllerTest.php
@@ -30,7 +30,7 @@ use PHPUnit_Framework_TestCase;
  * Class InternalControllerTest
  *
  * @package OCA\Passman\Controller
- * @coversDefaultClass \OCA\Passman\controller\InternalController
+ * @coversDefaultClass \OCA\Passman\Controller\InternalController
  */
 class InternalControllerTest extends PHPUnit_Framework_TestCase {
 
diff --git a/tests/unit/controller/PageControllerTest.php b/tests/unit/controller/PageControllerTest.php
index 0e441d6a..169d2142 100644
--- a/tests/unit/controller/PageControllerTest.php
+++ b/tests/unit/controller/PageControllerTest.php
@@ -30,7 +30,7 @@ use PHPUnit_Framework_TestCase;
  * Class PageControllerTest
  *
  * @package OCA\Passman\Controller
- * @coversDefaultClass  \OCA\Passman\controller\PageController
+ * @coversDefaultClass  \OCA\Passman\Controller\PageController
  */
 class PageControllerTest extends PHPUnit_Framework_TestCase {
 
diff --git a/tests/unit/controller/SettingsControllerTest.php b/tests/unit/controller/SettingsControllerTest.php
index 88f3c6c1..2b9b5af0 100644
--- a/tests/unit/controller/SettingsControllerTest.php
+++ b/tests/unit/controller/SettingsControllerTest.php
@@ -32,7 +32,7 @@ use PHPUnit_Framework_TestCase;
  * Class SettingsControllerTest
  *
  * @package OCA\Passman\Controller
- * @coversDefaultClass  \OCA\Passman\controller\SettingsController
+ * @coversDefaultClass  \OCA\Passman\Controller\SettingsController
  */
 class SettingsControllerTest extends PHPUnit_Framework_TestCase {
 
diff --git a/tests/unit/controller/TranslationControllerTest.php b/tests/unit/controller/TranslationControllerTest.php
index 1e6f5884..1a2f2175 100644
--- a/tests/unit/controller/TranslationControllerTest.php
+++ b/tests/unit/controller/TranslationControllerTest.php
@@ -31,7 +31,7 @@ use PHPUnit_Framework_TestCase;
  * Class TranslationControllerTest
  *
  * @package OCA\Passman\Controller
- * @coversDefaultClass  \OCA\Passman\controller\TranslationController
+ * @coversDefaultClass  \OCA\Passman\Controller\TranslationController
  */
 class TranslationControllerTest extends PHPUnit_Framework_TestCase {
 
diff --git a/tests/unit/controller/VaultControllerTest.php b/tests/unit/controller/VaultControllerTest.php
index 24e6e406..392e3ec1 100644
--- a/tests/unit/controller/VaultControllerTest.php
+++ b/tests/unit/controller/VaultControllerTest.php
@@ -34,7 +34,7 @@ use PHPUnit_Framework_TestCase;
  * Class VaultControllerTest
  *
  * @package OCA\Passman\Controller
- * @coversDefaultClass \OCA\Passman\controller\VaultController
+ * @coversDefaultClass \OCA\Passman\Controller\VaultController
  */
 class VaultControllerTest extends PHPUnit_Framework_TestCase {