diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index cd0c4978f55b0..34f8e0ae365eb 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -1292,6 +1292,9 @@ public function deleteUnexistingFiles()
 			'/administrator/components/com_config/models/forms/index.html',
 			// Joomla 3.4.2
 			'/libraries/composer_autoload.php',
+			// Joomla 3.4.3
+			'/libraries/classloader.php',
+			'/libraries/ClassLoader.php',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode
diff --git a/build.xml b/build.xml
index 4bd25ce5189bb..085ce5f8d66af 100644
--- a/build.xml
+++ b/build.xml
@@ -78,7 +78,7 @@
 			<arg value="-d" />
 			<arg path="${basedir}/libraries/cms/,${basedir}/libraries/joomla/,${basedir}/libraries/legacy/,${basedir}/libraries/vendor/joomla/" />
 			<arg value="-f" />
-			<arg path="${basedir}/libraries/loader.php,${basedir}/libraries/platform.php,${basedir}/libraries/classloader.php" />
+			<arg path="${basedir}/libraries/loader.php,${basedir}/libraries/platform.php,${basedir}/libraries/cms/class/loader.php" />
 			<arg value="-t" />
 			<arg path="${basedir}/build/api/" />
 			<arg value="--template" />
diff --git a/build/phpcs/Joomla/ruleset.xml b/build/phpcs/Joomla/ruleset.xml
index 476b8d8e4f639..e858e9276d829 100644
--- a/build/phpcs/Joomla/ruleset.xml
+++ b/build/phpcs/Joomla/ruleset.xml
@@ -21,7 +21,7 @@
 
  <exclude-pattern type="relative">administrator/components/com_joomlaupdate/restore.php</exclude-pattern>
  <exclude-pattern type="relative">configuration.php</exclude-pattern>
- <exclude-pattern type="relative">libraries/ClassLoader.php</exclude-pattern>
+ <exclude-pattern type="relative">libraries/cms/class/loader.php</exclude-pattern>
  <exclude-pattern type="relative">libraries/composer_autoload.php</exclude-pattern>
  <exclude-pattern type="relative">plugins/captcha/recaptcha/recaptchalib.php</exclude-pattern>
 
diff --git a/libraries/cms.php b/libraries/cms.php
index a23e8de60e2a2..c2309cc20e425 100644
--- a/libraries/cms.php
+++ b/libraries/cms.php
@@ -34,7 +34,6 @@
 $loader->unregister();
 
 // Decorate Composer autoloader
-require_once JPATH_LIBRARIES . '/classloader.php';
 spl_autoload_register(array(new JClassLoader($loader), 'loadClass'), true, true);
 
 // Register the class aliases for Framework classes that have replaced their Platform equivilents
diff --git a/libraries/classloader.php b/libraries/cms/class/loader.php
similarity index 100%
rename from libraries/classloader.php
rename to libraries/cms/class/loader.php