diff --git a/src/Service/AccessCodeManager.php b/src/Service/AccessCodeManager.php
index c353cead2153da9a94986bf494b98b3a1f7ea1b8..aedbc7ec090169bc58092d58766e44495d6ea9f7 100644
--- a/src/Service/AccessCodeManager.php
+++ b/src/Service/AccessCodeManager.php
@@ -2,15 +2,15 @@
 
 namespace Drupal\access_code\Service;
 
-use Drupal\Component\Datetime\Time;
-use Drupal\Core\Config\ConfigFactory;
+use Drupal\Component\Datetime\TimeInterface;
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Database\Connection;
-use Drupal\Core\Extension\ModuleHandler;
+use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
-use Drupal\Core\Logger\LoggerChannelFactory;
-use Drupal\Core\Messenger\Messenger;
-use Drupal\Core\Routing\RedirectDestination;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
+use Drupal\Core\Messenger\MessengerInterface;
+use Drupal\Core\Routing\RedirectDestinationInterface;
 use Drupal\Core\Session\AccountProxy;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Url;
@@ -77,7 +77,7 @@ class AccessCodeManager {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactory $config_factory, LoggerChannelFactory $logger_factory, Connection $database, AccountProxy $current_user, UserDataInterface $user_data, Time $time, ModuleHandler $handler, RequestStack $stack, RedirectDestination $destination, Messenger $messenger) {
+  public function __construct(ConfigFactoryInterface $config_factory, LoggerChannelFactoryInterface $logger_factory, Connection $database, AccountProxy $current_user, UserDataInterface $user_data, TimeInterface $time, ModuleHandlerInterface $handler, RequestStack $stack, RedirectDestinationInterface $destination, MessengerInterface $messenger) {
     $this->config = $config_factory->get('access_code.settings');
     $this->logger = $logger_factory->get('access_code');
     $this->database = $database;