diff --git a/lib/autoloader.php b/lib/autoloader.php
index 737836034389d29b49e3df5d0dcbb13f4e41e550..89b66a426a73e3ea7344ca6dc089176c5a92cde2 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -102,8 +102,6 @@ class Autoloader {
 			}
 		} elseif (strpos($class, 'OC_') === 0) {
 			$paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
-		} elseif (strpos($class, 'OCP\\') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/lib/public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php');
 		} elseif (strpos($class, 'OCA\\') === 0) {
 			list(, $app, $rest) = explode('\\', $class, 3);
 			$app = strtolower($app);
diff --git a/lib/base.php b/lib/base.php
index eddcec97b1f531b5f426d77f7273bf17e7802540..391bcf865a0b0a4c5fef72d225e287b1d398426a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -481,11 +481,7 @@ class OC {
 		$loaderStart = microtime(true);
 		require_once __DIR__ . '/autoloader.php';
 		self::$loader = new \OC\Autoloader([
-			OC::$SERVERROOT . '/lib',
-			OC::$SERVERROOT . '/core',
-			OC::$SERVERROOT . '/settings',
-			OC::$SERVERROOT . '/ocs',
-			OC::$SERVERROOT . '/ocs-provider',
+			OC::$SERVERROOT . '/lib/private/legacy',
 		]);
 		if (defined('PHPUNIT_RUN')) {
 			self::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
diff --git a/lib/public/template.php b/lib/public/Template.php
similarity index 100%
rename from lib/public/template.php
rename to lib/public/Template.php
diff --git a/tests/lib/AutoLoaderTest.php b/tests/lib/AutoLoaderTest.php
index a97ba3f768eefc0be35d368ff88acf3a38a651f7..38ba29bc08578629ee78e517d9875549f54dec09 100644
--- a/tests/lib/AutoLoaderTest.php
+++ b/tests/lib/AutoLoaderTest.php
@@ -19,18 +19,6 @@ class AutoLoaderTest extends TestCase {
 		$this->loader = new \OC\AutoLoader([]);
 	}
 
-	public function testLeadingSlashOnClassName() {
-		$this->assertEquals([
-			\OC::$SERVERROOT . '/lib/public/files/storage/local.php',
-		], $this->loader->findClass('\OCP\Files\Storage\Local'));
-	}
-
-	public function testNoLeadingSlashOnClassName() {
-		$this->assertEquals([
-			\OC::$SERVERROOT . '/lib/public/files/storage/local.php',
-		], $this->loader->findClass('OCP\Files\Storage\Local'));
-	}
-
 	public function testLegacyPath() {
 		$this->assertEquals([
 			\OC::$SERVERROOT . '/lib/private/legacy/files.php', 
@@ -50,9 +38,7 @@ class AutoLoaderTest extends TestCase {
 	}
 
 	public function testLoadPublicNamespace() {
-		$this->assertEquals([
-			\OC::$SERVERROOT . '/lib/public/foo/bar.php',
-		], $this->loader->findClass('OCP\Foo\Bar'));
+		$this->assertEquals([], $this->loader->findClass('OCP\Foo\Bar'));
 	}
 
 	public function testLoadAppNamespace() {