diff --git a/core/modules/field/migration_templates/d6_field.yml b/core/modules/field/migration_templates/d6_field.yml
index 2c2a596..aaffebc 100644
--- a/core/modules/field/migration_templates/d6_field.yml
+++ b/core/modules/field/migration_templates/d6_field.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processField
+core: 6
 source:
   plugin: d6_field
   constants:
@@ -17,7 +18,6 @@ process:
   type:
     -
       plugin: field_type
-      core: 6
       source:
         - type
         - widget_type
diff --git a/core/modules/field/migration_templates/d6_field_formatter_settings.yml b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
index 7496db3..9855f1c 100644
--- a/core/modules/field/migration_templates/d6_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldFormatter
+core: 6
 source:
   plugin: d6_field_instance_per_view_mode
   constants:
diff --git a/core/modules/field/migration_templates/d6_field_instance.yml b/core/modules/field/migration_templates/d6_field_instance.yml
index b5035c2..4b48d8d 100644
--- a/core/modules/field/migration_templates/d6_field_instance.yml
+++ b/core/modules/field/migration_templates/d6_field_instance.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldInstance
+core: 6
 source:
   plugin: d6_field_instance
   constants:
diff --git a/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
index 46b7d75..df943de 100644
--- a/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldWidget
+core: 6
 source:
   plugin: d6_field_instance_per_form_display
   constants:
diff --git a/core/modules/field/migration_templates/d7_field.yml b/core/modules/field/migration_templates/d7_field.yml
index 01fc527..6017994 100755
--- a/core/modules/field/migration_templates/d7_field.yml
+++ b/core/modules/field/migration_templates/d7_field.yml
@@ -2,6 +2,9 @@ id: d7_field
 label: Field configuration
 migration_tags:
   - Drupal 7
+class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
+cck_plugin_method: processField
+core: 7
 source:
   plugin: d7_field
   constants:
@@ -14,7 +17,6 @@ process:
   field_name: field_name
   type:
     plugin: field_type
-    core: 7
     source: type
     map:
       date: datetime
diff --git a/core/modules/field/migration_templates/d7_field_formatter_settings.yml b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
index 2eb8ec8..3fc0272 100644
--- a/core/modules/field/migration_templates/d7_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
@@ -2,6 +2,9 @@ id: d7_field_formatter_settings
 label: Field formatter configuration
 migration_tags:
   - Drupal 7
+class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
+cck_plugin_method: processFieldFormatter
+core: 7
 source:
   plugin: d7_field_instance_per_view_mode
   constants:
diff --git a/core/modules/field/migration_templates/d7_field_instance.yml b/core/modules/field/migration_templates/d7_field_instance.yml
index 62ec9ce..9ac1626 100644
--- a/core/modules/field/migration_templates/d7_field_instance.yml
+++ b/core/modules/field/migration_templates/d7_field_instance.yml
@@ -2,6 +2,9 @@ id: d7_field_instance
 label: Field instance configuration
 migration_tags:
   - Drupal 7
+class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
+cck_plugin_method: processFieldInstance
+core: 7
 source:
   plugin: d7_field_instance
   constants:
diff --git a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
index e710fbe..b4dff13 100644
--- a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
@@ -2,6 +2,9 @@ id: d7_field_instance_widget_settings
 label: Field instance widget configuration
 migration_tags:
   - Drupal 7
+class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
+cck_plugin_method: processFieldWidget
+core: 7
 source:
   plugin: d7_field_instance_per_form_display
   constants:
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php b/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
index f7e0d29..4a8a610 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
@@ -99,7 +99,7 @@ public function getProcess() {
       }
       foreach ($source_plugin as $row) {
         $field_type = $row->getSourceProperty('type');
-        $core = $row->getSourceProperty('core');
+        $core = $this->pluginDefinition['core'];
         if (empty($core)) {
           $core = '6';
         }