diff --git a/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php b/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
index 52f3d21..1519851 100644
--- a/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
+++ b/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
@@ -3,7 +3,7 @@
 namespace Drupal\file\Plugin\migrate\process\d6;
 
 /**
- * @deprecated in Drupal 8.2.x and will be removed in Drupal 9.0.x. Use the
+ * @deprecated in Drupal 8.2.x and will be removed before Drupal 9.0.x. Use the
  *   d6_field_file plugin instead.
  *
  * @MigrateProcessPlugin(
diff --git a/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php b/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
index 2a211e8..c4a1033 100644
--- a/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
+++ b/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
@@ -3,7 +3,7 @@
 namespace Drupal\link\Plugin\migrate\process\d6;
 
 /**
- * @deprecated in Drupal 8.2.x and will be removed in Drupal 9.0.x. Use the
+ * @deprecated in Drupal 8.2.x and will be removed before Drupal 9.0.x. Use the
  *   d6_field_link plugin instead.
  *
  * @MigrateProcessPlugin(
diff --git a/core/modules/migrate_drupal/migrate_drupal.services.yml b/core/modules/migrate_drupal/migrate_drupal.services.yml
index 0fa17fd..d22788f 100644
--- a/core/modules/migrate_drupal/migrate_drupal.services.yml
+++ b/core/modules/migrate_drupal/migrate_drupal.services.yml
@@ -7,7 +7,7 @@ services:
       - '@cache.discovery'
       - '@module_handler'
       - '\Drupal\migrate_drupal\Annotation\MigrateField'
-  # @deprecated in 8.2.x, to be removed in 9.0.x.
+  # @deprecated in 8.2.x, to be removed before 9.0.x.
   plugin.manager.migrate.cckfield:
     class: Drupal\migrate_drupal\Plugin\MigrateCckFieldPluginManager
     arguments:
diff --git a/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php b/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php
index a6ab023..39edf3e 100644
--- a/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php
+++ b/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php
@@ -5,7 +5,7 @@
 /**
  * Deprecated: Defines a cckfield plugin annotation object.
  *
- * @deprecated in Drupal 8.2.x, to be removed in Drupal 9.0.x. Use
+ * @deprecated in Drupal 8.2.x, to be removed before Drupal 9.0.x. Use
  *   \Drupal\migrate_drupal\Annotation\MigrateField instead.
  *
  * Plugin Namespace: Plugin\migrate\cckfield
diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
index 142ed97..6d270b7 100644
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
@@ -6,7 +6,7 @@
 /**
  * Provides an interface for all field type plugins.
  *
- * @deprecated in Drupal 8.2.x, to be removed in Drupal 9.0.x. Use
+ * @deprecated in Drupal 8.2.x, to be removed before Drupal 9.0.x. Use
  *   \Drupal\migrate_drupal\Annotation\MigrateField instead.
  */
 interface MigrateCckFieldInterface extends MigrateFieldInterface { }
diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
index dccedf0..fe33cdc 100644
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
@@ -5,7 +5,7 @@
 /**
  * Deprecated: Plugin manager for migrate field plugins.
  *
- * @deprecated in Drupal 8.2.x, to be removed in Drupal 9.0.x. Use
+ * @deprecated in Drupal 8.2.x, to be removed before Drupal 9.0.x. Use
  *   \Drupal\migrate_drupal\Plugin\MigrateFieldPluginManager instead.
  *
  * @ingroup migration
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php b/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
index b602897..6c129a3 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
@@ -5,7 +5,7 @@
 /**
  * Migration plugin class for migrations dealing with field values.
  *
- * @deprecated in Drupal 8.2.x, to be removed in Drupal 9.0.x. Use
+ * @deprecated in Drupal 8.2.x, to be removed before Drupal 9.0.x. Use
  * \Drupal\migrate_drupal\Plugin\migrate\FieldMigration instead.
  */
 class CckMigration extends FieldMigration { }
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
index f0fbbfe..bf9e51d 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
@@ -7,7 +7,7 @@
 /**
  * The base class for all field plugins.
  *
- * @deprecated in Drupal 8.2.x, to be removed in Drupal 9.0.x. Use
+ * @deprecated in Drupal 8.2.x, to be removed before Drupal 9.0.x. Use
  * \Drupal\migrate_drupal\Plugin\migrate\field\FieldPluginBase instead.
  *
  * @ingroup migration