diff --git a/src/Client/BossClientFactory.php b/src/Client/BossClientFactory.php
index 4ce27a4102d67d946620ede291b60004934ba535..9d4fa326e21e00521816cdff45d287a13367dfc5 100644
--- a/src/Client/BossClientFactory.php
+++ b/src/Client/BossClientFactory.php
@@ -20,7 +20,6 @@
  */
 namespace finc\Boss\Client;
 
-use finc\Boss\Client\BossClient as BossClient;
 use Interop\Container\ContainerInterface;
 use Psr\Http\Client\ClientInterface;
 
diff --git a/src/Module.php b/src/Module.php
index 13f16e35bc6609b95d7a76f81b5143e9bba70a5b..1efbe441991328dfa68102996703b510ac4b78af 100644
--- a/src/Module.php
+++ b/src/Module.php
@@ -20,6 +20,11 @@
  */
 namespace finc\Boss;
 
+use finc\Boss\AjaxHandler\GetBoss;
+use finc\Boss\AjaxHandler\GetBossFactory;
+use finc\Boss\Client\BossClient;
+use finc\Boss\Client\BossClientFactory;
+
 class Module
 {
     public function __construct()
@@ -38,20 +43,14 @@ class Module
             'service_manager' => [
                 'allow_override' => true,
                 'factories' => [
-                    'finc\Boss\Client\Client\BossClient' => 'finc\Boss\Client\Client\ClientFactory'
-                ],
-                'aliases' => [
-                    'finc\BossClient' => 'finc\Boss\Client\Client\BossClient'
+                    BossClient::class => BossClientFactory::class
                 ]
             ],
             'vufind' => [
                 'plugin_managers' => [
                     'ajaxhandler' => [
                         'factories' => [
-                            'finc\Boss\AjaxHandler\GetBoss' => 'finc\Boss\AjaxHandler\GetBossFactory'
-                        ],
-                        'aliases' => [
-                            'getBoss' => 'finc\Boss\AjaxHandler\GetBoss'
+                            GetBoss::class => GetBossFactory::class
                         ]
                     ]
                 ]