diff --git a/config/services.yaml b/config/services.yaml
index 37d413c0..5dccbb13 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -40,7 +40,7 @@ services:
             $cache_dir: "%kernel.cache_dir%"
             $config_dir: "%kernel.root_dir%/../config"
 
-    App\Access\Generator:
+    Catalyst\AuthBundle\Service\Generator:
         arguments:
             $router: "@router.default"
             $cache_dir: "%kernel.cache_dir%"
@@ -48,9 +48,9 @@ services:
             $acl_file: "%app_acl_file%"
             $acl_key: "%app_access_key%"
 
-    App\Access\Voter:
+    Catalyst\AuthBundle\Service\Voter:
         arguments:
-            $acl_gen: "@App\\Access\\Generator"
+            $acl_gen: "@Catalyst\\AuthBundle\\Service\\Generator"
             $user_class: "App\\Entity\\User"
         tags: ['security.voter']
 
diff --git a/src/Access/Generator.php b/src/Access/Generator.php
deleted file mode 100644
index 8c2b4a78..00000000
--- a/src/Access/Generator.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Access;
-
-use Catalyst\AuthBundle\Service\Generator as BaseGenerator;
-
-class Generator extends BaseGenerator
-{
-}
diff --git a/src/Access/Voter.php b/src/Access/Voter.php
deleted file mode 100644
index 35f678c7..00000000
--- a/src/Access/Voter.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Access;
-
-use Catalyst\AuthBundle\Service\Voter as BaseVoter;
-
-class Voter extends BaseVoter
-{
-}