diff --git a/lib/SimpleSAML/Auth/ProcessingChain.php b/lib/SimpleSAML/Auth/ProcessingChain.php
index 9f7daf3a3b2bb55cf4576fa3935c1003a269b293..a82d51334a2efa2ae2a7a0a07b8592975df7f407 100644
--- a/lib/SimpleSAML/Auth/ProcessingChain.php
+++ b/lib/SimpleSAML/Auth/ProcessingChain.php
@@ -153,7 +153,7 @@ class ProcessingChain
 
         $className = \SimpleSAML\Module::resolveClass(
             $config['class'],
-            'Auth_Process',
+            'Auth\Process',
             '\SimpleSAML\Auth\ProcessingFilter'
         );
         $config['%priority'] = $priority;
diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php
index 9cd8486415c308341b93a76a550d4d7ae8fe03f1..d24f6e774fe841b6c37acf973d38e08845f41f33 100644
--- a/lib/SimpleSAML/Auth/Source.php
+++ b/lib/SimpleSAML/Auth/Source.php
@@ -306,7 +306,7 @@ abstract class Source
             // Check whether or not there's a factory responsible for instantiating our Auth Source instance
             $factoryClass = \SimpleSAML\Module::resolveClass(
                 $id,
-                'Auth_Source_Factory',
+                'Auth\Source\Factory',
                 '\SimpleSAML\Auth\SourceFactory'
             );
 
@@ -315,7 +315,7 @@ abstract class Source
             $authSource = $factory->create($info, $config);
         } catch (\Exception $e) {
             // If not, instantiate the Auth Source here
-            $className = \SimpleSAML\Module::resolveClass($id, 'Auth_Source', '\SimpleSAML\Auth\Source');
+            $className = \SimpleSAML\Module::resolveClass($id, 'Auth\Source', '\SimpleSAML\Auth\Source');
             $authSource = new $className($info, $config);
         }
 
diff --git a/lib/SimpleSAML/Stats.php b/lib/SimpleSAML/Stats.php
index 8c2987c828d08ffb09d18075fcc5cc41ad3b2e14..56d07c3022fc25ad79940198e87595254009808b 100644
--- a/lib/SimpleSAML/Stats.php
+++ b/lib/SimpleSAML/Stats.php
@@ -38,7 +38,7 @@ class Stats
     private static function createOutput(\SimpleSAML\Configuration $config)
     {
         $cls = $config->getString('class');
-        $cls = \SimpleSAML\Module::resolveClass($cls, 'Stats_Output', '\SimpleSAML\Stats\Output');
+        $cls = \SimpleSAML\Module::resolveClass($cls, 'Stats\Output', '\SimpleSAML\Stats\Output');
 
         $output = new $cls($config);
         return $output;