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 d1e9be3..2d1b77a 100644
--- a/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
+++ b/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
@@ -2,6 +2,10 @@
 
 namespace Drupal\link\Plugin\migrate\process\d6;
 
+@trigger_error('CckLink is deprecated in Drupal 8.3.x and will be removed before
+Drupal 9.0.x. Use \Drupal\link\Plugin\migrate\process\d6\FieldLink instead.',
+E_USER_DEPRECATED);
+
 /**
  * @MigrateProcessPlugin(
  *   id = "d6_cck_link"
diff --git a/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php b/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php
index d7873e3..73949e1 100644
--- a/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php
+++ b/core/modules/migrate_drupal/src/Annotation/MigrateCckField.php
@@ -3,13 +3,13 @@
 namespace Drupal\migrate_drupal\Annotation;
 
 @trigger_error('MigrateCckField is deprecated in Drupal 8.3.x and will be
-removed before Drupal 9.0.x. Use  \Drupal\migrate_drupal\Annotation\MigrateField
+removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateField
 instead.', E_USER_DEPRECATED);
 
 /**
  * Deprecated: Defines a cckfield plugin annotation object.
  *
- * @deprecated in Drupal 8.2.x, to be removed before Drupal 9.0.x. Use
+ * @deprecated in Drupal 8.3.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 2748aa4..c64738f 100644
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
@@ -3,7 +3,7 @@
 namespace Drupal\migrate_drupal\Plugin;
 
 @trigger_error('MigrateCckFieldInterface is deprecated in Drupal 8.3.x and will
-be removed before Drupal 9.0.x. Use  \Drupal\migrate_drupal\Annotation\MigrateField
+be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateField
 instead.', E_USER_DEPRECATED);
 
 use Drupal\migrate\Plugin\MigrationInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
index ce51907..9ade1e5 100644
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
@@ -3,7 +3,7 @@
 namespace Drupal\migrate_drupal\Plugin;
 
 @trigger_error('MigrateCckFieldPluginManager is deprecated in Drupal 8.3.x and will
-be removed before Drupal 9.0.x. Use  \Drupal\migrate_drupal\Annotation\MigrateFieldPluginManager
+be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateFieldPluginManager
 instead.', E_USER_DEPRECATED);
 
 /**
diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManagerInterface.php b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManagerInterface.php
index c9e145e..3d88d77 100644
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManagerInterface.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManagerInterface.php
@@ -3,7 +3,7 @@
 namespace Drupal\migrate_drupal\Plugin;
 
 @trigger_error('MigrateCckFieldPluginManagerInterface is deprecated in Drupal 8.3.x
-and will be removed before Drupal 9.0.x. Use  \Drupal\migrate_drupal\Annotation\MigrateFieldPluginManagerInterface
+and will be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateFieldPluginManagerInterface
 instead.', E_USER_DEPRECATED);
 
 /**
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php b/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
index ca4b531..082c051 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
@@ -2,6 +2,10 @@
 
 namespace Drupal\migrate_drupal\Plugin\migrate;
 
+@trigger_error('CckMigration is deprecated in Drupal 8.3.x and will be removed
+before Drupal 9.0.x. Use \Drupal\migrate_drupal\Plugin\migrate\FieldMigration
+instead.', E_USER_DEPRECATED);
+
 /**
  * Migration plugin class for migrations dealing with CCK field values.
  *
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 0d61c90..79a65a7 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
@@ -3,7 +3,7 @@
 namespace Drupal\migrate_drupal\Plugin\migrate\cckfield;
 
 @trigger_error('CckFieldPluginBase is deprecated in Drupal 8.3.x and will be
-be removed before Drupal 9.0.x. Use  \Drupal\migrate_drupal\Plugin\migrate\field\FieldPluginBase
+be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Plugin\migrate\field\FieldPluginBase
 instead.', E_USER_DEPRECATED);
 
 use Drupal\migrate\Plugin\MigrationInterface;