diff --git a/lib/private/template/base.php b/lib/private/Template/Base.php
similarity index 100%
rename from lib/private/template/base.php
rename to lib/private/Template/Base.php
diff --git a/lib/private/template/cssresourcelocator.php b/lib/private/Template/CSSResourceLocator.php
similarity index 100%
rename from lib/private/template/cssresourcelocator.php
rename to lib/private/Template/CSSResourceLocator.php
diff --git a/lib/private/template/jsresourcelocator.php b/lib/private/Template/JSResourceLocator.php
similarity index 100%
rename from lib/private/template/jsresourcelocator.php
rename to lib/private/Template/JSResourceLocator.php
diff --git a/lib/private/template/resourcelocator.php b/lib/private/Template/ResourceLocator.php
similarity index 100%
rename from lib/private/template/resourcelocator.php
rename to lib/private/Template/ResourceLocator.php
diff --git a/lib/private/template/resourcenotfoundexception.php b/lib/private/Template/ResourceNotFoundException.php
similarity index 100%
rename from lib/private/template/resourcenotfoundexception.php
rename to lib/private/Template/ResourceNotFoundException.php
diff --git a/lib/private/template/templatefilelocator.php b/lib/private/Template/TemplateFileLocator.php
similarity index 100%
rename from lib/private/template/templatefilelocator.php
rename to lib/private/Template/TemplateFileLocator.php
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php
index 84b963e4ab64a272921e00cdc3661658c031e96b..7372552970288599b56dc225848999d8ab0ecc5c 100644
--- a/lib/private/legacy/template.php
+++ b/lib/private/legacy/template.php
@@ -36,7 +36,7 @@
 
 use OC\TemplateLayout;
 
-require_once __DIR__.'/../template/functions.php';
+require_once __DIR__.'/template/functions.php';
 
 /**
  * This class provides the templates for ownCloud.
diff --git a/lib/private/template/functions.php b/lib/private/legacy/template/functions.php
similarity index 100%
rename from lib/private/template/functions.php
rename to lib/private/legacy/template/functions.php
diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index d7573337f870a3e172f8767e0b42c36d6e05636b..7ed121d3556cbaa9afcabfd4bd42e8e10e605183 100644
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -423,7 +423,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 	 */
 	protected function assertTemplate($expectedHtml, $template, $vars = []) {
 
-		require_once __DIR__.'/../../lib/private/template/functions.php';
+		require_once __DIR__.'/../../lib/private/legacy/template/functions.php';
 
 		$requestToken = 12345;
 		$theme = new OC_Defaults();