diff --git a/core/modules/content_moderation/src/Entity/ModerationStateTransition.php b/core/modules/content_moderation/src/Entity/ModerationStateTransition.php
index 4d355e6..2783926 100644
--- a/core/modules/content_moderation/src/Entity/ModerationStateTransition.php
+++ b/core/modules/content_moderation/src/Entity/ModerationStateTransition.php
@@ -18,7 +18,6 @@
  *       "edit" = "Drupal\content_moderation\Form\ModerationStateTransitionForm",
  *       "delete" = "Drupal\content_moderation\Form\ModerationStateTransitionDeleteForm"
  *     },
- *     "storage" = "Drupal\content_moderation\ModerationStateTransitionStorage"
  *   },
  *   config_prefix = "moderation_state_transition",
  *   admin_permission = "administer moderation state transitions",
@@ -72,23 +71,16 @@ class ModerationStateTransition extends ConfigEntityBase implements ModerationSt
   protected $weight;
 
   /**
-   * Moderation state config prefix
-   *
-   * @var string.
-   */
-  protected $moderationStateConfigPrefix;
-
-  /**
    * {@inheritdoc}
    */
   public function calculateDependencies() {
     parent::calculateDependencies();
-    $prefix = $this->getModerationStateConfigPrefix() . '.';
+
     if ($this->stateFrom) {
-      $this->addDependency('config', $prefix . $this->stateFrom);
+      $this->addDependency('config', ModerationState::load($this->stateFrom)->getConfigDependencyName());
     }
     if ($this->stateTo) {
-      $this->addDependency('config', $prefix . $this->stateTo);
+      $this->addDependency('config', ModerationState::load($this->stateTo)->getConfigDependencyName());
     }
     return $this;
   }
@@ -114,31 +106,4 @@ public function getWeight() {
     return $this->weight;
   }
 
-  /**
-   * Gets the moderation state config prefix.
-   *
-   * @return string
-   *   Moderation state config prefix.
-   */
-  protected function getModerationStateConfigPrefix() {
-    if (!isset($this->moderationStateConfigPrefix)) {
-      $this->moderationStateConfigPrefix = \Drupal::service('entity_type.manager')->getDefinition('moderation_state')->getConfigPrefix();
-    }
-    return $this->moderationStateConfigPrefix;
-  }
-
-  /**
-   * Sets the moderation state config prefix.
-   *
-   * @param string $moderation_state_config_prefix
-   *   Moderation state config prefix.
-   *
-   * @return self
-   *   Called instance.
-   */
-  public function setModerationStateConfigPrefix($moderation_state_config_prefix) {
-    $this->moderationStateConfigPrefix = $moderation_state_config_prefix;
-    return $this;
-  }
-
 }
diff --git a/core/modules/content_moderation/src/ModerationStateTransitionInterface.php b/core/modules/content_moderation/src/ModerationStateTransitionInterface.php
index 035cf1e..91b5b13 100644
--- a/core/modules/content_moderation/src/ModerationStateTransitionInterface.php
+++ b/core/modules/content_moderation/src/ModerationStateTransitionInterface.php
@@ -33,15 +33,4 @@ public function getToState();
    */
   public function getWeight();
 
-  /**
-   * Sets the moderation state config prefix.
-   *
-   * @param string $moderation_state_config_prefix
-   *   Moderation state config prefix.
-   *
-   * @return self
-   *   Called instance.
-   */
-  public function setModerationStateConfigPrefix($moderation_state_config_prefix);
-
 }
diff --git a/core/modules/content_moderation/src/ModerationStateTransitionStorage.php b/core/modules/content_moderation/src/ModerationStateTransitionStorage.php
deleted file mode 100644
index 96ce0cb..0000000
--- a/core/modules/content_moderation/src/ModerationStateTransitionStorage.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation;
-
-
-use Drupal\Component\Uuid\UuidInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Config\Entity\ConfigEntityStorage;
-use Drupal\Core\Entity\EntityHandlerInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-class ModerationStateTransitionStorage extends ConfigEntityStorage implements EntityHandlerInterface {
-
-  /**
-   * Entity type manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
-      $entity_type,
-      $container->get('config.factory'),
-      $container->get('uuid'),
-      $container->get('language_manager'),
-      $container->get('entity_type.manager')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(EntityTypeInterface $entity_type, ConfigFactoryInterface $config_factory, UuidInterface $uuid_service, LanguageManagerInterface $language_manager, EntityTypeManagerInterface $entity_type_manager) {
-    parent::__construct($entity_type, $config_factory, $uuid_service, $language_manager);
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function doCreate(array $values) {
-    /* @var \Drupal\content_moderation\ModerationStateTransitionInterface $entity */
-    $entity = parent::doCreate($values);
-    return $entity->setModerationStateConfigPrefix($this->entityTypeManager->getDefinition('moderation_state')->getConfigPrefix());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function mapFromStorageRecords(array $records) {
-    $entities = parent::mapFromStorageRecords($records);
-    $prefix = $this->entityTypeManager->getDefinition('moderation_state')->getConfigPrefix();
-    /* @var \Drupal\content_moderation\ModerationStateTransitionInterface $entity */
-    foreach ($entities as &$entity) {
-      $entity->setModerationStateConfigPrefix($prefix);
-    }
-    reset($entities);
-    return $entities;
-  }
-
-}