diff --git a/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml b/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml
index 455d3fce38e1cd439ad6975c1b8eeaf2c6120f8c..8ebd82782f3aabae3bca3316b4cb613947b46251 100644
--- a/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml
+++ b/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml
@@ -4,7 +4,7 @@ dependencies:
   module:
     - content_moderation
 id: editorial
-label: 'Editorial'
+label: 'Editorial workflow'
 type: content_moderation
 type_settings:
   states:
diff --git a/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraint.php b/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraint.php
index 7f7c756b6b9bcb60d6934e438386eec3225458a3..eebb06624ca5d1c10c4fec256e033d4b3b3248ab 100644
--- a/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraint.php
+++ b/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraint.php
@@ -15,6 +15,6 @@
 class ModerationStateConstraint extends Constraint {
 
   public $message = 'Invalid state transition from %from to %to';
-  public $invalidStateMessage = 'State %state does not exist on %workflow workflow';
+  public $invalidStateMessage = 'State %state does not exist on %workflow';
 
 }
diff --git a/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php b/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php
index b10f1e52d80a2258e309909088b1f7fa0c217754..c8ce61b56579b0d9ddb7a39663b8f66a5198304d 100644
--- a/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php
@@ -116,7 +116,7 @@ public function testInvalidState() {
     $violations = $node->validate();
 
     $this->assertCount(1, $violations);
-    $this->assertEquals('State <em class="placeholder">invalid_state</em> does not exist on <em class="placeholder">Editorial</em> workflow', $violations->get(0)->getMessage());
+    $this->assertEquals('State <em class="placeholder">invalid_state</em> does not exist on <em class="placeholder">Editorial workflow</em>', $violations->get(0)->getMessage());
   }
 
   /**
diff --git a/core/modules/workflows/src/Form/WorkflowEditForm.php b/core/modules/workflows/src/Form/WorkflowEditForm.php
index 9a224eb997569ec496e2f493ce63bbe567e32950..764c0c9bc5fffa8bf6c11fdfc6534e4952199e94 100644
--- a/core/modules/workflows/src/Form/WorkflowEditForm.php
+++ b/core/modules/workflows/src/Form/WorkflowEditForm.php
@@ -24,8 +24,6 @@ public function form(array $form, FormStateInterface $form_state) {
 
     /* @var \Drupal\workflows\WorkflowInterface $workflow */
     $workflow = $this->entity;
-    $form['#title'] = $this->t('Edit %label workflow', ['%label' => $workflow->label()]);
-
     $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Label'),