diff --git a/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.entity_test.field_test_import_staging.yml b/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.entity_test.field_test_import_staging.yml
deleted file mode 100644
index 678c9fa..0000000
--- a/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.entity_test.field_test_import_staging.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: entity_test.entity_test.field_test_import_sync
-uuid: ea711065-6940-47cd-813d-618f64095481
-langcode: en
-field_name: field_test_import_sync
-entity_type: entity_test
-bundle: entity_test
-label: 'Import from sync'
-description: ''
-required: '0'
-default_value: {  }
-default_value_callback: ''
-settings: { }
-field_type: text
-dependencies:
-  config:
-    - field.storage.entity_test.field_test_import_sync
diff --git a/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.entity_test.field_test_import_sync.yml b/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.entity_test.field_test_import_sync.yml
new file mode 100644
index 0000000..678c9fa
--- /dev/null
+++ b/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.entity_test.field_test_import_sync.yml
@@ -0,0 +1,16 @@
+id: entity_test.entity_test.field_test_import_sync
+uuid: ea711065-6940-47cd-813d-618f64095481
+langcode: en
+field_name: field_test_import_sync
+entity_type: entity_test
+bundle: entity_test
+label: 'Import from sync'
+description: ''
+required: '0'
+default_value: {  }
+default_value_callback: ''
+settings: { }
+field_type: text
+dependencies:
+  config:
+    - field.storage.entity_test.field_test_import_sync
diff --git a/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle.field_test_import_staging_2.yml
deleted file mode 100644
index e483418..0000000
--- a/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle.field_test_import_staging_2.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: entity_test.test_bundle.field_test_import_sync_2
-uuid: f07794a2-d7cc-45b6-b40d-13cf021b5552
-langcode: en
-field_name: field_test_import_sync_2
-entity_type: entity_test
-bundle: test_bundle
-label: 'Test import field 2 on test bundle'
-description: ''
-required: '0'
-default_value: {  }
-default_value_callback: ''
-settings: { }
-field_type: text
-dependencies:
-  config:
-    - field.storage.entity_test.field_test_import_sync_2
diff --git a/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle.field_test_import_sync_2.yml b/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle.field_test_import_sync_2.yml
new file mode 100644
index 0000000..e483418
--- /dev/null
+++ b/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle.field_test_import_sync_2.yml
@@ -0,0 +1,16 @@
+id: entity_test.test_bundle.field_test_import_sync_2
+uuid: f07794a2-d7cc-45b6-b40d-13cf021b5552
+langcode: en
+field_name: field_test_import_sync_2
+entity_type: entity_test
+bundle: test_bundle
+label: 'Test import field 2 on test bundle'
+description: ''
+required: '0'
+default_value: {  }
+default_value_callback: ''
+settings: { }
+field_type: text
+dependencies:
+  config:
+    - field.storage.entity_test.field_test_import_sync_2
diff --git a/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle_2.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle_2.field_test_import_staging_2.yml
deleted file mode 100644
index 3afd2e2..0000000
--- a/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle_2.field_test_import_staging_2.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: entity_test.test_bundle_2.field_test_import_sync_2
-uuid: 49d6dd19-5097-443d-8f00-fc79525bebce
-langcode: en
-field_name: field_test_import_sync_2
-entity_type: entity_test
-bundle: test_bundle_2
-label: 'Test import field 2 on test bundle 2'
-description: ''
-required: '0'
-default_value: {  }
-default_value_callback: ''
-settings: { }
-field_type: text
-dependencies:
-  config:
-    - field.storage.entity_test.field_test_import_sync_2
diff --git a/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle_2.field_test_import_sync_2.yml b/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle_2.field_test_import_sync_2.yml
new file mode 100644
index 0000000..3afd2e2
--- /dev/null
+++ b/core/modules/field/tests/modules/field_test_config/sync/field.field.entity_test.test_bundle_2.field_test_import_sync_2.yml
@@ -0,0 +1,16 @@
+id: entity_test.test_bundle_2.field_test_import_sync_2
+uuid: 49d6dd19-5097-443d-8f00-fc79525bebce
+langcode: en
+field_name: field_test_import_sync_2
+entity_type: entity_test
+bundle: test_bundle_2
+label: 'Test import field 2 on test bundle 2'
+description: ''
+required: '0'
+default_value: {  }
+default_value_callback: ''
+settings: { }
+field_type: text
+dependencies:
+  config:
+    - field.storage.entity_test.field_test_import_sync_2
diff --git a/core/modules/field/tests/modules/field_test_config/sync/field.storage.entity_test.field_test_import_staging.yml b/core/modules/field/tests/modules/field_test_config/sync/field.storage.entity_test.field_test_import_staging.yml
deleted file mode 100644
index e47a615..0000000
--- a/core/modules/field/tests/modules/field_test_config/sync/field.storage.entity_test.field_test_import_staging.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-id: entity_test.field_test_import_sync
-uuid: 0bf654cc-f14a-4881-b94c-76959e47466b
-langcode: en
-field_name: field_test_import_sync
-entity_type: entity_test
-type: text
-settings:
-  max_length: '255'
-module: text
-locked: '0'
-cardinality: '1'
-translatable: '0'
-indexes:
-  format:
-    - format
-dependencies:
-  module:
-    - entity_test
-    - text
-persist_with_no_fields: false
diff --git a/core/modules/field/tests/modules/field_test_config/sync/field.storage.entity_test.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/sync/field.storage.entity_test.field_test_import_staging_2.yml
deleted file mode 100644
index fee4cbe..0000000
--- a/core/modules/field/tests/modules/field_test_config/sync/field.storage.entity_test.field_test_import_staging_2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-id: entity_test.field_test_import_sync_2
-uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00
-langcode: en
-field_name: field_test_import_sync_2
-entity_type: entity_test
-type: text
-settings:
-  max_length: '255'
-module: text
-locked: '0'
-cardinality: '1'
-translatable: '0'
-indexes:
-  format:
-    - format
-dependencies:
-  module:
-    - entity_test
-    - text
-persist_with_no_fields: false
diff --git a/core/modules/field/tests/modules/field_test_config/sync/field.storage.entity_test.field_test_import_sync.yml b/core/modules/field/tests/modules/field_test_config/sync/field.storage.entity_test.field_test_import_sync.yml
new file mode 100644
index 0000000..e47a615
--- /dev/null
+++ b/core/modules/field/tests/modules/field_test_config/sync/field.storage.entity_test.field_test_import_sync.yml
@@ -0,0 +1,20 @@
+id: entity_test.field_test_import_sync
+uuid: 0bf654cc-f14a-4881-b94c-76959e47466b
+langcode: en
+field_name: field_test_import_sync
+entity_type: entity_test
+type: text
+settings:
+  max_length: '255'
+module: text
+locked: '0'
+cardinality: '1'
+translatable: '0'
+indexes:
+  format:
+    - format
+dependencies:
+  module:
+    - entity_test
+    - text
+persist_with_no_fields: false
diff --git a/core/modules/field/tests/modules/field_test_config/sync/field.storage.entity_test.field_test_import_sync_2.yml b/core/modules/field/tests/modules/field_test_config/sync/field.storage.entity_test.field_test_import_sync_2.yml
new file mode 100644
index 0000000..fee4cbe
--- /dev/null
+++ b/core/modules/field/tests/modules/field_test_config/sync/field.storage.entity_test.field_test_import_sync_2.yml
@@ -0,0 +1,20 @@
+id: entity_test.field_test_import_sync_2
+uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00
+langcode: en
+field_name: field_test_import_sync_2
+entity_type: entity_test
+type: text
+settings:
+  max_length: '255'
+module: text
+locked: '0'
+cardinality: '1'
+translatable: '0'
+indexes:
+  format:
+    - format
+dependencies:
+  module:
+    - entity_test
+    - text
+persist_with_no_fields: false