diff --git a/.htaccess b/.htaccess
index f4024c6..18efdd6 100644
--- a/.htaccess
+++ b/.htaccess
@@ -120,7 +120,7 @@ AddEncoding gzip svgz
   #
   # If your site is running in a VirtualDocumentRoot at http://example.com/,
   # uncomment the following line:
-  # RewriteBase /
+  RewriteBase /
 
   # Redirect common PHP files to their new locations.
   RewriteCond %{REQUEST_URI} ^(.*)?/(install.php) [OR]
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state.archived.yml b/core/modules/content_moderation/config/install/content_moderation.state.archived.yml
similarity index 100%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state.archived.yml
rename to core/modules/content_moderation/config/install/content_moderation.state.archived.yml
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state.draft.yml b/core/modules/content_moderation/config/install/content_moderation.state.draft.yml
similarity index 100%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state.draft.yml
rename to core/modules/content_moderation/config/install/content_moderation.state.draft.yml
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state.needs_review.yml b/core/modules/content_moderation/config/install/content_moderation.state.needs_review.yml
similarity index 100%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state.needs_review.yml
rename to core/modules/content_moderation/config/install/content_moderation.state.needs_review.yml
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state.published.yml b/core/modules/content_moderation/config/install/content_moderation.state.published.yml
similarity index 100%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state.published.yml
rename to core/modules/content_moderation/config/install/content_moderation.state.published.yml
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.archived_published.yml b/core/modules/content_moderation/config/install/content_moderation.state_transition.archived_published.yml
similarity index 57%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.archived_published.yml
rename to core/modules/content_moderation/config/install/content_moderation.state_transition.archived_published.yml
index 45bce07..fb4d70d 100644
--- a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.archived_published.yml
+++ b/core/modules/content_moderation/config/install/content_moderation.state_transition.archived_published.yml
@@ -2,8 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
-    - content_moderation.moderation_state.archived
-    - content_moderation.moderation_state.published
+    - content_moderation.state.archived
+    - content_moderation.state.published
 id: archived_published
 label: 'Un-archive'
 stateFrom: archived
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.draft_draft.yml b/core/modules/content_moderation/config/install/content_moderation.state_transition.draft_draft.yml
similarity index 73%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.draft_draft.yml
rename to core/modules/content_moderation/config/install/content_moderation.state_transition.draft_draft.yml
index acca7d2..166aca2 100644
--- a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.draft_draft.yml
+++ b/core/modules/content_moderation/config/install/content_moderation.state_transition.draft_draft.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - content_moderation.moderation_state.draft
+    - content_moderation.state.draft
 id: draft_draft
 label: 'Create New Draft'
 stateFrom: draft
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.draft_needs_review.yml b/core/modules/content_moderation/config/install/content_moderation.state_transition.draft_needs_review.yml
similarity index 58%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.draft_needs_review.yml
rename to core/modules/content_moderation/config/install/content_moderation.state_transition.draft_needs_review.yml
index bf10d97..d88f6f0 100644
--- a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.draft_needs_review.yml
+++ b/core/modules/content_moderation/config/install/content_moderation.state_transition.draft_needs_review.yml
@@ -2,8 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
-    - content_moderation.moderation_state.draft
-    - content_moderation.moderation_state.needs_review
+    - content_moderation.state.draft
+    - content_moderation.state.needs_review
 id: draft_needs_review
 label: 'Request Review'
 stateFrom: draft
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.draft_published.yml b/core/modules/content_moderation/config/install/content_moderation.state_transition.draft_published.yml
similarity index 57%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.draft_published.yml
rename to core/modules/content_moderation/config/install/content_moderation.state_transition.draft_published.yml
index 468c962..cf95d3d 100644
--- a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.draft_published.yml
+++ b/core/modules/content_moderation/config/install/content_moderation.state_transition.draft_published.yml
@@ -2,8 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
-    - content_moderation.moderation_state.draft
-    - content_moderation.moderation_state.published
+    - content_moderation.state.draft
+    - content_moderation.state.published
 id: draft_published
 label: 'Publish'
 stateFrom: draft
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.needs_review_draft.yml b/core/modules/content_moderation/config/install/content_moderation.state_transition.needs_review_draft.yml
similarity index 59%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.needs_review_draft.yml
rename to core/modules/content_moderation/config/install/content_moderation.state_transition.needs_review_draft.yml
index 091507d..55d095d 100644
--- a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.needs_review_draft.yml
+++ b/core/modules/content_moderation/config/install/content_moderation.state_transition.needs_review_draft.yml
@@ -2,8 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
-    - content_moderation.moderation_state.draft
-    - content_moderation.moderation_state.needs_review
+    - content_moderation.state.draft
+    - content_moderation.state.needs_review
 id: needs_review_draft
 label: 'Send Back to Draft'
 stateFrom: needs_review
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.needs_review_needs_review.yml b/core/modules/content_moderation/config/install/content_moderation.state_transition.needs_review_needs_review.yml
similarity index 74%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.needs_review_needs_review.yml
rename to core/modules/content_moderation/config/install/content_moderation.state_transition.needs_review_needs_review.yml
index 5ee8dd7..6c7dbac 100644
--- a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.needs_review_needs_review.yml
+++ b/core/modules/content_moderation/config/install/content_moderation.state_transition.needs_review_needs_review.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - content_moderation.moderation_state.needs_review
+    - content_moderation.state.needs_review
 id: needs_review_needs_review
 label: 'Keep in Review'
 stateFrom: needs_review
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.needs_review_published.yml b/core/modules/content_moderation/config/install/content_moderation.state_transition.needs_review_published.yml
similarity index 58%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.needs_review_published.yml
rename to core/modules/content_moderation/config/install/content_moderation.state_transition.needs_review_published.yml
index ccc5262..c729026 100644
--- a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.needs_review_published.yml
+++ b/core/modules/content_moderation/config/install/content_moderation.state_transition.needs_review_published.yml
@@ -2,8 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
-    - content_moderation.moderation_state.needs_review
-    - content_moderation.moderation_state.published
+    - content_moderation.state.needs_review
+    - content_moderation.state.published
 id: needs_review_published
 label: 'Publish'
 stateFrom: needs_review
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.published_archived.yml b/core/modules/content_moderation/config/install/content_moderation.state_transition.published_archived.yml
similarity index 57%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.published_archived.yml
rename to core/modules/content_moderation/config/install/content_moderation.state_transition.published_archived.yml
index 7022a4d..30894ad 100644
--- a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.published_archived.yml
+++ b/core/modules/content_moderation/config/install/content_moderation.state_transition.published_archived.yml
@@ -2,8 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
-    - content_moderation.moderation_state.archived
-    - content_moderation.moderation_state.published
+    - content_moderation.state.archived
+    - content_moderation.state.published
 id: published_archived
 label: 'Archive'
 stateFrom: published
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.published_draft.yml b/core/modules/content_moderation/config/install/content_moderation.state_transition.published_draft.yml
similarity index 58%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.published_draft.yml
rename to core/modules/content_moderation/config/install/content_moderation.state_transition.published_draft.yml
index 6a94de4..daf9efc 100644
--- a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.published_draft.yml
+++ b/core/modules/content_moderation/config/install/content_moderation.state_transition.published_draft.yml
@@ -2,8 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
-    - content_moderation.moderation_state.draft
-    - content_moderation.moderation_state.published
+    - content_moderation.state.draft
+    - content_moderation.state.published
 id: published_draft
 label: 'Create New Draft'
 stateFrom: published
diff --git a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.published_published.yml b/core/modules/content_moderation/config/install/content_moderation.state_transition.published_published.yml
similarity index 73%
rename from core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.published_published.yml
rename to core/modules/content_moderation/config/install/content_moderation.state_transition.published_published.yml
index 4d9a18e..e1a19c2 100644
--- a/core/modules/content_moderation/config/install/content_moderation.moderation_state_transition.published_published.yml
+++ b/core/modules/content_moderation/config/install/content_moderation.state_transition.published_published.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - content_moderation.moderation_state.published
+    - content_moderation.state.published
 id: published_published
 label: 'Publish'
 stateFrom: published
diff --git a/core/modules/content_moderation/config/schema/content_moderation.schema.yml b/core/modules/content_moderation/config/schema/content_moderation.schema.yml
index e979f64..cb966ea 100644
--- a/core/modules/content_moderation/config/schema/content_moderation.schema.yml
+++ b/core/modules/content_moderation/config/schema/content_moderation.schema.yml
@@ -1,4 +1,4 @@
-content_moderation.moderation_state.*:
+content_moderation.state.*:
   type: config_entity
   label: 'Moderation state config'
   mapping:
@@ -14,8 +14,26 @@ content_moderation.moderation_state.*:
     default_revision:
       type: boolean
       label: 'Is default revision'
-    uuid:
+
+content_moderation.state_transition.*:
+  type: config_entity
+  label: 'Moderation state transition config'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Label'
+    stateFrom:
+      type: string
+      label: 'From state'
+    stateTo:
       type: string
+      label: 'To state'
+    weight:
+      type: integer
+      label: 'Weight'
 
 node.type.*.third_party.content_moderation:
   type: mapping
diff --git a/core/modules/content_moderation/config/schema/content_moderation_transition.schema.yml b/core/modules/content_moderation/config/schema/content_moderation_transition.schema.yml
deleted file mode 100644
index 0ae5dba..0000000
--- a/core/modules/content_moderation/config/schema/content_moderation_transition.schema.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-content_moderation.moderation_state_transition.*:
-  type: config_entity
-  label: 'Moderation state transition config'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: label
-      label: 'Label'
-    stateFrom:
-      type: string
-      label: 'From state'
-    stateTo:
-      type: string
-      label: 'To state'
-    weight:
-      type: integer
-      label: 'Weight'
-    uuid:
-      type: string
diff --git a/core/modules/content_moderation/src/Entity/ModerationState.php b/core/modules/content_moderation/src/Entity/ModerationState.php
index c19d23a..e205a11 100644
--- a/core/modules/content_moderation/src/Entity/ModerationState.php
+++ b/core/modules/content_moderation/src/Entity/ModerationState.php
@@ -19,7 +19,7 @@
  *       "delete" = "Drupal\content_moderation\Form\ModerationStateDeleteForm"
  *     },
  *   },
- *   config_prefix = "moderation_state",
+ *   config_prefix = "state",
  *   admin_permission = "administer moderation states",
  *   entity_keys = {
  *     "id" = "id",
diff --git a/core/modules/content_moderation/src/Entity/ModerationStateTransition.php b/core/modules/content_moderation/src/Entity/ModerationStateTransition.php
index 2783926..6ca2714 100644
--- a/core/modules/content_moderation/src/Entity/ModerationStateTransition.php
+++ b/core/modules/content_moderation/src/Entity/ModerationStateTransition.php
@@ -19,7 +19,7 @@
  *       "delete" = "Drupal\content_moderation\Form\ModerationStateTransitionDeleteForm"
  *     },
  *   },
- *   config_prefix = "moderation_state_transition",
+ *   config_prefix = "state_transition",
  *   admin_permission = "administer moderation state transitions",
  *   entity_keys = {
  *     "id" = "id",