diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index a8102845ed5b26a7e78904284ef2a9672a675de5..aad0f174aca344c336b80f9fc2b375a3acaaa2cf 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -314,7 +314,7 @@ $config = array(
             },
         ),
         'invokables' => array(
-            'authmanager' => 'VuFind\Auth\Manager',
+            'VuFind\AuthManager' => 'VuFind\Auth\Manager',
             'cart' => 'VuFind\Cart',
             'cachemanager' => 'VuFind\Cache\Manager',
             'mailer' => 'VuFind\Mailer',
diff --git a/module/VuFind/src/VuFind/Bootstrap.php b/module/VuFind/src/VuFind/Bootstrap.php
index 6ced5fdcee5c0f5a7c861708ea6bba8c844eb30c..30af544ad12b7983d99cd4362878e08bfe2ed647 100644
--- a/module/VuFind/src/VuFind/Bootstrap.php
+++ b/module/VuFind/src/VuFind/Bootstrap.php
@@ -152,7 +152,7 @@ class Bootstrap
         register_shutdown_function(array($sessionManager, 'writeClose'));
 
         // Make sure account credentials haven't expired:
-        $serviceManager->get('AuthManager')->checkForExpiredCredentials();
+        $serviceManager->get('VuFind\AuthManager')->checkForExpiredCredentials();
     }
 
     /**
diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php
index c90bf5e9c464583fd05da63c07616c4b8538e8c5..1635dec15a2f413a8649e0ad275207438c46498c 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php
@@ -82,7 +82,7 @@ class AbstractBase extends AbstractActionController
      */
     protected function getAuthManager()
     {
-        return $this->getServiceLocator()->get('AuthManager');
+        return $this->getServiceLocator()->get('VuFind\AuthManager');
     }
 
     /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Auth.php b/module/VuFind/src/VuFind/Theme/Root/Helper/Auth.php
index b074db25520e88e62245d26d501b538d15f0c813..048fdbc80c4a6564f4eee4249142191544e6ff5a 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Auth.php
+++ b/module/VuFind/src/VuFind/Theme/Root/Helper/Auth.php
@@ -89,7 +89,7 @@ class Auth extends AbstractServiceLocator
      */
     public function getManager()
     {
-        return $this->getServiceLocator()->get('AuthManager');
+        return $this->getServiceLocator()->get('VuFind\AuthManager');
     }
 
     /**