diff --git a/lib/SimpleSAML/Utils/Config/Metadata.php b/lib/SimpleSAML/Utils/Config/Metadata.php
index 1d34039cb64d94f92445a0606460731c026039b2..7c66f290cd1aec631b3e06ac496a2cd251a2ccb6 100644
--- a/lib/SimpleSAML/Utils/Config/Metadata.php
+++ b/lib/SimpleSAML/Utils/Config/Metadata.php
@@ -296,7 +296,7 @@ class Metadata
             $policy = ['Format' => $nameIdPolicy];
         } elseif (is_array($nameIdPolicy)) {
             // handle current configurations specifying an array in the NameIDPolicy config option
-            $nameIdPolicy_cf = \SimpleSAML_Configuration::loadFromArray($nameIdPolicy);
+            $nameIdPolicy_cf = \SimpleSAML\Configuration::loadFromArray($nameIdPolicy);
             $policy = [
                 'Format'      => $nameIdPolicy_cf->getString('Format', \SAML2\Constants::NAMEID_TRANSIENT),
                 'AllowCreate' => $nameIdPolicy_cf->getBoolean('AllowCreate', true),
diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index 89a580d36f207daf0f5bf2d13da3e6478fefa2a2..1289d31e9880e28f0a9b54b0e3fd4a0ff7ab5575 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -142,7 +142,7 @@ if ($certInfo !== null && array_key_exists('certData', $certInfo)) {
 $format = $spconfig->getValue('NameIDPolicy', null);
 if ($format !== null) {
     if (is_array($format)) {
-        $metaArray20['NameIDFormat'] = SimpleSAML_Configuration::loadFromArray($format)->getString(
+        $metaArray20['NameIDFormat'] = \SimpleSAML\Configuration::loadFromArray($format)->getString(
             'Format',
             \SAML2\Constants::NAMEID_TRANSIENT
         );
diff --git a/tests/modules/consent/lib/Auth/Process/ConsentTest.php b/tests/modules/consent/lib/Auth/Process/ConsentTest.php
index 1e162314720ab0cdeda95d15f02456c15b9c8a94..e9008f3d6584d21861525038bf0853668fa004d8 100644
--- a/tests/modules/consent/lib/Auth/Process/ConsentTest.php
+++ b/tests/modules/consent/lib/Auth/Process/ConsentTest.php
@@ -16,7 +16,7 @@ class ConsentTest extends TestCase
     public function setUp()
     {
         $this->config = Configuration::loadFromArray(['module.enable' => ['consent' => true]], '[ARRAY]', 'simplesaml');
-        \SimpleSAML_Configuration::setPreLoadedConfig($this->config, 'config.php');
+        Configuration::setPreLoadedConfig($this->config, 'config.php');
     }
 
     /**