diff --git a/Translator/Translator.php b/Translator/Translator.php
index fb5f28c..2208ba2 100644
--- a/Translator/Translator.php
+++ b/Translator/Translator.php
@@ -2,9 +2,8 @@
 
 declare(strict_types=1);
 
-namespace Piwik\Plugins\PasswordPolicyEnforcer;
+namespace Piwik\Plugins\PasswordPolicyEnforcer\Translator;
 
-use Piwik\Plugins\PasswordPolicyEnforcer\Translator\TranslatorInterface;
 use Piwik\Translation\Translator as MatomoTranslator;
 
 final class Translator implements TranslatorInterface
diff --git a/config/config.php b/config/config.php
index e497042..01627ed 100644
--- a/config/config.php
+++ b/config/config.php
@@ -3,10 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'Piwik\Plugins\PasswordPolicyEnforcer\Translator' => DI\object()->constructor(
+    'Piwik\Plugins\PasswordPolicyEnforcer\Translator\Translator' => DI\autowire()->constructor(
         DI\get('Piwik\Translation\Translator')
     ),
-    'Piwik\Plugins\PasswordPolicyEnforcer\Validators\PasswordValidator' => DI\object()->constructor(
-        DI\get('Piwik\Plugins\PasswordPolicyEnforcer\Translator')
+    'Piwik\Plugins\PasswordPolicyEnforcer\Validators\PasswordValidator' => DI\autowire()->constructor(
+        DI\get('Piwik\Plugins\PasswordPolicyEnforcer\Translator\Translator')
     ),
 ];
diff --git a/plugin.json b/plugin.json
index 3b79a4f..c45ad45 100644
--- a/plugin.json
+++ b/plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "PasswordPolicyEnforcer",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Adds a possibility to enforce Password Policy.",
   "theme": false,
   "keywords": [