diff --git a/lib/autoloader.php b/lib/autoloader.php
index 87a07f6da1..9e198a0351 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -112,7 +112,7 @@ class Autoloader {
 				if ($split[1] === 'core') {
 					$paths[] = \OC::$SERVERROOT . '/core/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
 				} else if ($split[1] === 'settings') {
-					$paths[] = \OC::$SERVERROOT . '/settings/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
+					// Covered by PSR-4 autoloader
 				} else {
 					$paths[] = \OC::$SERVERROOT . '/lib/private/' . $split[1] . '/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
 				}
diff --git a/settings/changepassword/controller.php b/settings/ChangePassword/Controller.php
similarity index 100%
rename from settings/changepassword/controller.php
rename to settings/ChangePassword/Controller.php
diff --git a/settings/controller/appsettingscontroller.php b/settings/Controller/AppSettingsController.php
similarity index 100%
rename from settings/controller/appsettingscontroller.php
rename to settings/Controller/AppSettingsController.php
diff --git a/settings/controller/certificatecontroller.php b/settings/Controller/CertificateController.php
similarity index 100%
rename from settings/controller/certificatecontroller.php
rename to settings/Controller/CertificateController.php
diff --git a/settings/controller/checksetupcontroller.php b/settings/Controller/CheckSetupController.php
similarity index 100%
rename from settings/controller/checksetupcontroller.php
rename to settings/Controller/CheckSetupController.php
diff --git a/settings/controller/encryptioncontroller.php b/settings/Controller/EncryptionController.php
similarity index 100%
rename from settings/controller/encryptioncontroller.php
rename to settings/Controller/EncryptionController.php
diff --git a/settings/controller/groupscontroller.php b/settings/Controller/GroupsController.php
similarity index 100%
rename from settings/controller/groupscontroller.php
rename to settings/Controller/GroupsController.php
diff --git a/settings/controller/logsettingscontroller.php b/settings/Controller/LogSettingsController.php
similarity index 100%
rename from settings/controller/logsettingscontroller.php
rename to settings/Controller/LogSettingsController.php
diff --git a/settings/controller/mailsettingscontroller.php b/settings/Controller/MailSettingsController.php
similarity index 100%
rename from settings/controller/mailsettingscontroller.php
rename to settings/Controller/MailSettingsController.php
diff --git a/settings/controller/securitysettingscontroller.php b/settings/Controller/SecuritySettingsController.php
similarity index 100%
rename from settings/controller/securitysettingscontroller.php
rename to settings/Controller/SecuritySettingsController.php
diff --git a/settings/controller/userscontroller.php b/settings/Controller/UsersController.php
similarity index 100%
rename from settings/controller/userscontroller.php
rename to settings/Controller/UsersController.php
diff --git a/settings/middleware/subadminmiddleware.php b/settings/Middleware/SubadminMiddleware.php
similarity index 100%
rename from settings/middleware/subadminmiddleware.php
rename to settings/Middleware/SubadminMiddleware.php
diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php
index 6443d87a2e..fafdefd01b 100644
--- a/tests/lib/autoloader.php
+++ b/tests/lib/autoloader.php
@@ -83,9 +83,7 @@ class AutoLoader extends TestCase {
 	}
 
 	public function testLoadCoreNamespaceSettings() {
-		$this->assertEquals([
-			\OC::$SERVERROOT . '/settings/foo/bar.php', 
-		], $this->loader->findClass('OC\Settings\Foo\Bar'));
+		$this->assertEquals([], $this->loader->findClass('OC\Settings\Foo\Bar'));
 	}
 
 	public function testLoadCoreNamespaceRepair() {