diff --git a/lib/SimpleSAML/ModuleControllerResolver.php b/lib/SimpleSAML/Module/ControllerResolver.php
similarity index 94%
rename from lib/SimpleSAML/ModuleControllerResolver.php
rename to lib/SimpleSAML/Module/ControllerResolver.php
index a37ac93405f2c10cf1371e89f6b8916940a8109c..ba79109d100dde7da2701eecf4b6934744cf1292 100644
--- a/lib/SimpleSAML/ModuleControllerResolver.php
+++ b/lib/SimpleSAML/Module/ControllerResolver.php
@@ -1,15 +1,20 @@
 <?php
 
-namespace SimpleSAML;
+namespace SimpleSAML\Module;
 
 use SimpleSAML\Auth\AuthenticationFactory;
+use SimpleSAML\Configuration;
 use SimpleSAML\Error\Exception;
+use SimpleSAML\Module;
+use SimpleSAML\Session;
+
 use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
-use Symfony\Component\HttpKernel\Controller\ControllerResolver;
+use Symfony\Component\HttpKernel\Controller\ControllerResolver as SymfonyControllerResolver;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
@@ -26,7 +31,7 @@ use Symfony\Component\Routing\RouteCollection;
  *
  * @package SimpleSAML
  */
-class ModuleControllerResolver extends ControllerResolver implements ArgumentResolverInterface
+class ControllerResolver extends SymfonyControllerResolver implements ArgumentResolverInterface
 {
 
     /** @var ArgumentMetadataFactory */