diff --git a/Module.php b/Module.php
index bd032e7b..aba23da4 100644
--- a/Module.php
+++ b/Module.php
@@ -43,7 +43,7 @@ public function getControllerConfig()
     {
         return array(
             'factories' => array(
-                'zfcuser' => 'ZfcUser\Factory\Controller\UserController',
+                'zfcuser' => 'ZfcUser\Factory\Controller\UserControllerFactory',
             ),
         );
     }
@@ -73,7 +73,7 @@ public function getServiceConfig()
                 'zfcuser_register_form_hydrator'    => 'Zend\Stdlib\Hydrator\ClassMethods',
             ),
             'factories' => array(
-                'zfcuser_redirect_callback' => 'ZfcUser\Factory\Controller\RedirectCallback',
+                'zfcuser_redirect_callback' => 'ZfcUser\Factory\Controller\RedirectCallbackFactory',
                 'zfcuser_module_options' => 'ZfcUser\Factory\Options\ModuleOptions',
                 'ZfcUser\Authentication\Adapter\AdapterChain' => 'ZfcUser\Authentication\Adapter\AdapterChainServiceFactory',
 
diff --git a/src/ZfcUser/Factory/Controller/RedirectCallback.php b/src/ZfcUser/Factory/Controller/RedirectCallbackFactory.php
similarity index 80%
rename from src/ZfcUser/Factory/Controller/RedirectCallback.php
rename to src/ZfcUser/Factory/Controller/RedirectCallbackFactory.php
index 0eb1fbfc..d3ea60b7 100644
--- a/src/ZfcUser/Factory/Controller/RedirectCallback.php
+++ b/src/ZfcUser/Factory/Controller/RedirectCallbackFactory.php
@@ -9,10 +9,14 @@
 namespace ZfcUser\Factory\Controller;
 
 
+use Zend\Mvc\Application;
+use Zend\Mvc\Router\RouteInterface;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
+use ZfcUser\Controller\RedirectCallback;
+use ZfcUser\Options\ModuleOptions;
 
-class RedirectCallback implements FactoryInterface
+class RedirectCallbackFactory implements FactoryInterface
 {
     /**
      * Create service
diff --git a/src/ZfcUser/Factory/Controller/UserController.php b/src/ZfcUser/Factory/Controller/UserControllerFactory.php
similarity index 86%
rename from src/ZfcUser/Factory/Controller/UserController.php
rename to src/ZfcUser/Factory/Controller/UserControllerFactory.php
index 82ced823..78ed0305 100644
--- a/src/ZfcUser/Factory/Controller/UserController.php
+++ b/src/ZfcUser/Factory/Controller/UserControllerFactory.php
@@ -11,8 +11,10 @@
 use Zend\Mvc\Controller\ControllerManager;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
+use ZfcUser\Controller\RedirectCallback;
+use ZfcUser\Controller\UserController;
 
-class UserController implements FactoryInterface
+class UserControllerFactory implements FactoryInterface
 {
 
     /**