diff --git a/lib/SimpleSAML/IdP.php b/lib/SimpleSAML/IdP.php
index d0b32225776cc49d41a4130a9bc54299b08938f9..7fa5fed3f4fe00ae075a6d258ff6c7a63cd33adc 100644
--- a/lib/SimpleSAML/IdP.php
+++ b/lib/SimpleSAML/IdP.php
@@ -49,7 +49,7 @@ class SimpleSAML_IdP
     /**
      * Our authsource.
      *
-     * @var SimpleSAML_Auth_Simple
+     * @var \SimpleSAML\Auth\Simple
      */
     private $authSource;
 
@@ -103,7 +103,7 @@ class SimpleSAML_IdP
 
         $auth = $this->config->getString('auth');
         if (SimpleSAML_Auth_Source::getById($auth) !== null) {
-            $this->authSource = new SimpleSAML_Auth_Simple($auth);
+            $this->authSource = new \SimpleSAML\Auth\Simple($auth);
         } else {
             throw new SimpleSAML_Error_Exception('No such "'.$auth.'" auth source found.');
         }
diff --git a/lib/SimpleSAML/Utils/Auth.php b/lib/SimpleSAML/Utils/Auth.php
index 68a72129534056d9a4131728ccf18036c646a7e4..5360f74da0082e23911da5a27261a989a8892a78 100644
--- a/lib/SimpleSAML/Utils/Auth.php
+++ b/lib/SimpleSAML/Utils/Auth.php
@@ -65,7 +65,7 @@ class Auth
 
         // not authenticated as admin user, start authentication
         if (\SimpleSAML_Auth_Source::getById('admin') !== null) {
-            $as = new \SimpleSAML_Auth_Simple('admin');
+            $as = new \SimpleSAML\Auth\Simple('admin');
             $as->login();
         } else {
             throw new \SimpleSAML_Error_Exception(
diff --git a/modules/casserver/www/login.php b/modules/casserver/www/login.php
index 008018b924b0ea55ec1dfeede950956442e62099..f7ab7de8b5c9c397747b843dc0526ff9939350e0 100644
--- a/modules/casserver/www/login.php
+++ b/modules/casserver/www/login.php
@@ -28,7 +28,7 @@ $auth = $casconfig->getValue('auth', 'saml2');
 if (!in_array($auth, array('saml2', 'shib13')))
  	throw new Exception('CAS Service configured to use [auth] = ' . $auth . ' only [saml2,shib13] is legal.');
  
-$as = new SimpleSAML_Auth_Simple($auth);
+$as = new \SimpleSAML\Auth\Simple($auth);
 if (!$as->isAuthenticated()) {
 	$params = array(
 		'ForceAuthn' => $forceAuthn,
diff --git a/modules/consentAdmin/www/consentAdmin.php b/modules/consentAdmin/www/consentAdmin.php
index f41733de33dbc05bc1c2621c68fe664c7152e365..f3760a64805c2e49e5365a86de6e9c2c110e6280 100644
--- a/modules/consentAdmin/www/consentAdmin.php
+++ b/modules/consentAdmin/www/consentAdmin.php
@@ -70,7 +70,7 @@ $config = SimpleSAML_Configuration::getInstance();
 $cA_config = SimpleSAML_Configuration::getConfig('module_consentAdmin.php');
 $authority = $cA_config->getValue('authority');
 
-$as = new SimpleSAML_Auth_Simple($authority);
+$as = new \SimpleSAML\Auth\Simple($authority);
 
 // If request is a logout request
 if (array_key_exists('logout', $_REQUEST)) {
diff --git a/modules/core/www/as_login.php b/modules/core/www/as_login.php
index 189e05408248feb7d159db21028cd7774a563784..e43a77898b7d7faa6d17279003fddad88aee2279 100644
--- a/modules/core/www/as_login.php
+++ b/modules/core/www/as_login.php
@@ -29,7 +29,7 @@ if (!empty($_REQUEST['saml:idp'])) {
 	$options['saml:idp'] = $_REQUEST['saml:idp'];
 }
 
-$as = new SimpleSAML_Auth_Simple($_REQUEST['AuthId']);
+$as = new \SimpleSAML\Auth\Simple($_REQUEST['AuthId']);
 $as->requireAuth($options);
 
 \SimpleSAML\Utils\HTTP::redirectTrustedURL($options['ReturnTo']);
diff --git a/modules/core/www/as_logout.php b/modules/core/www/as_logout.php
index f3bbf553583cd4e8ff66f3a7bb0d7c7f90002ed5..bfd92341534a75c243bc33a76944c2f9b564d9e3 100644
--- a/modules/core/www/as_logout.php
+++ b/modules/core/www/as_logout.php
@@ -14,5 +14,5 @@ if (!isset($_REQUEST['AuthId']) || !is_string($_REQUEST['AuthId'])) {
 	throw new SimpleSAML_Error_BadRequest('Missing AuthId parameter.');
 }
 
-$as = new SimpleSAML_Auth_Simple($_REQUEST['AuthId']);
+$as = new \SimpleSAML\Auth\Simple($_REQUEST['AuthId']);
 $as->logout(\SimpleSAML\Utils\HTTP::checkURLAllowed($_REQUEST['ReturnTo']));
diff --git a/modules/core/www/authenticate.php b/modules/core/www/authenticate.php
index d71082580dc294a0d8a489d6ae51456e767965db..c6932313b688453d3401a9e7e6818bf71b2abb2f 100644
--- a/modules/core/www/authenticate.php
+++ b/modules/core/www/authenticate.php
@@ -11,7 +11,7 @@ if (!array_key_exists('as', $_REQUEST)) {
 }
 
 $asId = (string) $_REQUEST['as'];
-$as = new SimpleSAML_Auth_Simple($asId);
+$as = new \SimpleSAML\Auth\Simple($asId);
 
 if (array_key_exists('logout', $_REQUEST)) {
     $as->logout($config->getBasePath().'logout.php');
diff --git a/modules/statistics/lib/AccessCheck.php b/modules/statistics/lib/AccessCheck.php
index a400f3377204f9b5f3671ff466cc1bc799624818..9cbed6f1308b43d3fe3c398db131108e580d9376 100644
--- a/modules/statistics/lib/AccessCheck.php
+++ b/modules/statistics/lib/AccessCheck.php
@@ -41,7 +41,7 @@ class sspmod_statistics_AccessCheck
 
         // We are using an authsource for login.
 
-        $as = new SimpleSAML_Auth_Simple($authsource);
+        $as = new \SimpleSAML\Auth\Simple($authsource);
         $as->requireAuth();
 
         // User logged in with auth source.
diff --git a/www/authmemcookie.php b/www/authmemcookie.php
index 91495913590cb1f451bad07edc668f593737ee51..d403aee138ba21a0429f5375329f369280832666 100644
--- a/www/authmemcookie.php
+++ b/www/authmemcookie.php
@@ -27,7 +27,7 @@ try {
     $amc = SimpleSAML_AuthMemCookie::getInstance();
 
     $sourceId = $amc->getAuthSource();
-    $s = new SimpleSAML_Auth_Simple($sourceId);
+    $s = new \SimpleSAML\Auth\Simple($sourceId);
 
     // check if the user is authorized. We attempt to authenticate the user if not
     $s->requireAuth();