diff --git a/core/modules/workflows/src/WorkflowInterface.php b/core/modules/workflows/src/WorkflowInterface.php
index 7b106c5e37..46693b62e6 100644
--- a/core/modules/workflows/src/WorkflowInterface.php
+++ b/core/modules/workflows/src/WorkflowInterface.php
@@ -24,7 +24,7 @@
    * @return \Drupal\workflows\WorkflowInterface
    *   The workflow entity.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function addState($state_id, $label);
 
@@ -37,7 +37,7 @@ public function addState($state_id, $label);
    * @return bool
    *   TRUE if the workflow has a state with the provided ID, FALSE if not.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function hasState($state_id);
 
@@ -53,7 +53,7 @@ public function hasState($state_id);
    * @throws \InvalidArgumentException
    *   Thrown if $state_ids contains a state ID that does not exist.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function getStates($state_ids = NULL);
 
@@ -69,7 +69,7 @@ public function getStates($state_ids = NULL);
    * @throws \InvalidArgumentException
    *   Thrown if $state_id does not exist.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function getState($state_id);
 
@@ -84,7 +84,7 @@ public function getState($state_id);
    * @return \Drupal\workflows\WorkflowInterface
    *   The workflow entity.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function setStateLabel($state_id, $label);
 
@@ -99,7 +99,7 @@ public function setStateLabel($state_id, $label);
    * @return \Drupal\workflows\WorkflowInterface
    *   The workflow entity.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function setStateWeight($state_id, $weight);
 
@@ -115,7 +115,7 @@ public function setStateWeight($state_id, $weight);
    * @throws \InvalidArgumentException
    *   Thrown if $state_id does not exist.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function deleteState($state_id);
 
@@ -125,7 +125,7 @@ public function deleteState($state_id);
    * @return \Drupal\workflows\StateInterface
    *   The initial state.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function getInitialState();
 
@@ -147,7 +147,7 @@ public function getInitialState();
    * @throws \InvalidArgumentException
    *   Thrown if either state does not exist.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function addTransition($id, $label, array $from_state_ids, $to_state_id);
 
@@ -163,7 +163,7 @@ public function addTransition($id, $label, array $from_state_ids, $to_state_id);
    * @throws \InvalidArgumentException
    *   Thrown if $transition_id does not exist.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function getTransition($transition_id);
 
@@ -176,7 +176,7 @@ public function getTransition($transition_id);
    * @return bool
    *   TRUE if the transition exists, FALSE if not.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function hasTransition($transition_id);
 
@@ -193,7 +193,7 @@ public function hasTransition($transition_id);
    * @throws \InvalidArgumentException
    *   Thrown if $transition_ids contains a transition ID that does not exist.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function getTransitions(array $transition_ids = NULL);
 
@@ -209,7 +209,7 @@ public function getTransitions(array $transition_ids = NULL);
    * @return array
    *   The transition IDs for a state for the provided direction.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function getTransitionsForState($state_id, $direction = 'from');
 
@@ -227,7 +227,7 @@ public function getTransitionsForState($state_id, $direction = 'from');
    * @throws \InvalidArgumentException
    *   Thrown if the transition does not exist.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function getTransitionFromStateToState($from_state_id, $to_state_id);
 
@@ -242,7 +242,7 @@ public function getTransitionFromStateToState($from_state_id, $to_state_id);
    * @return bool
    *   TRUE if the transition exists, FALSE if not.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function hasTransitionFromStateToState($from_state_id, $to_state_id);
 
@@ -260,7 +260,7 @@ public function hasTransitionFromStateToState($from_state_id, $to_state_id);
    * @throws \InvalidArgumentException
    *   Thrown if the transition does not exist.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function setTransitionLabel($transition_id, $label);
 
@@ -278,7 +278,7 @@ public function setTransitionLabel($transition_id, $label);
    * @throws \InvalidArgumentException
    *   Thrown if the transition does not exist.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function setTransitionWeight($transition_id, $weight);
 
@@ -296,7 +296,7 @@ public function setTransitionWeight($transition_id, $weight);
    * @throws \InvalidArgumentException
    *   Thrown if the transition does not exist or the states do not exist.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function setTransitionFromStates($transition_id, array   $from_state_ids);
 
@@ -312,7 +312,7 @@ public function setTransitionFromStates($transition_id, array   $from_state_ids)
    * @throws \InvalidArgumentException
    *   Thrown if the transition does not exist.
    *
-   * @deprecated in Drupal 8.4.x and will be removed before 8.4.0.
+   * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
    */
   public function deleteTransition($transition_id);