diff --git a/core/setup/controller.php b/core/controller/setupcontroller.php
similarity index 98%
rename from core/setup/controller.php
rename to core/controller/setupcontroller.php
index a64e6f08a3..16646b97ae 100644
--- a/core/setup/controller.php
+++ b/core/controller/setupcontroller.php
@@ -25,11 +25,11 @@
  *
  */
 
-namespace OC\Core\Setup;
+namespace OC\Core\Controller;
 
 use OC\Setup;
 
-class Controller {
+class SetupController {
 	/** @var Setup */
 	protected $setupHelper;
 	/** @var string */
diff --git a/lib/base.php b/lib/base.php
index b7118e0245..970eabce6a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -826,7 +826,7 @@ class OC {
 			$setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(),
 				\OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(),
 				\OC::$server->getSecureRandom());
-			$controller = new OC\Core\Setup\Controller($setupHelper);
+			$controller = new OC\Core\Controller\SetupController($setupHelper);
 			$controller->run($_POST);
 			exit();
 		}