diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldImportCreateTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldImportCreateTest.php
index 0dbc15a..8040516 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FieldImportCreateTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldImportCreateTest.php
@@ -80,20 +80,20 @@ function testImportCreate() {
     $instance_config_name = "field.instance.$instance_id";
 
     // One field with two field instances.
-    $field_id_2 = 'field_test_import_2_staging';
+    $field_id_2 = 'field_test_import_staging_2';
     $instance_id_2a = "test_entity.test_bundle.$field_id_2";
     $instance_id_2b = "test_entity.test_bundle_2.$field_id_2";
-    $field_2_config_name = "field.field.$field_id_2";
-    $instance_2a_config_name = "field.instance.$instance_id_2a";
-    $instance_2b_config_name = "field.instance.$instance_id_2b";
+    $field_config_name_2 = "field.field.$field_id_2";
+    $instance_config_name_2a = "field.instance.$instance_id_2a";
+    $instance_config_name_2b = "field.instance.$instance_id_2b";
 
     // Simulate config data to import:
     $src_dir = drupal_get_path('module', 'field_test_config') . '/staging';
     $this->assertTrue(file_unmanaged_copy("$src_dir/$field_config_name.yml", "public://config_staging/$field_config_name.yml"));
     $this->assertTrue(file_unmanaged_copy("$src_dir/$instance_config_name.yml", "public://config_staging/$instance_config_name.yml"));
-    $this->assertTrue(file_unmanaged_copy("$src_dir/$field_2_config_name.yml", "public://config_staging/$field_2_config_name.yml"));
-    $this->assertTrue(file_unmanaged_copy("$src_dir/$instance_2a_config_name.yml", "public://config_staging/$instance_2a_config_name.yml"));
-    $this->assertTrue(file_unmanaged_copy("$src_dir/$instance_2b_config_name.yml", "public://config_staging/$instance_2b_config_name.yml"));
+    $this->assertTrue(file_unmanaged_copy("$src_dir/$field_config_name_2.yml", "public://config_staging/$field_config_name_2.yml"));
+    $this->assertTrue(file_unmanaged_copy("$src_dir/$instance_config_name_2a.yml", "public://config_staging/$instance_config_name_2a.yml"));
+    $this->assertTrue(file_unmanaged_copy("$src_dir/$instance_config_name_2b.yml", "public://config_staging/$instance_config_name_2b.yml"));
 
     // Add the corresponding entries to the current manifest data.
     $field_manifest_name = 'manifest.field.field';
@@ -101,11 +101,11 @@ function testImportCreate() {
     $active = $this->container->get('config.storage');
     $field_manifest = $active->read($field_manifest_name);
     $field_manifest[$field_id] = array('name' => $field_config_name);
-    $field_manifest[$field_id_2] = array('name' => $field_2_config_name);
+    $field_manifest[$field_id_2] = array('name' => $field_config_name_2);
     $instance_manifest = $active->read($instance_manifest_name);
     $instance_manifest[$instance_id] = array('name' => $instance_config_name);
-    $instance_manifest[$instance_id_2a] = array('name' => $instance_2a_config_name);
-    $instance_manifest[$instance_id_2b] = array('name' => $instance_2b_config_name);
+    $instance_manifest[$instance_id_2a] = array('name' => $instance_config_name_2a);
+    $instance_manifest[$instance_id_2b] = array('name' => $instance_config_name_2b);
 
     // Save the manifests as files in the the staging directory.
     $staging = $this->container->get('config.storage.staging');
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.field.field_test_import_2_staging.yml b/core/modules/field/tests/modules/field_test_config/staging/field.field.field_test_import_2_staging.yml
deleted file mode 100644
index b181aa9..0000000
--- a/core/modules/field/tests/modules/field_test_config/staging/field.field.field_test_import_2_staging.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-id: field_test_import_2
-uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00
-langcode: und
-type: text
-settings:
-  max_length: '255'
-module: text
-active: '1'
-entity_types: {  }
-storage:
-  type: field_sql_storage
-  settings: {  }
-  module: field_sql_storage
-  active: '1'
-locked: '0'
-cardinality: '1'
-translatable: false
-indexes:
-  format:
-    - format
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.field.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.field.field_test_import_staging_2.yml
new file mode 100644
index 0000000..a0eb94e
--- /dev/null
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.field.field_test_import_staging_2.yml
@@ -0,0 +1,20 @@
+id: field_test_import_staging_2
+uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00
+langcode: und
+type: text
+settings:
+  max_length: '255'
+module: text
+active: '1'
+entity_types: {  }
+storage:
+  type: field_sql_storage
+  settings: {  }
+  module: field_sql_storage
+  active: '1'
+locked: '0'
+cardinality: '1'
+translatable: '0'
+indexes:
+  format:
+    - format
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle.field_test_import_2_staging.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle.field_test_import_2_staging.yml
deleted file mode 100644
index 0fefb53..0000000
--- a/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle.field_test_import_2_staging.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-id: test_entity.test_bundle.field_test_import_2
-uuid: f07794a2-d7cc-45b6-b40d-13cf021b5552
-langcode: und
-field_uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00
-entity_type: test_entity
-bundle: test_bundle
-label: 'Test import field 2 on test bundle'
-description: ''
-required: '0'
-default_value: {  }
-default_value_function: ''
-settings:
-  text_processing: '0'
-  user_register_form: false
-widget:
-  weight: '-2'
-  type: text_textfield
-  module: text
-  settings:
-    size: '60'
-field_type: text
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle.field_test_import_staging_2.yml
new file mode 100644
index 0000000..c3bb7a5
--- /dev/null
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle.field_test_import_staging_2.yml
@@ -0,0 +1,21 @@
+id: test_entity.test_bundle.field_test_import_staging_2
+uuid: f07794a2-d7cc-45b6-b40d-13cf021b5552
+langcode: und
+field_uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00
+entity_type: test_entity
+bundle: test_bundle
+label: 'Test import field 2 on test bundle'
+description: ''
+required: '0'
+default_value: {  }
+default_value_function: ''
+settings:
+  text_processing: '0'
+  user_register_form: false
+widget:
+  weight: '-2'
+  type: text_textfield
+  module: text
+  settings:
+    size: '60'
+field_type: text
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle_2.field_test_import_2_staging.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle_2.field_test_import_2_staging.yml
deleted file mode 100644
index 2f99d4e..0000000
--- a/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle_2.field_test_import_2_staging.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-id: test_entity.test_bundle_2.field_test_import_2
-uuid: 49d6dd19-5097-443d-8f00-fc79525bebce
-langcode: und
-field_uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00
-entity_type: test_entity
-bundle: test_bundle_2
-label: 'Test import field 2 on test bundle 2'
-description: ''
-required: '0'
-default_value: {  }
-default_value_function: ''
-settings:
-  text_processing: '0'
-  user_register_form: false
-widget:
-  weight: '-2'
-  type: text_textfield
-  module: text
-  settings:
-    size: '60'
-field_type: text
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle_2.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle_2.field_test_import_staging_2.yml
new file mode 100644
index 0000000..63ad202
--- /dev/null
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle_2.field_test_import_staging_2.yml
@@ -0,0 +1,21 @@
+id: test_entity.test_bundle_2.field_test_import_staging_2
+uuid: 49d6dd19-5097-443d-8f00-fc79525bebce
+langcode: und
+field_uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00
+entity_type: test_entity
+bundle: test_bundle_2
+label: 'Test import field 2 on test bundle 2'
+description: ''
+required: '0'
+default_value: {  }
+default_value_function: ''
+settings:
+  text_processing: '0'
+  user_register_form: false
+widget:
+  weight: '-2'
+  type: text_textfield
+  module: text
+  settings:
+    size: '60'
+field_type: text