diff --git a/core/modules/migrate/src/Plugin/migrate/process/SkipProcessOnEmpty.php b/core/modules/migrate/src/Plugin/migrate/process/SkipProcessOnEmpty.php
index bb24bf2d2177f958f8a6c2147371340b507af91b..6a8f79c054ae6be87875fe10615a5cc9718dff4a 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/SkipProcessOnEmpty.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/SkipProcessOnEmpty.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\Process\d6\FlagSkipProcess.
+ * Contains \Drupal\migrate\Plugin\migrate\process\d6\SkipProcessOnEmpty.
  */
 
 namespace Drupal\migrate\Plugin\migrate\process;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php
index 663b9e6eb7bf84bc7d73ebf876a119b0a38b6d7e..d5da611143b688acf61b84a08c92395444f484bd 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\BlockAggregator.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockAggregator.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php
index fd797f00cf3d57ada367ef7ebedc15350cde8332..386bcaec5f5315c6762093caa93224fb3b6111f8 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\BlockRegion.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockRegion.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\Component\Utility\NestedArray;
 use Drupal\migrate\MigrateExecutable;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockSettings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockSettings.php
index 94ea60010f595289ed6a3752d1c487b05d2caf8e..df317dc0690dc8de545f7558e184847d660b2779 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockSettings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockSettings.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\BlockSettings.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockSettings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php
index 39239cfa795f6fd53b38645c3d8f848e10bfa3db..fc82e2e8870fb363c5099632c4c782847080e81d 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\BlockTheme.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockTheme.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\MigrateExecutable;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldIdGenerator.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldIdGenerator.php
index 6521e83ed836f4c583e9bf4b9bfe06124cd32445..e9c900dd78997a72d09a55ea02811d7d1d6b8c54 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldIdGenerator.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldIdGenerator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\FieldIdGenerator.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldIdGenerator.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
index 141eb28582df507acc98a15c9ef9fe4622753da0..c7b3cd59a5973ca50f3d02338303ae158079fdd7 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
@@ -4,7 +4,7 @@
  * Contains Drupal\migrate_drupal\Plugin\migrate\d6\FieldInstanceDefaults
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
index 7f16cef5d44c949b86b7085d6356cb7fcee59883..c144ef49065e832001e35a5634bb3373e1d508b8 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
@@ -4,7 +4,7 @@
  * Contains Drupal\migrate_drupal\Plugin\migrate\d6\FieldInstanceSettings
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
index 4ec140e299df32ad9659123194a59938ff8bd569..10dc01571b1d0f80d9acbfa27a2a113a0e64d44e 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\FieldInstanceWidgetSettings
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldInstanceWidgetSettings
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldSettings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldSettings.php
index 8f07186f1009b0660d885552ed6b7792e8effc86..fefce8f60629391fe47d53d174f921951eb1720e 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldSettings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldSettings.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\FieldSettings
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldSettings
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FileUri.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FileUri.php
index a3a9a3b7ea2e41f893a1f17b3233924339f88f86..74d1d82c02d1b26753ff027f6dd34b7778e45109 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FileUri.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FileUri.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\FileUri.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FileUri.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FilterFormatPermission.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FilterFormatPermission.php
index fc9a4af2cf4c74c0965de920c54953f8991310ee..7eb2a11608478ac0cf8c831b36c54933786e43f6 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FilterFormatPermission.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FilterFormatPermission.php
@@ -2,11 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\FilterFormatRole.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FilterFormatRole.
  */
 
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\Entity\MigrationInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/NodeUpdate7008.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/NodeUpdate7008.php
index fff00f5cea686d566a4b883b9a24352cc816cc14..30f6c8988c75a1f66f17c6774e99c72beff0ead3 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/NodeUpdate7008.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/NodeUpdate7008.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\NodeUpdate7008.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\NodeUpdate7008.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/ProfileFieldSettings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/ProfileFieldSettings.php
index 2ce2050e4d4df638ff623ee45150184997200b63..c95899402401b424e9b6d8ed5214ca334d94eb0d 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/ProfileFieldSettings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/ProfileFieldSettings.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\ProfileFieldSettings.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\ProfileFieldSettings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
index 320e919c990712db1398e0f14e7cef9a0196d50a..2dad42faf87da44acf2725a0d3ef9a94b325eb39 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\SearchPage.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\SearchPage.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\MigrateExecutable;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php
index aaa2dd544fb2f23a1de39641061c9d21f0ffa3c1..6c9055b4e3f92e944fdb141f18b730196c6b62c5 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\system_update_7000.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\system_update_7000.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserPicture.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserPicture.php
index 8b9a900647362099dd3f9c4cc17b37c4765acf96..4af57bb3da4d5059a198d37dcd7762c3729a24aa 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserPicture.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserPicture.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\UserPicture.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\UserPicture.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\Entity\MigrationInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserUpdate7002.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserUpdate7002.php
index 95db6694fc90ecbf184d5cea06b7ab0ee40b0ff0..b060efb1bab2c0b4817eec65fe46ff6bc9cca42a 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserUpdate7002.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserUpdate7002.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\UserUpdate7002.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\UserUpdate7002.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserUpdate8002.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserUpdate8002.php
index 2159084bf1f8c4c3be07e9b9ece7268cc37f5595..f7c655fd32af74255601bfef22571ee0153b2110 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserUpdate8002.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserUpdate8002.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\Process\d6\UserUpdate8002.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\UserUpdate8002.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\Process\d6;
+namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;