diff --git a/modules/decoupled_domain_access/decoupled_domain_access.info.yml b/modules/decoupled_domain_access/decoupled_domain_access.info.yml
index 21f309c..3706fe0 100644
--- a/modules/decoupled_domain_access/decoupled_domain_access.info.yml
+++ b/modules/decoupled_domain_access/decoupled_domain_access.info.yml
@@ -4,5 +4,5 @@ description: 'Simple Entity Access based on the Decoupled Domain reference field
 core_version_requirement: ^9 || ^10
 package: 'Decoupled Domain'
 dependencies:
-  - decoupled_domain
-  - decoupled_domain_user
+  - drupal:decoupled_domain
+  - drupal:decoupled_domain_user
diff --git a/modules/decoupled_domain_node/decoupled_domain_node.info.yml b/modules/decoupled_domain_node/decoupled_domain_node.info.yml
index 7bb7e42..c7d99f0 100644
--- a/modules/decoupled_domain_node/decoupled_domain_node.info.yml
+++ b/modules/decoupled_domain_node/decoupled_domain_node.info.yml
@@ -4,5 +4,5 @@ description: 'Adds Decoupled Domain functionality for nodes.'
 core_version_requirement: ^9 || ^10
 package: 'Decoupled Domain'
 dependencies:
-  - decoupled_domain
-  - node
+  - drupal:decoupled_domain
+  - drupal:node
diff --git a/modules/decoupled_domain_router/decoupled_domain_router.info.yml b/modules/decoupled_domain_router/decoupled_domain_router.info.yml
index 71b05f0..3e3421b 100644
--- a/modules/decoupled_domain_router/decoupled_domain_router.info.yml
+++ b/modules/decoupled_domain_router/decoupled_domain_router.info.yml
@@ -4,5 +4,5 @@ description: 'Integrates Decoupled Domain with Decoupled Router'
 core_version_requirement: ^9 || ^10
 package: 'Decoupled Domain'
 dependencies:
-  - decoupled_domain
-  - decoupled_router
+  - drupal:decoupled_domain
+  - drupal:decoupled_router
diff --git a/modules/decoupled_domain_user/decoupled_domain_user.info.yml b/modules/decoupled_domain_user/decoupled_domain_user.info.yml
index d26bb43..a32d102 100644
--- a/modules/decoupled_domain_user/decoupled_domain_user.info.yml
+++ b/modules/decoupled_domain_user/decoupled_domain_user.info.yml
@@ -4,5 +4,5 @@ description: 'Adds Decoupled Domain functionality for users.'
 core_version_requirement: ^9 || ^10
 package: 'Decoupled Domain'
 dependencies:
-  - decoupled_domain
-  - user
+  - drupal:decoupled_domain
+  - drupal:user
diff --git a/src/DomainConfigPluginCollection.php b/src/DomainConfigPluginCollection.php
index 7e4172d..2a7990b 100644
--- a/src/DomainConfigPluginCollection.php
+++ b/src/DomainConfigPluginCollection.php
@@ -35,16 +35,6 @@ class DomainConfigPluginCollection extends DefaultLazyPluginCollection {
     $this->domain = $domain;
   }
 
-  /**
-   * {@inheritdoc}
-   *
-   * @return \Drupal\decoupled_domain\Plugin\DecoupledDomainConfigInterface
-   *   Single Decoupled domain configuration.
-   */
-  public function &get($instance_id) {
-    return parent::get($instance_id);
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/src/Form/DomainConfigFormBase.php b/src/Form/DomainConfigFormBase.php
index 58e204f..87b9211 100644
--- a/src/Form/DomainConfigFormBase.php
+++ b/src/Form/DomainConfigFormBase.php
@@ -61,8 +61,7 @@ abstract class DomainConfigFormBase extends FormBase {
     catch (PluginNotFoundException $e) {
       throw new NotFoundHttpException("Invalid config id: '$domain_config'.");
     }
-    $request = $this->getRequest();
-
+    // $request = $this->getRequest();
     if (!($this->config instanceof ConfigurableDecoupledDomainConfigInterface)) {
       throw new NotFoundHttpException();
     }
diff --git a/src/Plugin/DecoupledDomainEntityManager.php b/src/Plugin/DecoupledDomainEntityManager.php
index 05be3be..bf9379e 100644
--- a/src/Plugin/DecoupledDomainEntityManager.php
+++ b/src/Plugin/DecoupledDomainEntityManager.php
@@ -58,13 +58,13 @@ class DecoupledDomainEntityManager extends DefaultPluginManager {
   public function getBasicExtraFields($entity_type) {
     $fields = [];
     $fields['decoupled_domain'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Domain'))
+      ->setLabel($this->t('Domain'))
       ->setCardinality(BaseFieldDefinition::CARDINALITY_UNLIMITED)
-      ->setDescription(t('The domains the node is part of.'))
+      ->setDescription($this->t('The domains the node is part of.'))
       ->setSetting('target_type', 'decoupled_domain');
     $fields['decoupled_domain_canonical'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Canonical Domain'))
-      ->setDescription(t('The canonical domain for the node.'))
+      ->setLabel($this->t('Canonical Domain'))
+      ->setDescription($this->t('The canonical domain for the node.'))
       ->setSetting('target_type', 'decoupled_domain');
 
     $this->createInstanceByEntityType($entity_type)->alterExtraFields($fields);
@@ -84,7 +84,7 @@ class DecoupledDomainEntityManager extends DefaultPluginManager {
 
     $form['decoupled_domain'] = [
       '#type' => 'details',
-      '#title' => t('Decoupled Domain'),
+      '#title' => $this->t('Decoupled Domain'),
       '#collapsed' => FALSE,
       '#collapsible' => TRUE,
       '#tree' => TRUE,
@@ -94,14 +94,14 @@ class DecoupledDomainEntityManager extends DefaultPluginManager {
     ];
     $form['decoupled_domain']['status'] = [
       '#type' => 'checkbox',
-      '#title' => t('Enable decoupled domain for this entity bundle'),
+      '#title' => $this->t('Enable decoupled domain for this entity bundle'),
       '#attributes' => ['class' => ['decoupled-domain-settings-status']],
     ];
     $form['decoupled_domain']['allowed_domains'] = [
       '#type' => 'checkboxes',
-      '#title' => t('Allowed domains'),
+      '#title' => $this->t('Allowed domains'),
       '#options' => $options,
-      '#description' => t('Leave empty to allow all.'),
+      '#description' => $this->t('Leave empty to allow all.'),
       '#attributes' => ['class' => ['decoupled-domain-settings-allowed-domains']],
     ];
     $form['decoupled_domain']['entity_type_id'] = [
@@ -182,7 +182,7 @@ class DecoupledDomainEntityManager extends DefaultPluginManager {
 
     $form['decoupled_domain'] = [
       '#type' => 'details',
-      '#title' => t('Decoupled Domain'),
+      '#title' => $this->t('Decoupled Domain'),
       '#collapsed' => FALSE,
       '#collapsible' => TRUE,
       '#tree' => TRUE,