diff --git a/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php b/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php
index 3b490f0f19d741dbe723c7a25ae482add4a19985..df6a10b1d82e1b1090cb46f53d83dff17725e8b2 100644
--- a/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php
+++ b/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php
@@ -42,7 +42,7 @@ public function getFieldFormatterMap() {
    */
   public function processFieldValues(MigrationInterface $migration, $field_name, $data) {
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => [
         'value' => 'email',
diff --git a/core/modules/datetime/src/Plugin/migrate/field/DateField.php b/core/modules/datetime/src/Plugin/migrate/field/DateField.php
index 0dd56c9acf2975cabae9abd1262b90c769303902..bd81381799cc10bb5186f198c9091401be98fba2 100644
--- a/core/modules/datetime/src/Plugin/migrate/field/DateField.php
+++ b/core/modules/datetime/src/Plugin/migrate/field/DateField.php
@@ -60,7 +60,7 @@ public function processFieldValues(MigrationInterface $migration, $field_name, $
     ];
 
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => $process,
     ];
diff --git a/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php b/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php
index c4e7b4981d3d0d6f6b184ffb4914d1dfffbb706b..1d91a3f7902ae0ebfc624f3b2e27afc8b39776da 100644
--- a/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php
+++ b/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php
@@ -65,7 +65,7 @@ public function processFieldValues(MigrationInterface $migration, $field_name, $
     ];
 
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => $process,
     ];
diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php b/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
index 9d184ff86a7dd5aed96d83cb746bbf89656fa195..1c3e25c9563c00d92ddc00370d02a6d8521410c1 100644
--- a/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
+++ b/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
@@ -49,7 +49,7 @@ public function getFieldFormatterMap() {
    */
   public function processCckFieldValues(MigrationInterface $migration, $field_name, $data) {
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => [
         'target_id' => 'fid',
diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php b/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
index 45f5b9d23933f295af1a92d8e9eb45f97cb7f71f..38b9b7af9d4fbde25e75cd46d2827d31c98ef035 100644
--- a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
+++ b/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
@@ -25,7 +25,7 @@ class ImageField extends CckFieldPluginBase {
    */
   public function processCckFieldValues(MigrationInterface $migration, $field_name, $data) {
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => [
         'target_id' => 'fid',
diff --git a/core/modules/file/src/Plugin/migrate/field/d7/FileField.php b/core/modules/file/src/Plugin/migrate/field/d7/FileField.php
index 4243d43c426572b870b6ff8041080cf090f542e2..cf900904894d90a84a9a070be7a85aa075882fa4 100644
--- a/core/modules/file/src/Plugin/migrate/field/d7/FileField.php
+++ b/core/modules/file/src/Plugin/migrate/field/d7/FileField.php
@@ -18,7 +18,7 @@ class FileField extends D6FileField {
    */
   public function processFieldValues(MigrationInterface $migration, $field_name, $data) {
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => [
         'target_id' => 'fid',
diff --git a/core/modules/file/src/Plugin/migrate/field/d7/ImageField.php b/core/modules/file/src/Plugin/migrate/field/d7/ImageField.php
index 7783ae2886581a5fda35f6baf0322c40e97e06a1..903d3e3969f538847a8c809ed22c95200d474ce0 100644
--- a/core/modules/file/src/Plugin/migrate/field/d7/ImageField.php
+++ b/core/modules/file/src/Plugin/migrate/field/d7/ImageField.php
@@ -18,7 +18,7 @@ class ImageField extends FieldPluginBase {
    */
   public function processFieldValues(MigrationInterface $migration, $field_name, $data) {
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => [
         'target_id' => 'fid',
diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/FileCckTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/FileCckTest.php
index 9478b32a93a5c37828c9605489bd6b563478a618..414d9c21d9f9fe6dd76d0dbb27f6b0f90724c80e 100644
--- a/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/FileCckTest.php
+++ b/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/FileCckTest.php
@@ -51,7 +51,7 @@ public function testProcessCckFieldValues() {
     $this->plugin->processCckFieldValues($this->migration, 'somefieldname', []);
 
     $expected = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => 'somefieldname',
       'process' => [
         'target_id' => 'fid',
diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/ImageCckTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/ImageCckTest.php
index 06695e43360b1361340d2bd37da49497e1cd06bf..2175c64215d3bc64c2d53c9f12dc8265c4d23a69 100644
--- a/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/ImageCckTest.php
+++ b/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/ImageCckTest.php
@@ -50,7 +50,7 @@ public function testProcessCckFieldValues() {
     $this->plugin->processCckFieldValues($this->migration, 'somefieldname', []);
 
     $expected = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => 'somefieldname',
       'process' => [
         'target_id' => 'fid',
diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/FileFieldTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/FileFieldTest.php
index e77438289dce35cdfcdf67e9eb21c4a5f0f4f080..36ca6a43d3ca422ec857b0c299e8c02c44461398 100644
--- a/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/FileFieldTest.php
+++ b/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/FileFieldTest.php
@@ -50,7 +50,7 @@ public function testProcessFieldValues() {
     $this->plugin->processFieldValues($this->migration, 'somefieldname', []);
 
     $expected = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => 'somefieldname',
       'process' => [
         'target_id' => 'fid',
diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/ImageFieldTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/ImageFieldTest.php
index fd11800cbfcb8fef9ea3f2c06d8b1c721f9d9d2b..3cab3537089f8b58e24db98a073c0b439226c4bd 100644
--- a/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/ImageFieldTest.php
+++ b/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/ImageFieldTest.php
@@ -49,7 +49,7 @@ public function testProcessFieldValues() {
     $this->plugin->processFieldValues($this->migration, 'somefieldname', []);
 
     $expected = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => 'somefieldname',
       'process' => [
         'target_id' => 'fid',
diff --git a/core/modules/migrate/src/Annotation/MigrateProcessPlugin.php b/core/modules/migrate/src/Annotation/MigrateProcessPlugin.php
index f08da3bd9af5b7413daced805ffa77000b5becd5..def2fd9d92ba5fba445f0ea2a2a4723e5c28e099 100644
--- a/core/modules/migrate/src/Annotation/MigrateProcessPlugin.php
+++ b/core/modules/migrate/src/Annotation/MigrateProcessPlugin.php
@@ -36,7 +36,7 @@ class MigrateProcessPlugin extends Plugin {
    * Whether the plugin handles multiples itself.
    *
    * Typically these plugins will expect an array as input and iterate over it
-   * themselves, changing the whole array. For example the 'iterator' and the
+   * themselves, changing the whole array. For example the 'sub_process' and the
    * 'flatten' plugins. If the plugin only need to change a single value it
    * can skip setting this attribute and let
    * \Drupal\migrate\MigrateExecutable::processRow() handle the iteration.
diff --git a/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php
index c81d498460f9b5e2644d1f53f726e9cb27744ac4..3bbe38ad7425cad92f7d8a57bc5f6913f1fd6483 100644
--- a/core/modules/migrate/src/Plugin/Migration.php
+++ b/core/modules/migrate/src/Plugin/Migration.php
@@ -621,7 +621,7 @@ protected function findMigrationDependencies($process) {
         if ($plugin_configuration['plugin'] == 'migration') {
           $return = array_merge($return, (array) $plugin_configuration['migration']);
         }
-        if ($plugin_configuration['plugin'] == 'iterator') {
+        if ($plugin_configuration['plugin'] == 'sub_process') {
           $return = array_merge($return, $this->findMigrationDependencies($plugin_configuration['process']));
         }
       }
diff --git a/core/modules/migrate/src/Plugin/migrate/process/SubProcess.php b/core/modules/migrate/src/Plugin/migrate/process/SubProcess.php
index 5d99955510ecb330aa5ad0ca5b4be40813773e2c..3e3d8dcec5ac4737fb72c73d0986cc8b9cdb4d96 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/SubProcess.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/SubProcess.php
@@ -94,7 +94,7 @@
  *
  * process:
  *   filters:
- *     plugin: iterator
+ *     plugin: sub_process
  *     source: filters
  *     key: "@id"
  *     process:
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
index 0af144598b37ba00c323597245760b27464d0873..c2cec4cff6e342d46761dcfc997f483a4b6d63ae 100644
--- a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
@@ -42,7 +42,7 @@ public function testGetMigrationDependencies() {
           'migration' => 'm1'
         ],
         'f3' => [
-          'plugin' => 'iterator',
+          'plugin' => 'sub_process',
           'process' => [
             'target_id' => [
               'plugin' => 'migration',
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php
index 1579afadc594c792f733d61761b3cebd6c23eba2..062f0f1d97b1d36076e492cd6a1c2d6796685189 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php
@@ -20,7 +20,7 @@ class NodeReference extends FieldPluginBase {
    */
   public function processFieldValues(MigrationInterface $migration, $field_name, $data) {
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => [
         'target_id' => [
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php
index 11df8ec243838a2b537bc265cb334187f947b5ec..a5de3687eda99f0ee45895bc00348fcad29039d8 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php
@@ -20,7 +20,7 @@ class UserReference extends FieldPluginBase {
    */
   public function processFieldValues(MigrationInterface $migration, $field_name, $data) {
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => [
         'target_id' => [
diff --git a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
index 27cb8d355fdb35465d991d45871e68f34b83b66a..aac1ba634844d7c2b8c42a88cca1387a3857d1bb 100644
--- a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
@@ -28,7 +28,7 @@ class TaxonomyTermReference extends CckFieldPluginBase {
    */
   public function processCckFieldValues(MigrationInterface $migration, $field_name, $data) {
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => [
         'target_id' => 'tid',
diff --git a/core/modules/taxonomy/src/Plugin/migrate/field/TaxonomyTermReference.php b/core/modules/taxonomy/src/Plugin/migrate/field/TaxonomyTermReference.php
index 56ec20ac2747b133932b5f9dc87021586bc4fb8b..54ce9dbda8031506dcc0477634721a7345445600 100644
--- a/core/modules/taxonomy/src/Plugin/migrate/field/TaxonomyTermReference.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/field/TaxonomyTermReference.php
@@ -21,7 +21,7 @@ class TaxonomyTermReference extends FieldPluginBase {
    */
   public function processFieldValues(MigrationInterface $migration, $field_name, $data) {
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => [
         'target_id' => 'tid',
diff --git a/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/cckfield/TaxonomyTermReferenceCckTest.php b/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/cckfield/TaxonomyTermReferenceCckTest.php
index 981969fc8d02f33398685a0e815067983ccde0cc..437fd67e270a8c02069e859b441567fdf351ca9e 100644
--- a/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/cckfield/TaxonomyTermReferenceCckTest.php
+++ b/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/cckfield/TaxonomyTermReferenceCckTest.php
@@ -51,7 +51,7 @@ public function testProcessCckFieldValues() {
     $this->plugin->processFieldValues($this->migration, 'somefieldname', []);
 
     $expected = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => 'somefieldname',
       'process' => [
         'target_id' => 'tid',
diff --git a/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/field/TaxonomyTermReferenceFieldTest.php b/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/field/TaxonomyTermReferenceFieldTest.php
index 974fc158cdb9522bd4497da667d01e78ba7723a5..8422293c2721bbe24e406411567889a5f362f496 100644
--- a/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/field/TaxonomyTermReferenceFieldTest.php
+++ b/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/field/TaxonomyTermReferenceFieldTest.php
@@ -50,7 +50,7 @@ public function testProcessFieldValues() {
     $this->plugin->processFieldValues($this->migration, 'somefieldname', []);
 
     $expected = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => 'somefieldname',
       'process' => [
         'target_id' => 'tid',
diff --git a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
index e2511de836345b9eb476d4f1421df04d201700a8..d3558a71724c7b536187035dbd2362d11cfab749 100644
--- a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
+++ b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
@@ -98,7 +98,7 @@ public function processCckFieldValues(MigrationInterface $migration, $field_name
     }
 
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => $process,
     ];
diff --git a/core/modules/text/src/Plugin/migrate/field/d6/TextField.php b/core/modules/text/src/Plugin/migrate/field/d6/TextField.php
index 62deeee10cf65741d9506dee5e72489b96738792..d1da3f43f4d4326c78cc7bc6ae9454b1d759d159 100644
--- a/core/modules/text/src/Plugin/migrate/field/d6/TextField.php
+++ b/core/modules/text/src/Plugin/migrate/field/d6/TextField.php
@@ -90,7 +90,7 @@ public function processFieldValues(MigrationInterface $migration, $field_name, $
     }
 
     $process = [
-      'plugin' => 'iterator',
+      'plugin' => 'sub_process',
       'source' => $field_name,
       'process' => $process,
     ];
diff --git a/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php b/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php
index 2d2c6550039c38fc7b4cb27a110764c735d6b73f..2273c186bfb9b27dbaf427de5963de1381c1d8be 100644
--- a/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php
+++ b/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php
@@ -55,7 +55,7 @@ public function testProcessFilteredTextFieldValues() {
     $this->plugin->processCckFieldValues($this->migration, 'body', $field_info);
 
     $process = $this->migration->getProcess();
-    $this->assertSame('iterator', $process['plugin']);
+    $this->assertSame('sub_process', $process['plugin']);
     $this->assertSame('body', $process['source']);
     $this->assertSame('value', $process['process']['value']);
 
diff --git a/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php b/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php
index a49b9aff210644e370ae5f4b725e02de979ff090..8bf5d2a2d07d5d1352d55f6f40335c90ab0f553a 100644
--- a/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php
+++ b/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php
@@ -55,7 +55,7 @@ public function testProcessFilteredTextFieldValues() {
     $this->plugin->processFieldValues($this->migration, 'body', $field_info);
 
     $process = $this->migration->getProcess();
-    $this->assertSame('iterator', $process['plugin']);
+    $this->assertSame('sub_process', $process['plugin']);
     $this->assertSame('body', $process['source']);
     $this->assertSame('value', $process['process']['value']);
 
diff --git a/core/modules/text/tests/src/Unit/Plugin/migrate/cckfield/TextCckTest.php b/core/modules/text/tests/src/Unit/Plugin/migrate/cckfield/TextCckTest.php
index 0847c1263ee47f386def35d7317fbf8c037a569a..acd77909e44cc7bc8c75cff68cd09063e579634c 100644
--- a/core/modules/text/tests/src/Unit/Plugin/migrate/cckfield/TextCckTest.php
+++ b/core/modules/text/tests/src/Unit/Plugin/migrate/cckfield/TextCckTest.php
@@ -55,7 +55,7 @@ public function testProcessFilteredTextFieldValues() {
     $this->plugin->processCckFieldValues($this->migration, 'body', $field_info);
 
     $process = $this->migration->getProcess();
-    $this->assertSame('iterator', $process['plugin']);
+    $this->assertSame('sub_process', $process['plugin']);
     $this->assertSame('body', $process['source']);
     $this->assertSame('value', $process['process']['value']);
 
diff --git a/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php b/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php
index 836398920629377be43f2bc06639f2c8edb5c467..b79a0b5c3ed68ac025702dd8266030313f888cf4 100644
--- a/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php
+++ b/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php
@@ -54,7 +54,7 @@ public function testProcessFilteredTextFieldValues() {
     $this->plugin->processFieldValues($this->migration, 'body', $field_info);
 
     $process = $this->migration->getProcess();
-    $this->assertSame('iterator', $process['plugin']);
+    $this->assertSame('sub_process', $process['plugin']);
     $this->assertSame('body', $process['source']);
     $this->assertSame('value', $process['process']['value']);