diff --git a/apps/admin_audit/composer/composer.json b/apps/admin_audit/composer/composer.json
index ae9b104b697cf4b66fd671b5d8ab12af1f02a0df..e55d720f8bf9b7bcd1d39a819a3feeb66c425e02 100644
--- a/apps/admin_audit/composer/composer.json
+++ b/apps/admin_audit/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "AdminAudit"
     },
     "autoload" : {
diff --git a/apps/admin_audit/composer/composer/autoload_real.php b/apps/admin_audit/composer/composer/autoload_real.php
index 1cbbc489538f3462152edf86079b7c4e3a4fb797..8c3108af88c0c1218d9b613af02b62d6ac1a587b 100644
--- a/apps/admin_audit/composer/composer/autoload_real.php
+++ b/apps/admin_audit/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitAdminAudit
 
             call_user_func(\Composer\Autoload\ComposerStaticInitAdminAudit::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/comments/composer/composer.json b/apps/comments/composer/composer.json
index 523394b5d8e7bcebe676947b25cb79c36e2f230a..40fe9ae34be323a7f511f487a55d732b289af11f 100644
--- a/apps/comments/composer/composer.json
+++ b/apps/comments/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "Comments"
     },
     "autoload" : {
diff --git a/apps/comments/composer/composer/autoload_real.php b/apps/comments/composer/composer/autoload_real.php
index 1ce284f24f4f9ec7a40cf372d24c9938fd342165..40e29b668a4db444ff28d714f116da7281ed8d9c 100644
--- a/apps/comments/composer/composer/autoload_real.php
+++ b/apps/comments/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitComments
 
             call_user_func(\Composer\Autoload\ComposerStaticInitComments::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/dav/composer/composer.json b/apps/dav/composer/composer.json
index e783ae8ad15e835463feb5ca3a75f64b598016f2..c4c5a654f806d370f409a8ed82e1ea976e279c9a 100644
--- a/apps/dav/composer/composer.json
+++ b/apps/dav/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "DAV"
     },
     "autoload" : {
diff --git a/apps/dav/composer/composer/autoload_real.php b/apps/dav/composer/composer/autoload_real.php
index cd699e0b4fdd08cb2d674cbb318c70881a417218..044f006c3b679dd752f4c419bf0cb22e0c96f1ed 100644
--- a/apps/dav/composer/composer/autoload_real.php
+++ b/apps/dav/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitDAV
 
             call_user_func(\Composer\Autoload\ComposerStaticInitDAV::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/encryption/composer/composer.json b/apps/encryption/composer/composer.json
index 5b38c9dc683268440480d31317a5410e70de8e4b..4211734dbf5b118239853ea785db976895d2bf39 100644
--- a/apps/encryption/composer/composer.json
+++ b/apps/encryption/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "Encryption"
     },
     "autoload" : {
diff --git a/apps/encryption/composer/composer/autoload_real.php b/apps/encryption/composer/composer/autoload_real.php
index fae90387a092bae5739bb1505aef60ec631c1d63..f79c0265ce06427aab43f49af8dd2c8491c3cffc 100644
--- a/apps/encryption/composer/composer/autoload_real.php
+++ b/apps/encryption/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitEncryption
 
             call_user_func(\Composer\Autoload\ComposerStaticInitEncryption::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/federatedfilesharing/composer/composer.json b/apps/federatedfilesharing/composer/composer.json
index 3cb32db12f2b7defc0475be98d1856dd37479ee9..effe5afe0f21aca43ef281e9a46295169c5bad7b 100644
--- a/apps/federatedfilesharing/composer/composer.json
+++ b/apps/federatedfilesharing/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "FederatedFileSharing"
     },
     "autoload" : {
diff --git a/apps/federatedfilesharing/composer/composer/autoload_real.php b/apps/federatedfilesharing/composer/composer/autoload_real.php
index bdc3ad006aea5bb05e5e95aaac70ec567bcc5063..6f491ff41755e23c8af6e159cbd2324288f84dee 100644
--- a/apps/federatedfilesharing/composer/composer/autoload_real.php
+++ b/apps/federatedfilesharing/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitFederatedFileSharing
 
             call_user_func(\Composer\Autoload\ComposerStaticInitFederatedFileSharing::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/federation/composer/composer.json b/apps/federation/composer/composer.json
index 2c9a66b242c26747c18e7e0cd019a916c0c64f3c..affe383c1c8128e9be91b3ca32a1c0fb8275c497 100644
--- a/apps/federation/composer/composer.json
+++ b/apps/federation/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "Federation"
     },
     "autoload" : {
diff --git a/apps/federation/composer/composer/autoload_real.php b/apps/federation/composer/composer/autoload_real.php
index f2906437fdb893312f5dfcf0d8d4cee987c12a3b..39f8fb171dc1b0895f3ed84c7bebbdba296f5035 100644
--- a/apps/federation/composer/composer/autoload_real.php
+++ b/apps/federation/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitFederation
 
             call_user_func(\Composer\Autoload\ComposerStaticInitFederation::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/files/composer/composer.json b/apps/files/composer/composer.json
index 3412d9507b2526fce08388b124cb3bfa1d5d95b0..4777604b5bfbbe3d5112d3c48a8aef0fae69bce9 100644
--- a/apps/files/composer/composer.json
+++ b/apps/files/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "Files"
     },
     "autoload" : {
diff --git a/apps/files/composer/composer/autoload_real.php b/apps/files/composer/composer/autoload_real.php
index fe9ef0b02aeec006242ff4439adfbfdc3a51609b..3e6eddd34f5f319bbdb663b6558303befc266bc6 100644
--- a/apps/files/composer/composer/autoload_real.php
+++ b/apps/files/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitFiles
 
             call_user_func(\Composer\Autoload\ComposerStaticInitFiles::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/files_sharing/composer/composer.json b/apps/files_sharing/composer/composer.json
index d500819ff82f139abd89ca6f6c9718d796f15605..145655efbf31ce7be92058732a12b46d52c1d299 100644
--- a/apps/files_sharing/composer/composer.json
+++ b/apps/files_sharing/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "Files_Sharing"
     },
     "autoload" : {
diff --git a/apps/files_sharing/composer/composer/autoload_real.php b/apps/files_sharing/composer/composer/autoload_real.php
index 504c701247f74c6c8a8254e88b58ab6076a98d68..bd07706a2882d846e77d62dd1080803e80767b2b 100644
--- a/apps/files_sharing/composer/composer/autoload_real.php
+++ b/apps/files_sharing/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitFiles_Sharing
 
             call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Sharing::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/files_trashbin/composer/composer.json b/apps/files_trashbin/composer/composer.json
index c43b78e83ea45260e01ecba431a5d04c33858d70..81035a0746e2ac8f0c5bb29428963a348619df2a 100644
--- a/apps/files_trashbin/composer/composer.json
+++ b/apps/files_trashbin/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "Files_Trashbin"
     },
     "autoload" : {
diff --git a/apps/files_trashbin/composer/composer/autoload_real.php b/apps/files_trashbin/composer/composer/autoload_real.php
index b2abf10922c8318c7ae30b0326dac905dc4a38c2..7b05d7dd53aa364c0e4b53f7249859146133a705 100644
--- a/apps/files_trashbin/composer/composer/autoload_real.php
+++ b/apps/files_trashbin/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitFiles_Trashbin
 
             call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Trashbin::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/files_versions/composer/composer.json b/apps/files_versions/composer/composer.json
index fdad5a69ddb508397f0ce30c6b61ecbb2ade6dfc..790e954711380de799f36e421c41783a918444a3 100644
--- a/apps/files_versions/composer/composer.json
+++ b/apps/files_versions/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "Files_Versions"
     },
     "autoload" : {
diff --git a/apps/files_versions/composer/composer/autoload_real.php b/apps/files_versions/composer/composer/autoload_real.php
index 8479a1f199b6dacea9b4173cdd5b77281b95f2df..8ef47ad2b7603ae4cdc1072b7b3c5b50bc7ef976 100644
--- a/apps/files_versions/composer/composer/autoload_real.php
+++ b/apps/files_versions/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitFiles_Versions
 
             call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Versions::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/lookup_server_connector/composer/composer.json b/apps/lookup_server_connector/composer/composer.json
index 5ff3be7e18bd89182da55e90b08860d4c3c66f26..78a76b2d1e13a9ea7eeccff6d18ea15dfc48375c 100644
--- a/apps/lookup_server_connector/composer/composer.json
+++ b/apps/lookup_server_connector/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "LookupServerConnector"
     },
     "autoload" : {
diff --git a/apps/lookup_server_connector/composer/composer/autoload_real.php b/apps/lookup_server_connector/composer/composer/autoload_real.php
index 92627f9dfaa48b724cedd6bcf40e2f624ed9135d..a19405c7127774bb1aa646f411a4d16ebe8e2cf5 100644
--- a/apps/lookup_server_connector/composer/composer/autoload_real.php
+++ b/apps/lookup_server_connector/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitLookupServerConnector
 
             call_user_func(\Composer\Autoload\ComposerStaticInitLookupServerConnector::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/oauth2/composer/composer.json b/apps/oauth2/composer/composer.json
index 95fe2e1604ea29863332235085390fa16c3d013d..78f235f3c2ef875544eb46aa56bbc84ee8c375fe 100644
--- a/apps/oauth2/composer/composer.json
+++ b/apps/oauth2/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "OAuth2"
     },
     "autoload" : {
diff --git a/apps/oauth2/composer/composer/autoload_real.php b/apps/oauth2/composer/composer/autoload_real.php
index 855ff3261b343232bef0f5c40e40b5acf40f06c3..111841c0f835c93c6393ee5f830452fbb190d073 100644
--- a/apps/oauth2/composer/composer/autoload_real.php
+++ b/apps/oauth2/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitOAuth2
 
             call_user_func(\Composer\Autoload\ComposerStaticInitOAuth2::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/provisioning_api/composer/composer.json b/apps/provisioning_api/composer/composer.json
index ea2a43abc8e02c1e6f740c92a9b2ff7e7aeaa501..a5130163cec92eb77253b92f674d2a970606b580 100644
--- a/apps/provisioning_api/composer/composer.json
+++ b/apps/provisioning_api/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "Provisioning_API"
     },
     "autoload" : {
diff --git a/apps/provisioning_api/composer/composer/autoload_real.php b/apps/provisioning_api/composer/composer/autoload_real.php
index c55cebd2f631c9c582047b38d830b0095c22f88e..33867a60f698e5c361b2223e27eb1deaa1084d26 100644
--- a/apps/provisioning_api/composer/composer/autoload_real.php
+++ b/apps/provisioning_api/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitProvisioning_API
 
             call_user_func(\Composer\Autoload\ComposerStaticInitProvisioning_API::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/sharebymail/composer/composer.json b/apps/sharebymail/composer/composer.json
index 3e7359c114a6f591650eaae0774dc09f2f31ff8e..160930a37ad9d571afbb111819f18942e01b7634 100644
--- a/apps/sharebymail/composer/composer.json
+++ b/apps/sharebymail/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "ShareByMail"
     },
     "autoload" : {
diff --git a/apps/sharebymail/composer/composer/autoload_real.php b/apps/sharebymail/composer/composer/autoload_real.php
index b03d256defe84fd87acced805f548cbe9178cdc2..9149cbd9155fb92f92c4c7d74667529dd18e0c93 100644
--- a/apps/sharebymail/composer/composer/autoload_real.php
+++ b/apps/sharebymail/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitShareByMail
 
             call_user_func(\Composer\Autoload\ComposerStaticInitShareByMail::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/systemtags/composer/composer.json b/apps/systemtags/composer/composer.json
index 06b4e7f1df42134253545aae41536dc1935e6765..1c2bdf004eeaee4d253f80885f7339d5c1f3ea3b 100644
--- a/apps/systemtags/composer/composer.json
+++ b/apps/systemtags/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "SystemTags"
     },
     "autoload" : {
diff --git a/apps/systemtags/composer/composer/autoload_real.php b/apps/systemtags/composer/composer/autoload_real.php
index a085cdeb46d093381d2f259b84f07ed26ed48956..dcd4bd99c3139126e348afa76d36c6a3f84c1511 100644
--- a/apps/systemtags/composer/composer/autoload_real.php
+++ b/apps/systemtags/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitSystemTags
 
             call_user_func(\Composer\Autoload\ComposerStaticInitSystemTags::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/testing/composer/composer.json b/apps/testing/composer/composer.json
index 4cee66ac0946fe152184d9ef084f0548a1fcbd2c..769aaf70fd7da0575c8c94f0c0cf584fbdaaec89 100644
--- a/apps/testing/composer/composer.json
+++ b/apps/testing/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "Testing"
     },
     "autoload" : {
diff --git a/apps/testing/composer/composer/autoload_real.php b/apps/testing/composer/composer/autoload_real.php
index 71369dc8a050d865c09375cfca14c2ae492494f1..611d8e41c959f60b7dfa46c61592cd58008016bd 100644
--- a/apps/testing/composer/composer/autoload_real.php
+++ b/apps/testing/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitTesting
 
             call_user_func(\Composer\Autoload\ComposerStaticInitTesting::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/twofactor_backupcodes/composer/composer.json b/apps/twofactor_backupcodes/composer/composer.json
index ef521965208989f6e2b72f8872e89b6a26995b8e..bfa807a8e4f230793c1e3745837dacf307d29489 100644
--- a/apps/twofactor_backupcodes/composer/composer.json
+++ b/apps/twofactor_backupcodes/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "TwoFactorBackupCodes"
     },
     "autoload" : {
diff --git a/apps/twofactor_backupcodes/composer/composer/autoload_real.php b/apps/twofactor_backupcodes/composer/composer/autoload_real.php
index 435d883ffa0190456dd786f38f13cb4579d155b4..9e6baad706d55a72e913981af8f9ceb94dd420e8 100644
--- a/apps/twofactor_backupcodes/composer/composer/autoload_real.php
+++ b/apps/twofactor_backupcodes/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitTwoFactorBackupCodes
 
             call_user_func(\Composer\Autoload\ComposerStaticInitTwoFactorBackupCodes::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/updatenotification/composer/composer.json b/apps/updatenotification/composer/composer.json
index 3e14337eb69df87791f8785dd1a1aefade65e9da..1357d3f09b806f27f25346feec511bef50b7f675 100644
--- a/apps/updatenotification/composer/composer.json
+++ b/apps/updatenotification/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "UpdateNotification"
     },
     "autoload" : {
diff --git a/apps/updatenotification/composer/composer/autoload_real.php b/apps/updatenotification/composer/composer/autoload_real.php
index 41580edbf381b929d35558ea869bd784bb991313..263bae938673dcec885fcf761f761e26266ac3a0 100644
--- a/apps/updatenotification/composer/composer/autoload_real.php
+++ b/apps/updatenotification/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitUpdateNotification
 
             call_user_func(\Composer\Autoload\ComposerStaticInitUpdateNotification::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;
diff --git a/apps/user_ldap/composer/composer.json b/apps/user_ldap/composer/composer.json
index 0af0b6bea39c0c73303ee9b324a9652798bbabed..476e31250f607e87c76019ea3cbe822a1949da9b 100644
--- a/apps/user_ldap/composer/composer.json
+++ b/apps/user_ldap/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "User_LDAP"
     },
     "autoload" : {
diff --git a/apps/user_ldap/composer/composer/autoload_real.php b/apps/user_ldap/composer/composer/autoload_real.php
index ab7adf2412f910f955a2a50bc001faddf2d0408d..94d3383da77038891d75dd0c29a76e5b46a5e5a0 100644
--- a/apps/user_ldap/composer/composer/autoload_real.php
+++ b/apps/user_ldap/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitUser_LDAP
 
             call_user_func(\Composer\Autoload\ComposerStaticInitUser_LDAP::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;