diff --git a/src/Entity/Workflow.php b/src/Entity/Workflow.php
index 4f0a2c0bd2083e066a23b0ed5bc15cfef96e6e13..25883088e1849c8ef906f498aa5d1a2254290dbf 100644
--- a/src/Entity/Workflow.php
+++ b/src/Entity/Workflow.php
@@ -12,6 +12,12 @@ use Drupal\Core\Session\AccountInterface;
  * @ConfigEntityType(
  *   id = "workflow_type",
  *   label = @Translation("Workflow"),
+ *   label_singular = @Translation("Workflow"),
+ *   label_plural = @Translation("Workflows"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count Workflow",
+ *     plural = "@count Workflows",
+ *   ),
  *   module = "workflow",
  *   translatable = FALSE,
  *   handlers = {
@@ -19,8 +25,8 @@ use Drupal\Core\Session\AccountInterface;
  *     "list_builder" = "Drupal\workflow_ui\Controller\WorkflowListBuilder",
  *     "form" = {
  *        "add" = "Drupal\workflow\Form\WorkflowForm",
- *        "edit" = "Drupal\workflow\Form\WorkflowForm",
  *        "delete" = "Drupal\Core\Entity\EntityDeleteForm",
+ *        "edit" = "Drupal\workflow\Form\WorkflowForm",
  *      }
  *   },
  *   admin_permission = "administer workflow",
@@ -33,15 +39,15 @@ use Drupal\Core\Session\AccountInterface;
  *   config_export = {
  *     "id",
  *     "label",
- *     "status",
  *     "module",
+ *     "status",
  *     "options",
  *   },
  *   links = {
- *     "collection" = "/admin/config/workflow/workflow",
  *     "canonical" = "/admin/config/workflow/workflow/{workflow_type}",
- *     "edit-form" = "/admin/config/workflow/workflow/{workflow_type}",
+ *     "collection" = "/admin/config/workflow/workflow",
  *     "delete-form" = "/admin/config/workflow/workflow/{workflow_type}/delete",
+ *     "edit-form" = "/admin/config/workflow/workflow/{workflow_type}",
  *   },
  * )
  */
diff --git a/src/Entity/WorkflowConfigTransition.php b/src/Entity/WorkflowConfigTransition.php
index f7e2b61d239e885c391fb534db312cad768ddf17..ec14025386df668d3157b51ced57d0eecf1050c8 100644
--- a/src/Entity/WorkflowConfigTransition.php
+++ b/src/Entity/WorkflowConfigTransition.php
@@ -19,6 +19,7 @@ use Drupal\user\UserInterface;
  *     plural = "@count Workflow config transitions",
  *   ),
  *   module = "workflow",
+ *   translatable = FALSE,
  *   handlers = {
  *     "form" = {
  *        "delete" = "\Drupal\Core\Entity\EntityDeleteForm",
diff --git a/src/Entity/WorkflowState.php b/src/Entity/WorkflowState.php
index ae567adc092eb7b98417e7a8d6b59cacbdfcfdb9..0ef02c546ef11e61cd2d196963cebcbbaeba12eb 100644
--- a/src/Entity/WorkflowState.php
+++ b/src/Entity/WorkflowState.php
@@ -22,6 +22,7 @@ use Drupal\Core\Language\LanguageInterface;
  *     plural = "@count Workflow states",
  *   ),
  *   module = "workflow",
+ *   translatable = FALSE,
  *   handlers = {
  *     "list_builder" = "Drupal\workflow_ui\Controller\WorkflowStateListBuilder",
  *     "form" = {
diff --git a/src/Entity/WorkflowTransition.php b/src/Entity/WorkflowTransition.php
index d48c792da806e167d33bcc8b05cf72f4d17c0869..8d3b73b46cb734f158332afacb96caac02730ce4 100644
--- a/src/Entity/WorkflowTransition.php
+++ b/src/Entity/WorkflowTransition.php
@@ -26,19 +26,19 @@ use Drupal\user\UserInterface;
  *   ),
  *   bundle_label = @Translation("Workflow type"),
  *   module = "workflow",
+ *   translatable = FALSE,
  *   handlers = {
  *     "access" = "Drupal\workflow\WorkflowAccessControlHandler",
  *     "list_builder" = "Drupal\workflow\WorkflowTransitionListBuilder",
  *     "form" = {
  *        "add" = "Drupal\workflow\Form\WorkflowTransitionForm",
+ *        "delete" = "Drupal\Core\Entity\EntityDeleteForm",
  *        "edit" = "Drupal\workflow\Form\WorkflowTransitionForm",
  *        "revert" = "Drupal\workflow_operations\Form\WorkflowTransitionRevertForm",
- *        "delete" = "Drupal\Core\Entity\EntityDeleteForm",
  *      },
  *     "views_data" = "Drupal\workflow\WorkflowTransitionViewsData",
  *   },
  *   base_table = "workflow_transition_history",
- *   translatable = FALSE,
  *   entity_keys = {
  *     "id" = "hid",
  *     "bundle" = "wid",
@@ -49,9 +49,9 @@ use Drupal\user\UserInterface;
  *   field_ui_base_route = "entity.workflow_type.edit_form",
  *   links = {
  *     "canonical" = "/workflow_transition/{workflow_transition}",
+ *     "delete-form" = "/workflow_transition/{workflow_transition}/delete",
  *     "edit-form" = "/workflow_transition/{workflow_transition}/edit",
  *     "revert-form" = "/workflow_transition/{workflow_transition}/revert",
- *     "delete-form" = "/workflow_transition/{workflow_transition}/delete",
  *   },
  * )
  */