diff --git a/core/modules/action/migration_templates/d6_action_settings.yml b/core/modules/action/migration_templates/d6_action_settings.yml
index f46092c..020ebde 100644
--- a/core/modules/action/migration_templates/d6_action_settings.yml
+++ b/core/modules/action/migration_templates/d6_action_settings.yml
@@ -6,8 +6,10 @@ source:
   plugin: variable
   variables:
     - actions_max_stack
+  module: system
 process:
   recursion_limit: actions_max_stack
 destination:
   plugin: config
   config_name: action.settings
+  module: action
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml b/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
index 361f35c..47e5fc8 100644
--- a/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_aggregator_feed
+  module: aggregator
 process:
   fid: fid
   title: title
@@ -17,3 +18,4 @@ process:
   modified: modified
 destination:
   plugin: entity:aggregator_feed
+  module: aggregator
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_item.yml b/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
index 6698c22..0a93c82 100644
--- a/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_aggregator_item
+  module: aggregator
 process:
   iid: iid
   fid:
@@ -19,6 +20,7 @@ process:
   guid: guid
 destination:
   plugin: entity:aggregator_item
+  module: aggregator
 migration_dependencies:
   required:
     - d6_aggregator_feed
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
index 72372e4..ba93c7f 100644
--- a/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
@@ -12,6 +12,7 @@ source:
     - aggregator_teaser_length
     - aggregator_clear
     - aggregator_summary_items
+  module: aggregator
 process:
   fetcher: aggregator_fetcher
   parser: aggregator_parser
@@ -23,3 +24,4 @@ process:
 destination:
   plugin: config
   config_name: aggregator.settings
+  module: aggregator
diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
index c8c793f..cb50ffb 100644
--- a/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
+++ b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
@@ -12,6 +12,7 @@ source:
     - aggregator_teaser_length
     - aggregator_clear
     - aggregator_summary_items
+  module: aggregator
 process:
   fetcher: aggregator_fetcher
   parser: aggregator_parser
@@ -23,3 +24,4 @@ process:
 destination:
   plugin: config
   config_name: aggregator.settings
+  module: aggregator
diff --git a/core/modules/ban/migration_templates/d7_blocked_ips.yml b/core/modules/ban/migration_templates/d7_blocked_ips.yml
index 0122dc6..76eee0c 100644
--- a/core/modules/ban/migration_templates/d7_blocked_ips.yml
+++ b/core/modules/ban/migration_templates/d7_blocked_ips.yml
@@ -4,7 +4,9 @@ migration_tags:
   - Drupal 7
 source:
   plugin: d7_blocked_ips
+  module: system
 process:
   ip: ip
 destination:
   plugin: blocked_ip
+  module: ban
diff --git a/core/modules/block/migration_templates/d6_block.yml b/core/modules/block/migration_templates/d6_block.yml
index 6ab2a4c..7ec0200 100644
--- a/core/modules/block/migration_templates/d6_block.yml
+++ b/core/modules/block/migration_templates/d6_block.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: block
+  module: block
 process:
   # Block status is not a thing in Drupal 8, so this is how we skip over
   # disabled blocks.
@@ -93,6 +94,7 @@ process:
     skip_php: true
 destination:
   plugin: entity:block
+  module: block
 migration_dependencies:
   required:
     - menu
diff --git a/core/modules/block/migration_templates/d7_block.yml b/core/modules/block/migration_templates/d7_block.yml
index 628bf71..3d0bb95 100755
--- a/core/modules/block/migration_templates/d7_block.yml
+++ b/core/modules/block/migration_templates/d7_block.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 7
 source:
   plugin: block
+  module: block
 process:
   # Block status is not a thing in Drupal 8, so this is how we skip over
   # disabled blocks.
@@ -94,6 +95,7 @@ process:
     skip_php: true
 destination:
   plugin: entity:block
+  module: block
 migration_dependencies:
   optional:
     - d7_custom_block
diff --git a/core/modules/block_content/migration_templates/block_content_body_field.yml b/core/modules/block_content/migration_templates/block_content_body_field.yml
index 41484f8..e61f354 100644
--- a/core/modules/block_content/migration_templates/block_content_body_field.yml
+++ b/core/modules/block_content/migration_templates/block_content_body_field.yml
@@ -19,6 +19,7 @@ source:
       type: string
     field_name:
       type: string
+  module: block
 process:
   entity_type: entity_type
   bundle: bundle
@@ -27,6 +28,7 @@ process:
   'settings/display_summary': display_summary
 destination:
   plugin: entity:field_config
+  module: block_content
 migration_dependencies:
   required:
     - block_content_type
diff --git a/core/modules/block_content/migration_templates/block_content_type.yml b/core/modules/block_content/migration_templates/block_content_type.yml
index 7b77ba5..e601126 100644
--- a/core/modules/block_content/migration_templates/block_content_type.yml
+++ b/core/modules/block_content/migration_templates/block_content_type.yml
@@ -12,8 +12,10 @@ source:
   ids:
     id:
       type: string
+  module: block
 process:
   id: id
   label: label
 destination:
   plugin: entity:block_content_type
+  module: block_content
diff --git a/core/modules/block_content/migration_templates/d6_custom_block.yml b/core/modules/block_content/migration_templates/d6_custom_block.yml
index be99072..6216653 100644
--- a/core/modules/block_content/migration_templates/d6_custom_block.yml
+++ b/core/modules/block_content/migration_templates/d6_custom_block.yml
@@ -6,6 +6,7 @@ source:
   plugin: d6_box
   constants:
     type: basic
+  module: block
 process:
   id: bid
   type: 'constants/type'
@@ -18,6 +19,7 @@ process:
 destination:
   plugin: entity:block_content
   no_stub: true
+  module: block_content
 migration_dependencies:
   required:
     - d6_filter_format
diff --git a/core/modules/block_content/migration_templates/d7_custom_block.yml b/core/modules/block_content/migration_templates/d7_custom_block.yml
index f63ca93..c2b0c51 100755
--- a/core/modules/block_content/migration_templates/d7_custom_block.yml
+++ b/core/modules/block_content/migration_templates/d7_custom_block.yml
@@ -6,6 +6,7 @@ source:
   plugin: d7_block_custom
   constants:
     type: basic
+  module: block
 process:
   id: bid
   type: 'constants/type'
@@ -18,6 +19,7 @@ process:
 destination:
   plugin: entity:block_content
   no_stub: true
+  module: block_content
 migration_dependencies:
   required:
     - d7_filter_format
diff --git a/core/modules/book/migration_templates/d6_book.yml b/core/modules/book/migration_templates/d6_book.yml
index dca43b1..7870678 100644
--- a/core/modules/book/migration_templates/d6_book.yml
+++ b/core/modules/book/migration_templates/d6_book.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_book
+  module: book
 process:
   nid: nid
   'book/bid': bid
@@ -18,6 +19,7 @@ process:
       migration: d6_book
 destination:
   plugin: book
+  module: book
 migration_dependencies:
   required:
     - d6_node:*
diff --git a/core/modules/book/migration_templates/d6_book_settings.yml b/core/modules/book/migration_templates/d6_book_settings.yml
index 16e6695..add7ea6 100644
--- a/core/modules/book/migration_templates/d6_book_settings.yml
+++ b/core/modules/book/migration_templates/d6_book_settings.yml
@@ -8,6 +8,7 @@ source:
     - book_child_type
     - book_block_mode
     - book_allowed_types
+  module: book
 process:
   child_type: book_child_type
   'block/navigation/mode': book_block_mode
@@ -15,3 +16,4 @@ process:
 destination:
   plugin: config
   config_name: book.settings
+  module: book
diff --git a/core/modules/comment/migration_templates/d6_comment.yml b/core/modules/comment/migration_templates/d6_comment.yml
index 62f3f64..56a5b71 100644
--- a/core/modules/comment/migration_templates/d6_comment.yml
+++ b/core/modules/comment/migration_templates/d6_comment.yml
@@ -6,6 +6,7 @@ source:
   plugin: d6_comment
   constants:
     entity_type: node
+  module: comment
 process:
   cid: cid
   pid:
@@ -35,6 +36,7 @@ process:
     source: format
 destination:
   plugin: entity:comment
+  module: comment
 migration_dependencies:
   required:
     - d6_node:*
diff --git a/core/modules/comment/migration_templates/d6_comment_entity_display.yml b/core/modules/comment/migration_templates/d6_comment_entity_display.yml
index c650673..a823436 100644
--- a/core/modules/comment/migration_templates/d6_comment_entity_display.yml
+++ b/core/modules/comment/migration_templates/d6_comment_entity_display.yml
@@ -12,6 +12,7 @@ source:
       label: hidden
       type: comment_default
       weight: 20
+  module: comment
 process:
   entity_type: 'constants/entity_type'
   field_name: 'constants/field_name'
@@ -20,6 +21,7 @@ process:
   bundle: node_type
 destination:
   plugin: component_entity_display
+  module: comment
 migration_dependencies:
   required:
     - d6_comment_field_instance
diff --git a/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
index c33685f..318ee21 100644
--- a/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
+++ b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
@@ -11,6 +11,7 @@ source:
     options:
       type: comment_default
       weight: 20
+  module: comment
 process:
   entity_type: 'constants/entity_type'
   field_name: 'constants/field_name'
@@ -19,6 +20,7 @@ process:
   bundle: node_type
 destination:
   plugin: component_entity_form_display
+  module: comment
 migration_dependencies:
   required:
     - d6_comment_field_instance
diff --git a/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml b/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml
index abe6191..77604cc 100644
--- a/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml
+++ b/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml
@@ -11,6 +11,7 @@ source:
     options:
       type: string_textfield
       weight: 10
+  module: comment
 process:
   entity_type: 'constants/entity_type'
   field_name: 'constants/field_name'
@@ -26,6 +27,7 @@ process:
   bundle: comment_type
 destination:
   plugin: component_entity_form_display
+  module: comment
 migration_dependencies:
   required:
     - d6_comment_type
diff --git a/core/modules/comment/migration_templates/d6_comment_field.yml b/core/modules/comment/migration_templates/d6_comment_field.yml
index 469d604..9681422 100644
--- a/core/modules/comment/migration_templates/d6_comment_field.yml
+++ b/core/modules/comment/migration_templates/d6_comment_field.yml
@@ -7,6 +7,7 @@ source:
   constants:
     entity_type: node
     type: comment
+  module: comment
 process:
   entity_type: 'constants/entity_type'
   field_name: comment_type
@@ -14,6 +15,7 @@ process:
   'settings/comment_type': comment_type
 destination:
   plugin: md_entity:field_storage_config
+  module: comment
 migration_dependencies:
   required:
     - d6_comment_type
diff --git a/core/modules/comment/migration_templates/d6_comment_field_instance.yml b/core/modules/comment/migration_templates/d6_comment_field_instance.yml
index 372db03..77d820f 100644
--- a/core/modules/comment/migration_templates/d6_comment_field_instance.yml
+++ b/core/modules/comment/migration_templates/d6_comment_field_instance.yml
@@ -8,6 +8,7 @@ source:
     entity_type: node
     label: Comments
     required: true
+  module: comment
 process:
   entity_type: 'constants/entity_type'
   label: 'constants/label'
@@ -27,6 +28,7 @@ process:
   'settings/preview': comment_preview
 destination:
   plugin: entity:field_config
+  module: comment
 migration_dependencies:
   required:
     - d6_comment_field
diff --git a/core/modules/comment/migration_templates/d6_comment_type.yml b/core/modules/comment/migration_templates/d6_comment_type.yml
index 69a2bd8..de288b2 100644
--- a/core/modules/comment/migration_templates/d6_comment_type.yml
+++ b/core/modules/comment/migration_templates/d6_comment_type.yml
@@ -6,6 +6,7 @@ source:
   plugin: d6_comment_variable_per_comment_type
   constants:
     entity_type: node
+  module: comment
 process:
   target_entity_type_id: 'constants/entity_type'
   id: comment_type
@@ -13,3 +14,4 @@ process:
   description: description
 destination:
   plugin: entity:comment_type
+  module: comment
diff --git a/core/modules/comment/migration_templates/d7_comment.yml b/core/modules/comment/migration_templates/d7_comment.yml
index b1b35bf..d0868e4 100755
--- a/core/modules/comment/migration_templates/d7_comment.yml
+++ b/core/modules/comment/migration_templates/d7_comment.yml
@@ -6,6 +6,7 @@ source:
   plugin: d7_comment
   constants:
     entity_type: node
+  module: comment
 process:
   cid: cid
   pid:
@@ -29,6 +30,7 @@ process:
   comment_body: comment_body
 destination:
   plugin: entity:comment
+  module: comment
 migration_dependencies:
   required:
     - d7_node:*
diff --git a/core/modules/comment/migration_templates/d7_comment_entity_display.yml b/core/modules/comment/migration_templates/d7_comment_entity_display.yml
index 2004505..9aa220e 100755
--- a/core/modules/comment/migration_templates/d7_comment_entity_display.yml
+++ b/core/modules/comment/migration_templates/d7_comment_entity_display.yml
@@ -11,6 +11,7 @@ source:
       label: hidden
       type: comment_default
       weight: 20
+  module: comment
 process:
   entity_type: 'constants/entity_type'
   field_name: bundle
@@ -19,6 +20,7 @@ process:
   bundle: node_type
 destination:
   plugin: component_entity_display
+  module: comment
 migration_dependencies:
   required:
     - d7_comment_field_instance
diff --git a/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml b/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml
index 0315c4a..e886d0e 100755
--- a/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml
+++ b/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml
@@ -11,6 +11,7 @@ source:
     options:
       type: comment_default
       weight: 20
+  module: comment
 process:
   entity_type: 'constants/entity_type'
   field_name: 'constants/field_name'
@@ -19,6 +20,7 @@ process:
   bundle: node_type
 destination:
   plugin: component_entity_form_display
+  module: comment
 migration_dependencies:
   required:
     - d7_comment_field_instance
diff --git a/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml b/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml
index c27303e..7aed2b0 100755
--- a/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml
+++ b/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml
@@ -11,6 +11,7 @@ source:
     options:
       type: string_textfield
       weight: 10
+  module: comment
 process:
   entity_type: 'constants/entity_type'
   field_name: 'constants/field_name'
@@ -25,6 +26,7 @@ process:
   bundle: bundle
 destination:
   plugin: component_entity_form_display
+  module: comment
 migration_dependencies:
   required:
     - d7_comment_type
diff --git a/core/modules/comment/migration_templates/d7_comment_field.yml b/core/modules/comment/migration_templates/d7_comment_field.yml
index b4b3543..79fdde6 100755
--- a/core/modules/comment/migration_templates/d7_comment_field.yml
+++ b/core/modules/comment/migration_templates/d7_comment_field.yml
@@ -7,6 +7,7 @@ source:
   constants:
     entity_type: node
     type: comment
+  module: comment
 process:
   entity_type: 'constants/entity_type'
   field_name: bundle
@@ -14,6 +15,7 @@ process:
   'settings/comment_type': bundle
 destination:
   plugin: entity:field_storage_config
+  module: comment
 migration_dependencies:
   required:
     - d7_comment_type
diff --git a/core/modules/comment/migration_templates/d7_comment_field_instance.yml b/core/modules/comment/migration_templates/d7_comment_field_instance.yml
index 80a1a51..382d176 100755
--- a/core/modules/comment/migration_templates/d7_comment_field_instance.yml
+++ b/core/modules/comment/migration_templates/d7_comment_field_instance.yml
@@ -8,6 +8,7 @@ source:
     entity_type: node
     label: Comments
     required: true
+  module: comment
 process:
   entity_type: 'constants/entity_type'
   label: 'constants/label'
@@ -22,6 +23,7 @@ process:
   'settings/preview': preview
 destination:
   plugin: entity:field_config
+  module: comment
 migration_dependencies:
   required:
     - d7_comment_field
diff --git a/core/modules/comment/migration_templates/d7_comment_type.yml b/core/modules/comment/migration_templates/d7_comment_type.yml
index 090bfdd..19af301 100755
--- a/core/modules/comment/migration_templates/d7_comment_type.yml
+++ b/core/modules/comment/migration_templates/d7_comment_type.yml
@@ -6,12 +6,14 @@ source:
   plugin: d7_comment_type
   constants:
     entity_type: node
+  module: comment
 process:
   target_entity_type_id: 'constants/entity_type'
   id: bundle
   label: label
 destination:
   plugin: entity:comment_type
+  module: comment
 migration_dependencies:
   required:
     - d7_node_type
diff --git a/core/modules/contact/migration_templates/d6_contact_category.yml b/core/modules/contact/migration_templates/d6_contact_category.yml
index 6e545ed..51ab849 100644
--- a/core/modules/contact/migration_templates/d6_contact_category.yml
+++ b/core/modules/contact/migration_templates/d6_contact_category.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_contact_category
+  module: contact
 process:
   id:
     -
@@ -20,3 +21,4 @@ process:
   weight: weight
 destination:
   plugin: entity:contact_form
+  module: contact
diff --git a/core/modules/contact/migration_templates/d6_contact_settings.yml b/core/modules/contact/migration_templates/d6_contact_settings.yml
index b1da5a9..1ebc840 100644
--- a/core/modules/contact/migration_templates/d6_contact_settings.yml
+++ b/core/modules/contact/migration_templates/d6_contact_settings.yml
@@ -7,6 +7,7 @@ source:
   variables:
     - contact_default_status
     - contact_hourly_threshold
+  module: contact
 process:
   user_default_enabled: contact_default_status
   'flood/limit': contact_hourly_threshold
@@ -17,6 +18,7 @@ process:
 destination:
   plugin: config
   config_name: contact.settings
+  module: contact
 migration_dependencies:
   required:
     - d6_contact_category
diff --git a/core/modules/dblog/migration_templates/d6_dblog_settings.yml b/core/modules/dblog/migration_templates/d6_dblog_settings.yml
index 64da0a7..4b73b23 100644
--- a/core/modules/dblog/migration_templates/d6_dblog_settings.yml
+++ b/core/modules/dblog/migration_templates/d6_dblog_settings.yml
@@ -6,8 +6,10 @@ source:
   plugin: variable
   variables:
     - dblog_row_limit
+  module: dblog
 process:
   row_limit: dblog_row_limit
 destination:
   plugin: config
   config_name: dblog.settings
+  module: dblog
diff --git a/core/modules/dblog/migration_templates/d7_dblog_settings.yml b/core/modules/dblog/migration_templates/d7_dblog_settings.yml
index e22768f..91ae20c 100644
--- a/core/modules/dblog/migration_templates/d7_dblog_settings.yml
+++ b/core/modules/dblog/migration_templates/d7_dblog_settings.yml
@@ -6,8 +6,10 @@ source:
   plugin: variable
   variables:
     - dblog_row_limit
+  module: dblog
 process:
   row_limit: dblog_row_limit
 destination:
   plugin: config
   config_name: dblog.settings
+  module: dblog
diff --git a/core/modules/field/migration_templates/d6_field.yml b/core/modules/field/migration_templates/d6_field.yml
index 67cd4f6..b14e6c7 100644
--- a/core/modules/field/migration_templates/d6_field.yml
+++ b/core/modules/field/migration_templates/d6_field.yml
@@ -10,6 +10,7 @@ source:
   constants:
     entity_type: node
     langcode: en
+  module: content
 process:
   entity_type: 'constants/entity_type'
   status: active
@@ -134,3 +135,4 @@ process:
 
 destination:
   plugin: md_entity:field_storage_config
+  module: field
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 c851bf5..c1cdcda 100644
--- a/core/modules/field/migration_templates/d6_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
@@ -10,7 +10,7 @@ source:
   constants:
     entity_type: node
     third_party_settings: { }
-
+  module: content
 process:
   # We skip field types that don't exist because they weren't migrated by the
   # field migration.
@@ -252,6 +252,7 @@ process:
 
 destination:
   plugin: component_entity_display
+  module: field
 migration_dependencies:
   required:
     - d6_field_instance
diff --git a/core/modules/field/migration_templates/d6_field_instance.yml b/core/modules/field/migration_templates/d6_field_instance.yml
index 78b81ad..f006fa2 100644
--- a/core/modules/field/migration_templates/d6_field_instance.yml
+++ b/core/modules/field/migration_templates/d6_field_instance.yml
@@ -9,7 +9,7 @@ source:
   plugin: d6_field_instance
   constants:
     entity_type: node
-
+  module: content
 process:
   # We skip field types that don't exist because they weren't migrated by the
   # field migration.
@@ -49,6 +49,7 @@ process:
 
 destination:
   plugin: entity:field_config
+  module: field
 migration_dependencies:
   required:
     - d6_node_type
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 ad9c74a..27488ce 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
@@ -11,7 +11,7 @@ source:
     entity_type: node
     form_mode: default
     third_party_settings: { }
-
+  module: content
 process:
   # We skip field types that don't exist because they weren't migrated by the
   # field migration.
@@ -58,6 +58,7 @@ process:
 
 destination:
   plugin: component_entity_form_display
+  module: field
 migration_dependencies:
   required:
     - d6_field_instance
diff --git a/core/modules/field/migration_templates/d7_field.yml b/core/modules/field/migration_templates/d7_field.yml
index 3b01f54..7ed4597 100755
--- a/core/modules/field/migration_templates/d7_field.yml
+++ b/core/modules/field/migration_templates/d7_field.yml
@@ -7,6 +7,7 @@ source:
   constants:
     status: true
     langcode: und
+  module: field
 process:
   entity_type: entity_type
   status: 'constants/status'
@@ -40,3 +41,4 @@ process:
     plugin: d7_field_settings
 destination:
   plugin: entity:field_storage_config
+  module: field
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..0d0c36d 100644
--- a/core/modules/field/migration_templates/d7_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
@@ -6,6 +6,7 @@ source:
   plugin: d7_field_instance_per_view_mode
   constants:
     third_party_settings: { }
+  module: field
 process:
   # We skip field types that don't exist because they weren't migrated by the
   # field migration.
@@ -69,6 +70,7 @@ process:
   "options/third_party_settings": 'constants/third_party_settings'
 destination:
   plugin: component_entity_display
+  module: field
 migration_dependencies:
   required:
     - d7_field_instance
diff --git a/core/modules/field/migration_templates/d7_field_instance.yml b/core/modules/field/migration_templates/d7_field_instance.yml
index 62ec9ce..3098039 100755
--- a/core/modules/field/migration_templates/d7_field_instance.yml
+++ b/core/modules/field/migration_templates/d7_field_instance.yml
@@ -6,6 +6,7 @@ source:
   plugin: d7_field_instance
   constants:
     status: true
+  module: field
 process:
   entity_type: entity_type
   field_name: field_name
@@ -27,6 +28,7 @@ process:
       - widget_settings
 destination:
   plugin: entity:field_config
+  module: field
 migration_dependencies:
   required:
     - d7_field
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..6083c10 100755
--- a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
@@ -7,6 +7,7 @@ source:
   constants:
     form_mode: default
     third_party_settings: { }
+  module: field
 process:
   # We skip field types that don't exist because they weren't migrated by the
   # field migration.
@@ -53,6 +54,7 @@ process:
   'options/third_party_settings': 'constants/third_party_settings'
 destination:
   plugin: component_entity_form_display
+  module: field
 migration_dependencies:
   required:
     - d7_field_instance
diff --git a/core/modules/field/migration_templates/d7_view_modes.yml b/core/modules/field/migration_templates/d7_view_modes.yml
index b4f9998..607ad60 100644
--- a/core/modules/field/migration_templates/d7_view_modes.yml
+++ b/core/modules/field/migration_templates/d7_view_modes.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 7
 source:
   plugin: d7_view_mode
+  module: field
 process:
   mode:
     plugin: static_map
@@ -25,3 +26,4 @@ process:
   targetEntityType: entity_type
 destination:
   plugin: entity:entity_view_mode
+  module: field
diff --git a/core/modules/file/migration_templates/d6_file.yml b/core/modules/file/migration_templates/d6_file.yml
index 07a9cc2..84a80e5 100644
--- a/core/modules/file/migration_templates/d6_file.yml
+++ b/core/modules/file/migration_templates/d6_file.yml
@@ -6,6 +6,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_file
+  module: system
 process:
   fid: fid
   filename: filename
@@ -23,3 +24,4 @@ process:
   uid: uid
 destination:
   plugin: entity:file
+  module: file
diff --git a/core/modules/file/migration_templates/d6_file_settings.yml b/core/modules/file/migration_templates/d6_file_settings.yml
index d59aa47..b3fbbaa 100644
--- a/core/modules/file/migration_templates/d6_file_settings.yml
+++ b/core/modules/file/migration_templates/d6_file_settings.yml
@@ -8,6 +8,7 @@ source:
     - file_description_type
     - file_description_length
     - file_icon_directory
+  module: system
 process:
   'description/type': file_description_type
   'description/length': file_description_length
@@ -15,3 +16,4 @@ process:
 destination:
   plugin: config
   config_name: file.settings
+  module: file
diff --git a/core/modules/file/migration_templates/d6_upload.yml b/core/modules/file/migration_templates/d6_upload.yml
index 4935a41..3b07fef 100644
--- a/core/modules/file/migration_templates/d6_upload.yml
+++ b/core/modules/file/migration_templates/d6_upload.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_upload
+  module: upload
 process:
   nid: nid
   vid: vid
@@ -20,6 +21,7 @@ process:
       description: description
 destination:
   plugin: entity:node
+  module: file
 migration_dependencies:
   required:
     - d6_file
diff --git a/core/modules/file/migration_templates/d6_upload_entity_display.yml b/core/modules/file/migration_templates/d6_upload_entity_display.yml
index b097c88..39c7405 100644
--- a/core/modules/file/migration_templates/d6_upload_entity_display.yml
+++ b/core/modules/file/migration_templates/d6_upload_entity_display.yml
@@ -12,6 +12,7 @@ source:
     options:
       label: hidden
       settings: {}
+  module: upload
 process:
   entity_type: 'constants/entity_type'
   bundle: node_type
@@ -22,6 +23,7 @@ process:
   'options/type': '@type'
 destination:
   plugin: component_entity_display
+  module: file
 migration_dependencies:
   required:
     - d6_upload_field_instance
diff --git a/core/modules/file/migration_templates/d6_upload_entity_form_display.yml b/core/modules/file/migration_templates/d6_upload_entity_form_display.yml
index 75436db..869a2c6 100644
--- a/core/modules/file/migration_templates/d6_upload_entity_form_display.yml
+++ b/core/modules/file/migration_templates/d6_upload_entity_form_display.yml
@@ -13,6 +13,7 @@ source:
     options:
       settings:
         progress_indicator: throbber
+  module: upload
 process:
   entity_type: 'constants/entity_type'
   bundle: node_type
@@ -23,6 +24,7 @@ process:
   'options/type': '@type'
 destination:
   plugin: component_entity_form_display
+  module: file
 migration_dependencies:
   required:
     - d6_upload_field_instance
diff --git a/core/modules/file/migration_templates/d6_upload_field.yml b/core/modules/file/migration_templates/d6_upload_field.yml
index c0b4569..f9049d7 100644
--- a/core/modules/file/migration_templates/d6_upload_field.yml
+++ b/core/modules/file/migration_templates/d6_upload_field.yml
@@ -13,6 +13,7 @@ source:
     name: upload
     cardinality: -1
     display_field: true
+  module: upload
 process:
   entity_type: 'constants/entity_type'
   field_name: 'constants/name'
@@ -21,3 +22,4 @@ process:
   'settings/display_field': 'constants/display_field'
 destination:
   plugin: md_entity:field_storage_config
+  module: file
diff --git a/core/modules/file/migration_templates/d6_upload_field_instance.yml b/core/modules/file/migration_templates/d6_upload_field_instance.yml
index 8b53503..03b90ce 100644
--- a/core/modules/file/migration_templates/d6_upload_field_instance.yml
+++ b/core/modules/file/migration_templates/d6_upload_field_instance.yml
@@ -9,6 +9,7 @@ source:
     name: upload
     settings:
       description_field: 1
+  module: upload
 process:
   entity_type: 'constants/entity_type'
   bundle: node_type
@@ -18,6 +19,7 @@ process:
   'settings/max_filesize': max_filesize
 destination:
   plugin: entity:field_config
+  module: file
 migration_dependencies:
   required:
     - d6_upload_field
diff --git a/core/modules/file/migration_templates/d7_file.yml b/core/modules/file/migration_templates/d7_file.yml
index ea8f647..c688641 100644
--- a/core/modules/file/migration_templates/d7_file.yml
+++ b/core/modules/file/migration_templates/d7_file.yml
@@ -6,6 +6,7 @@ migration_tags:
   - Drupal 7
 source:
   plugin: d7_file
+  module: file
 process:
   fid: fid
   filename: filename
@@ -23,3 +24,4 @@ process:
 destination:
   plugin: entity:file
   source_path_property: filepath
+  module: file
diff --git a/core/modules/filter/migration_templates/d6_filter_format.yml b/core/modules/filter/migration_templates/d6_filter_format.yml
index df8faa5..688aaac 100644
--- a/core/modules/filter/migration_templates/d6_filter_format.yml
+++ b/core/modules/filter/migration_templates/d6_filter_format.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_filter_format
+  module: filter
 process:
   format:
     -
@@ -41,3 +42,4 @@ process:
 destination:
   plugin: entity:filter_format
   no_stub: true
+  module: filter
diff --git a/core/modules/filter/migration_templates/d7_filter_format.yml b/core/modules/filter/migration_templates/d7_filter_format.yml
index 617611d..1a7a9c4 100644
--- a/core/modules/filter/migration_templates/d7_filter_format.yml
+++ b/core/modules/filter/migration_templates/d7_filter_format.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 7
 source:
   plugin: d7_filter_format
+  module: filter
 process:
   format: format
   name: name
@@ -25,3 +26,4 @@ process:
         default_value: true
 destination:
   plugin: entity:filter_format
+  module: filter
diff --git a/core/modules/forum/migration_templates/d6_forum_settings.yml b/core/modules/forum/migration_templates/d6_forum_settings.yml
index 5516848..755b310 100644
--- a/core/modules/forum/migration_templates/d6_forum_settings.yml
+++ b/core/modules/forum/migration_templates/d6_forum_settings.yml
@@ -11,6 +11,7 @@ source:
     - forum_block_num_0
     - forum_block_num_1
     - forum_nav_vocabulary
+  module: forum
 process:
   'block/active/limit': forum_block_num_0
   'block/new/limit': forum_block_num_1
@@ -24,6 +25,7 @@ process:
 destination:
   plugin: config
   config_name: forum.settings
+  module: forum
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
diff --git a/core/modules/forum/migration_templates/d7_forum_settings.yml b/core/modules/forum/migration_templates/d7_forum_settings.yml
index b84d485..a7b55a7 100644
--- a/core/modules/forum/migration_templates/d7_forum_settings.yml
+++ b/core/modules/forum/migration_templates/d7_forum_settings.yml
@@ -11,6 +11,7 @@ source:
     - forum_block_num_active
     - forum_block_num_new
     - forum_nav_vocabulary
+  module: forum
 process:
   'block/active/limit': forum_block_num_active
   'block/new/limit': forum_block_num_new
@@ -24,6 +25,7 @@ process:
 destination:
   plugin: config
   config_name: forum.settings
+  module: forum
 migration_dependencies:
   required:
     - d7_taxonomy_vocabulary
diff --git a/core/modules/image/migration_templates/d6_imagecache_presets.yml b/core/modules/image/migration_templates/d6_imagecache_presets.yml
index e4780a9..6c89391 100644
--- a/core/modules/image/migration_templates/d6_imagecache_presets.yml
+++ b/core/modules/image/migration_templates/d6_imagecache_presets.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_imagecache_presets
+  module: imagecache
 process:
   name:
     -
@@ -22,3 +23,4 @@ process:
       - data
 destination:
   plugin: entity:image_style
+  module: image
diff --git a/core/modules/image/migration_templates/d7_image_settings.yml b/core/modules/image/migration_templates/d7_image_settings.yml
index bfae4d5..875e3e1 100755
--- a/core/modules/image/migration_templates/d7_image_settings.yml
+++ b/core/modules/image/migration_templates/d7_image_settings.yml
@@ -8,6 +8,7 @@ source:
     - allow_insecure_derivatives
     - suppress_itok_output
     - image_style_preview_image
+  module: image
 process:
   suppress_itok_output: suppress_itok_output
   allow_insecure_derivatives: allow_insecure_derivatives
@@ -15,3 +16,4 @@ process:
 destination:
   plugin: config
   config_name: image.settings
+  module: image
diff --git a/core/modules/language/migration_templates/d7_language_negotiation_settings.yml b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml
index f03be78..590294b 100644
--- a/core/modules/language/migration_templates/d7_language_negotiation_settings.yml
+++ b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml
@@ -7,9 +7,11 @@ source:
   variables:
     - locale_language_negotiation_session_param
     - locale_language_negotiation_url_part
+  module: locale
 process:
   'session/parameter': locale_language_negotiation_session_param
   'url/source': locale_language_negotiation_url_part
 destination:
   plugin: config
   config_name: language.negotiation
+  module: language
diff --git a/core/modules/locale/migration_templates/locale_settings.yml b/core/modules/locale/migration_templates/locale_settings.yml
index 6eebe20..0ea734a 100644
--- a/core/modules/locale/migration_templates/locale_settings.yml
+++ b/core/modules/locale/migration_templates/locale_settings.yml
@@ -8,9 +8,11 @@ source:
   variables:
     - locale_cache_strings
     - locale_js_directory
+  module: locale
 process:
   cache_strings: locale_cache_strings
   'javascript/directory': locale_js_directory
 destination:
   plugin: config
   config_name: locale.settings
+  module: locale
diff --git a/core/modules/menu_link_content/migration_templates/d6_menu_links.yml b/core/modules/menu_link_content/migration_templates/d6_menu_links.yml
index e58b202..d075d10 100644
--- a/core/modules/menu_link_content/migration_templates/d6_menu_links.yml
+++ b/core/modules/menu_link_content/migration_templates/d6_menu_links.yml
@@ -6,6 +6,7 @@ source:
   plugin: menu_link
   constants:
     bundle: menu_link_content
+  module: menu
 process:
   id: mlid
   bundle: 'constants/bundle'
@@ -43,6 +44,7 @@ process:
   changed: updated
 destination:
   plugin: entity:menu_link_content
+  module: menu_link_content
 migration_dependencies:
   required:
     - menu
diff --git a/core/modules/menu_link_content/migration_templates/d7_menu_links.yml b/core/modules/menu_link_content/migration_templates/d7_menu_links.yml
index d7b1d87..0105c0a 100644
--- a/core/modules/menu_link_content/migration_templates/d7_menu_links.yml
+++ b/core/modules/menu_link_content/migration_templates/d7_menu_links.yml
@@ -6,6 +6,7 @@ source:
   plugin: menu_link
   constants:
     bundle: menu_link_content
+  module: menu
 process:
   id: mlid
   bundle: 'constants/bundle'
@@ -52,6 +53,7 @@ process:
   changed: updated
 destination:
   plugin: entity:menu_link_content
+  module: menu_link_content
 migration_dependencies:
   required:
     - menu
diff --git a/core/modules/menu_ui/migration_templates/menu_settings.yml b/core/modules/menu_ui/migration_templates/menu_settings.yml
index b59cbc2..1375a60 100644
--- a/core/modules/menu_ui/migration_templates/menu_settings.yml
+++ b/core/modules/menu_ui/migration_templates/menu_settings.yml
@@ -7,8 +7,10 @@ source:
   plugin: variable
   variables:
     - menu_override_parent_selector
+  module: menu
 process:
   override_parent_selector: menu_override_parent_selector
 destination:
   plugin: config
   config_name: menu_ui.settings
+  module: menu_ui
diff --git a/core/modules/node/migration_templates/d6_node.yml b/core/modules/node/migration_templates/d6_node.yml
index 01642f7..45ad245 100644
--- a/core/modules/node/migration_templates/d6_node.yml
+++ b/core/modules/node/migration_templates/d6_node.yml
@@ -6,6 +6,7 @@ builder:
   plugin: d6_node
 source:
   plugin: d6_node
+  module: node
 process:
   nid: nid
   vid: vid
@@ -39,6 +40,7 @@ process:
 
 destination:
   plugin: entity:node
+  module: node
 migration_dependencies:
   required:
     - d6_user
diff --git a/core/modules/node/migration_templates/d6_node_revision.yml b/core/modules/node/migration_templates/d6_node_revision.yml
index c22e62a..81a0b59 100644
--- a/core/modules/node/migration_templates/d6_node_revision.yml
+++ b/core/modules/node/migration_templates/d6_node_revision.yml
@@ -6,6 +6,7 @@ builder:
   plugin: d6_node
 source:
   plugin: d6_node_revision
+  module: node
 process:
   nid: nid
   vid: vid
@@ -39,6 +40,7 @@ process:
 
 destination:
   plugin: entity_revision:node
+  module: node
 migration_dependencies:
   required:
     - d6_node:*
diff --git a/core/modules/node/migration_templates/d6_node_setting_promote.yml b/core/modules/node/migration_templates/d6_node_setting_promote.yml
index 14033ed..abfd6ef 100644
--- a/core/modules/node/migration_templates/d6_node_setting_promote.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_promote.yml
@@ -7,6 +7,7 @@ source:
   constants:
     entity_type: node
     field_name: promote
+  module: node
 process:
   entity_type: 'constants/entity_type'
   bundle: type
@@ -14,6 +15,7 @@ process:
   'default_value/0/value': 'options/promote'
 destination:
   plugin: entity:base_field_override
+  module: node
 migration_dependencies:
   required:
     - d6_node_type
diff --git a/core/modules/node/migration_templates/d6_node_setting_status.yml b/core/modules/node/migration_templates/d6_node_setting_status.yml
index e1ea647..97f8b74 100644
--- a/core/modules/node/migration_templates/d6_node_setting_status.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_status.yml
@@ -7,6 +7,7 @@ source:
   constants:
     entity_type: node
     field_name: status
+  module: node
 process:
   entity_type: 'constants/entity_type'
   bundle: type
@@ -14,6 +15,7 @@ process:
   'default_value/0/value': 'options/status'
 destination:
   plugin: entity:base_field_override
+  module: node
 migration_dependencies:
   required:
     - d6_node_type
diff --git a/core/modules/node/migration_templates/d6_node_setting_sticky.yml b/core/modules/node/migration_templates/d6_node_setting_sticky.yml
index 89a0a86..72984ea 100644
--- a/core/modules/node/migration_templates/d6_node_setting_sticky.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_sticky.yml
@@ -7,6 +7,7 @@ source:
   constants:
     entity_type: node
     field_name: sticky
+  module: node
 process:
   entity_type: 'constants/entity_type'
   bundle: type
@@ -14,6 +15,7 @@ process:
   'default_value/0/value': 'options/sticky'
 destination:
   plugin: entity:base_field_override
+  module: node
 migration_dependencies:
   required:
     - d6_node_type
diff --git a/core/modules/node/migration_templates/d6_node_settings.yml b/core/modules/node/migration_templates/d6_node_settings.yml
index 17b0857..eb50b78 100644
--- a/core/modules/node/migration_templates/d6_node_settings.yml
+++ b/core/modules/node/migration_templates/d6_node_settings.yml
@@ -6,8 +6,10 @@ source:
   plugin: variable
   variables:
     - node_admin_theme
+  module: node
 process:
   use_admin_theme: node_admin_theme
 destination:
   plugin: config
   config_name: node.settings
+  module: node
diff --git a/core/modules/node/migration_templates/d6_node_type.yml b/core/modules/node/migration_templates/d6_node_type.yml
index 4c76f66..e406420 100644
--- a/core/modules/node/migration_templates/d6_node_type.yml
+++ b/core/modules/node/migration_templates/d6_node_type.yml
@@ -7,6 +7,7 @@ source:
   constants:
     preview: 1 # DRUPAL_OPTIONAL
     create_body: false
+  module: node
 process:
   type: type
   name: name
@@ -22,3 +23,4 @@ process:
   create_body_label: body_label
 destination:
   plugin: entity:node_type
+  module: node
diff --git a/core/modules/node/migration_templates/d6_view_modes.yml b/core/modules/node/migration_templates/d6_view_modes.yml
index 815709b..fb3bde5 100644
--- a/core/modules/node/migration_templates/d6_view_modes.yml
+++ b/core/modules/node/migration_templates/d6_view_modes.yml
@@ -7,6 +7,7 @@ source:
   constants:
     targetEntityType: node
     status: true
+  module: node
 process:
   mode:
     plugin: static_map
@@ -36,3 +37,4 @@ process:
   status: 'constants/status'
 destination:
   plugin: entity:entity_view_mode
+  module: node
diff --git a/core/modules/node/migration_templates/d7_node.yml b/core/modules/node/migration_templates/d7_node.yml
index a6d3cb8..df8dae0 100644
--- a/core/modules/node/migration_templates/d7_node.yml
+++ b/core/modules/node/migration_templates/d7_node.yml
@@ -6,6 +6,7 @@ builder:
   plugin: d7_node
 source:
   plugin: d7_node
+  module: node
 process:
   nid: nid
   vid: vid
@@ -26,6 +27,7 @@ process:
   revision_timestamp: timestamp
 destination:
   plugin: entity:node
+  module: node
 migration_dependencies:
   required:
     - d7_user
diff --git a/core/modules/node/migration_templates/d7_node_revision.yml b/core/modules/node/migration_templates/d7_node_revision.yml
index edb56f3..71767b1 100644
--- a/core/modules/node/migration_templates/d7_node_revision.yml
+++ b/core/modules/node/migration_templates/d7_node_revision.yml
@@ -6,6 +6,7 @@ builder:
   plugin: d7_node
 source:
   plugin: d7_node_revision
+  module: node
 process:
   nid: nid
   vid: vid
@@ -26,6 +27,7 @@ process:
   revision_timestamp: timestamp
 destination:
   plugin: entity_revision:node
+  module: node
 migration_dependencies:
   required:
     - d7_node:*
diff --git a/core/modules/node/migration_templates/d7_node_settings.yml b/core/modules/node/migration_templates/d7_node_settings.yml
index 0461754..4c6f77c 100644
--- a/core/modules/node/migration_templates/d7_node_settings.yml
+++ b/core/modules/node/migration_templates/d7_node_settings.yml
@@ -6,8 +6,10 @@ source:
   plugin: variable
   variables:
     - node_admin_theme
+  module: node
 process:
   use_admin_theme: node_admin_theme
 destination:
   plugin: config
   config_name: node.settings
+  module: node
diff --git a/core/modules/node/migration_templates/d7_node_title_label.yml b/core/modules/node/migration_templates/d7_node_title_label.yml
index 53ae6ea..fa936cb 100644
--- a/core/modules/node/migration_templates/d7_node_title_label.yml
+++ b/core/modules/node/migration_templates/d7_node_title_label.yml
@@ -7,6 +7,7 @@ source:
   constants:
     entity_type: node
     field_name: title
+  module: node
 process:
   entity_type: 'constants/entity_type'
   bundle: type
@@ -14,6 +15,7 @@ process:
   label: title_label
 destination:
   plugin: entity:base_field_override
+  module: node
 migration_dependencies:
   required:
     - d7_node_type
diff --git a/core/modules/node/migration_templates/d7_node_type.yml b/core/modules/node/migration_templates/d7_node_type.yml
index 6cf8e78..d679b18 100644
--- a/core/modules/node/migration_templates/d7_node_type.yml
+++ b/core/modules/node/migration_templates/d7_node_type.yml
@@ -6,6 +6,7 @@ source:
   plugin: d7_node_type
   constants:
     preview: 1 # DRUPAL_OPTIONAL
+  module: node
 process:
   type: type
   name: name
@@ -19,3 +20,4 @@ process:
   create_body_label: body_label
 destination:
   plugin: entity:node_type
+  module: node
diff --git a/core/modules/path/migration_templates/d6_url_alias.yml b/core/modules/path/migration_templates/d6_url_alias.yml
index 92e43b2..fddfae9 100644
--- a/core/modules/path/migration_templates/d6_url_alias.yml
+++ b/core/modules/path/migration_templates/d6_url_alias.yml
@@ -6,6 +6,7 @@ source:
   plugin: d6_url_alias
   constants:
     slash: '/'
+  module: path
 process:
   source:
     plugin: concat
@@ -20,3 +21,4 @@ process:
   langcode: language
 destination:
   plugin: url_alias
+  module: path
diff --git a/core/modules/path/migration_templates/d7_url_alias.yml b/core/modules/path/migration_templates/d7_url_alias.yml
index a3ddec1..7ba5ec9 100644
--- a/core/modules/path/migration_templates/d7_url_alias.yml
+++ b/core/modules/path/migration_templates/d7_url_alias.yml
@@ -6,6 +6,7 @@ source:
   plugin: d7_url_alias
   constants:
     slash: '/'
+  module: path
 process:
   source:
     plugin: concat
@@ -20,3 +21,4 @@ process:
   langcode: language
 destination:
   plugin: url_alias
+  module: path
diff --git a/core/modules/search/migration_templates/d6_search_page.yml b/core/modules/search/migration_templates/d6_search_page.yml
index f509d8c..3bf957f 100644
--- a/core/modules/search/migration_templates/d6_search_page.yml
+++ b/core/modules/search/migration_templates/d6_search_page.yml
@@ -15,6 +15,7 @@ source:
     id: node_search
     path: node
     plugin: node_search
+  module: search
 process:
   id: 'constants/id'
   path: 'constants/path'
@@ -23,3 +24,4 @@ process:
     plugin: d6_search_configuration_rankings
 destination:
   plugin: entity:search_page
+  module: search
diff --git a/core/modules/search/migration_templates/d6_search_settings.yml b/core/modules/search/migration_templates/d6_search_settings.yml
index 8efb9fd..63dd536 100644
--- a/core/modules/search/migration_templates/d6_search_settings.yml
+++ b/core/modules/search/migration_templates/d6_search_settings.yml
@@ -12,6 +12,7 @@ source:
     - search_cron_limit
     - search_tag_weights
     - search_and_or_limit
+  module: search
 process:
   'index/minimum_word_size': minimum_word_size
   'index/overlap_cjk': overlap_cjk
@@ -20,3 +21,4 @@ process:
 destination:
   plugin: config
   config_name: search.settings
+  module: search
diff --git a/core/modules/search/migration_templates/d7_search_settings.yml b/core/modules/search/migration_templates/d7_search_settings.yml
index ec27214..08bd9e6 100644
--- a/core/modules/search/migration_templates/d7_search_settings.yml
+++ b/core/modules/search/migration_templates/d7_search_settings.yml
@@ -12,6 +12,7 @@ source:
     - search_cron_limit
     - search_tag_weights
     - search_and_or_limit
+  module: search
 process:
   'index/minimum_word_size': minimum_word_size
   'index/overlap_cjk': overlap_cjk
@@ -22,3 +23,4 @@ process:
 destination:
   plugin: config
   config_name: search.settings
+  module: search
diff --git a/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
index c9eedbb..1a9cc80 100644
--- a/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
+++ b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
@@ -10,6 +10,7 @@ source:
     - simpletest_httpauth_password
     - simpletest_httpauth_username
     - simpletest_verbose
+  module: simpletest
 process:
   clear_results: simpletest_clear_results
   'httpauth/method': simpletest_httpauth_method
@@ -19,3 +20,4 @@ process:
 destination:
   plugin: config
   config_name: simpletest.settings
+  module: simpletest
diff --git a/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml b/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
index b77f76a..f76fb0d 100644
--- a/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
+++ b/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
@@ -10,6 +10,7 @@ source:
     - simpletest_httpauth_password
     - simpletest_httpauth_username
     - simpletest_verbose
+  module: simpletest
 process:
   clear_results: simpletest_clear_results
   'httpauth/method': simpletest_httpauth_method
@@ -19,3 +20,4 @@ process:
 destination:
   plugin: config
   config_name: simpletest.settings
+  module: simpletest
diff --git a/core/modules/statistics/migration_templates/d6_statistics_settings.yml b/core/modules/statistics/migration_templates/d6_statistics_settings.yml
index 348ad38..a00e091 100644
--- a/core/modules/statistics/migration_templates/d6_statistics_settings.yml
+++ b/core/modules/statistics/migration_templates/d6_statistics_settings.yml
@@ -8,6 +8,7 @@ source:
     - statistics_enable_access_log
     - statistics_flush_accesslog_timer
     - statistics_count_content_views
+  module: statistics
 process:
   'access_log/enabled': statistics_enable_access_log
   'access_log/max_lifetime': statistics_flush_accesslog_timer
@@ -15,3 +16,4 @@ process:
 destination:
   plugin: config
   config_name: statistics.settings
+  module: statistics
diff --git a/core/modules/syslog/migration_templates/d6_syslog_settings.yml b/core/modules/syslog/migration_templates/d6_syslog_settings.yml
index 86a7017..d223e37 100644
--- a/core/modules/syslog/migration_templates/d6_syslog_settings.yml
+++ b/core/modules/syslog/migration_templates/d6_syslog_settings.yml
@@ -7,9 +7,11 @@ source:
   variables:
     - syslog_identity
     - syslog_facility
+  module: syslog
 process:
   identity: syslog_identity
   facility: syslog_facility
 destination:
   plugin: config
   config_name: syslog.settings
+  module: syslog
diff --git a/core/modules/syslog/migration_templates/d7_syslog_settings.yml b/core/modules/syslog/migration_templates/d7_syslog_settings.yml
index 4000572..c877b6e 100644
--- a/core/modules/syslog/migration_templates/d7_syslog_settings.yml
+++ b/core/modules/syslog/migration_templates/d7_syslog_settings.yml
@@ -8,6 +8,7 @@ source:
     - syslog_facility
     - syslog_format
     - syslog_identity
+  module: syslog
 process:
   facility: syslog_facility
   format: syslog_format
@@ -15,3 +16,4 @@ process:
 destination:
   plugin: config
   config_name: syslog.settings
+  module: syslog
diff --git a/core/modules/system/migration_templates/d6_date_formats.yml b/core/modules/system/migration_templates/d6_date_formats.yml
index 71257d4..069a4bd 100644
--- a/core/modules/system/migration_templates/d6_date_formats.yml
+++ b/core/modules/system/migration_templates/d6_date_formats.yml
@@ -8,6 +8,7 @@ source:
     - date_format_long
     - date_format_medium
     - date_format_short
+  module: system
 process:
   id:
     plugin: static_map
@@ -19,3 +20,4 @@ process:
   pattern: value
 destination:
   plugin: entity:date_format
+  module: system
diff --git a/core/modules/system/migration_templates/d6_system_cron.yml b/core/modules/system/migration_templates/d6_system_cron.yml
index 7dd3a2b..60fbf7e 100644
--- a/core/modules/system/migration_templates/d6_system_cron.yml
+++ b/core/modules/system/migration_templates/d6_system_cron.yml
@@ -8,9 +8,11 @@ source:
     - cron_threshold_warning
     - cron_threshold_error
     - cron_last
+  module: system
 process:
   'threshold/requirements_warning': cron_threshold_warning
   'threshold/requirements_error': cron_threshold_error
 destination:
   plugin: config
   config_name: system.cron
+  module: system
diff --git a/core/modules/system/migration_templates/d6_system_date.yml b/core/modules/system/migration_templates/d6_system_date.yml
index 25f6728..9d6b80a 100644
--- a/core/modules/system/migration_templates/d6_system_date.yml
+++ b/core/modules/system/migration_templates/d6_system_date.yml
@@ -8,6 +8,7 @@ source:
     - configurable_timezones
     - date_first_day
     - date_default_timezone
+  module: system
 process:
   'timezone/user/configurable': configurable_timezones
   first_day: date_first_day
@@ -17,3 +18,4 @@ process:
 destination:
   plugin: config
   config_name: system.date
+  module: system
diff --git a/core/modules/system/migration_templates/d6_system_file.yml b/core/modules/system/migration_templates/d6_system_file.yml
index 60cd616..b5f1866 100644
--- a/core/modules/system/migration_templates/d6_system_file.yml
+++ b/core/modules/system/migration_templates/d6_system_file.yml
@@ -7,6 +7,7 @@ source:
   variables:
     - file_directory_temp
     - allow_insecure_uploads
+  module: system
 process:
   'path/temporary': file_directory_temp
   allow_insecure_uploads:
@@ -18,3 +19,4 @@ process:
 destination:
   plugin: config
   config_name: system.file
+  module: system
diff --git a/core/modules/system/migration_templates/d6_system_image.yml b/core/modules/system/migration_templates/d6_system_image.yml
index 15d0ecc..493ead9 100644
--- a/core/modules/system/migration_templates/d6_system_image.yml
+++ b/core/modules/system/migration_templates/d6_system_image.yml
@@ -6,8 +6,10 @@ source:
   plugin: variable
   variables:
     - image_toolkit
+  module: system
 process:
   toolkit: image_toolkit
 destination:
   plugin: config
   config_name: system.image
+  module: system
diff --git a/core/modules/system/migration_templates/d6_system_image_gd.yml b/core/modules/system/migration_templates/d6_system_image_gd.yml
index 543b162..2c41cfe 100644
--- a/core/modules/system/migration_templates/d6_system_image_gd.yml
+++ b/core/modules/system/migration_templates/d6_system_image_gd.yml
@@ -6,8 +6,10 @@ source:
   plugin: variable
   variables:
     - image_jpeg_quality
+  module: system
 process:
   jpeg_quality: image_jpeg_quality
 destination:
   plugin: config
   config_name: system.image.gd
+  module: system
diff --git a/core/modules/system/migration_templates/d6_system_logging.yml b/core/modules/system/migration_templates/d6_system_logging.yml
index 868d08f..47ba6d0 100644
--- a/core/modules/system/migration_templates/d6_system_logging.yml
+++ b/core/modules/system/migration_templates/d6_system_logging.yml
@@ -6,6 +6,7 @@ source:
   plugin: variable
   variables:
     - error_level
+  module: system
 process:
   error_level:
     plugin: static_map
@@ -19,3 +20,4 @@ process:
 destination:
   plugin: config
   config_name: system.logging
+  module: system
diff --git a/core/modules/system/migration_templates/d6_system_maintenance.yml b/core/modules/system/migration_templates/d6_system_maintenance.yml
index 9f9f030..7553473 100644
--- a/core/modules/system/migration_templates/d6_system_maintenance.yml
+++ b/core/modules/system/migration_templates/d6_system_maintenance.yml
@@ -6,8 +6,10 @@ source:
   plugin: variable
   variables:
     - site_offline_message
+  module: system
 process:
   message: site_offline_message
 destination:
   plugin: config
   config_name: system.maintenance
+  module: system
diff --git a/core/modules/system/migration_templates/d6_system_performance.yml b/core/modules/system/migration_templates/d6_system_performance.yml
index 6f9666e..d128837 100644
--- a/core/modules/system/migration_templates/d6_system_performance.yml
+++ b/core/modules/system/migration_templates/d6_system_performance.yml
@@ -10,6 +10,7 @@ source:
     - cache_lifetime
     - cache
     - page_compression
+  module: system
 process:
   'css/preprocess': preprocess_css
   'js/preprocess': preprocess_js
@@ -18,3 +19,4 @@ process:
 destination:
   plugin: config
   config_name: system.performance
+  module: system
diff --git a/core/modules/system/migration_templates/d6_system_rss.yml b/core/modules/system/migration_templates/d6_system_rss.yml
index d112e82..2112653 100644
--- a/core/modules/system/migration_templates/d6_system_rss.yml
+++ b/core/modules/system/migration_templates/d6_system_rss.yml
@@ -7,9 +7,11 @@ source:
   variables:
     - feed_default_items
     - feed_item_length
+  module: system
 process:
   'items/limit': feed_default_items
   'items/view_mode': feed_item_length
 destination:
   plugin: config
   config_name: system.rss
+  module: system
diff --git a/core/modules/system/migration_templates/d6_system_site.yml b/core/modules/system/migration_templates/d6_system_site.yml
index 9e16219..eda08a0 100644
--- a/core/modules/system/migration_templates/d6_system_site.yml
+++ b/core/modules/system/migration_templates/d6_system_site.yml
@@ -15,6 +15,7 @@ source:
     - site_404
     - drupal_weight_select_max
     - admin_compact_mode
+  module: system
 process:
   name: site_name
   mail: site_mail
@@ -39,3 +40,4 @@ process:
 destination:
   plugin: config
   config_name: system.site
+  module: system
diff --git a/core/modules/system/migration_templates/menu.yml b/core/modules/system/migration_templates/menu.yml
index 542faa4..1f00c0a 100644
--- a/core/modules/system/migration_templates/menu.yml
+++ b/core/modules/system/migration_templates/menu.yml
@@ -5,9 +5,11 @@ migration_tags:
   - Drupal 7
 source:
   plugin: menu
+  module: menu
 process:
   id: menu_name
   label: title
   description: description
 destination:
   plugin: entity:menu
+  module: system
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
index 0c41c6d..0bef629 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: taxonomy_term
+  module: taxonomy
 process:
   tid: tid
   vid:
@@ -20,6 +21,7 @@ process:
   changed: timestamp
 destination:
   plugin: entity:taxonomy_term
+  module: taxonomy
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
index 654a076..8ec7164 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_taxonomy_vocabulary
+  module: taxonomy
 process:
   vid:
     -
@@ -21,3 +22,4 @@ process:
   weight: weight
 destination:
   plugin: entity:taxonomy_vocabulary
+  module: taxonomy
diff --git a/core/modules/taxonomy/migration_templates/d6_term_node.yml b/core/modules/taxonomy/migration_templates/d6_term_node.yml
index 01578b1..689f5cc 100644
--- a/core/modules/taxonomy/migration_templates/d6_term_node.yml
+++ b/core/modules/taxonomy/migration_templates/d6_term_node.yml
@@ -6,12 +6,14 @@ builder:
   plugin: d6_term_node
 source:
   plugin: d6_term_node
+  module: taxonomy
 process:
   nid: nid
   type: type
   # The actual field name is dynamic and will be added by the builder.
 destination:
   plugin: entity:node
+  module: taxonomy
 migration_dependencies:
   required:
     - d6_vocabulary_entity_display
diff --git a/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
index e9ceadd..b453b2e 100644
--- a/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
+++ b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
@@ -6,12 +6,14 @@ builder:
   plugin: d6_term_node
 source:
   plugin: d6_term_node_revision
+  module: taxonomy
 process:
   vid: vid
   type: type
   # The actual field name is dynamic and will be added by the builder.
 destination:
   plugin: entity_revision:node
+  module: taxonomy
 migration_dependencies:
   required:
     - d6_term_node:*
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
index e8d04c0..4f841dd 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
@@ -11,6 +11,7 @@ source:
       label: hidden
       type: entity_reference_label
       weight: 20
+  module: taxonomy
 process:
   entity_type: 'constants/entity_type'
   view_mode: 'constants/view_mode'
@@ -22,6 +23,7 @@ process:
     source: vid
 destination:
   plugin: component_entity_display
+  module: taxonomy
 migration_dependencies:
   required:
     - d6_vocabulary_field_instance
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
index 1b9f5ef..f36e242 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
@@ -10,6 +10,7 @@ source:
     options:
       type: options_select
       weight: 20
+  module: taxonomy
 process:
   entity_type: 'constants/entity_type'
   form_mode: 'constants/form_mode'
@@ -21,6 +22,7 @@ process:
     source: vid
 destination:
   plugin: component_entity_form_display
+  module: taxonomy
 migration_dependencies:
   required:
     - d6_vocabulary_field_instance
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
index 5139f31..7fdfbbb 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
@@ -9,6 +9,7 @@ source:
     type: entity_reference
     target_entity_type: taxonomy_term
     cardinality: -1
+  module: taxonomy
 process:
   entity_type: 'constants/entity_type'
   type: 'constants/type'
@@ -24,6 +25,7 @@ process:
   cardinality: 'constants/cardinality'
 destination:
   plugin: md_entity:field_storage_config
+  module: taxonomy
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
index b4aca48..3e1749c 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
@@ -8,6 +8,7 @@ source:
     entity_type: node
     auto_create: true
     selection_handler: 'default:taxonomy_term'
+  module: taxonomy
 process:
   entity_type: 'constants/entity_type'
   bundle: type
@@ -24,6 +25,7 @@ process:
   'settings/handler_settings/auto_create': 'constants/auto_create'
 destination:
   plugin: entity:field_config
+  module: taxonomy
 migration_dependencies:
   required:
     - d6_node_type
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
index 7546660..f8604c9 100644
--- a/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 7
 source:
   plugin: taxonomy_term
+  module: taxonomy
 process:
   tid: tid
   vid:
@@ -20,6 +21,7 @@ process:
   changed: timestamp
 destination:
   plugin: entity:taxonomy_term
+  module: taxonomy
 migration_dependencies:
   required:
     - d7_taxonomy_vocabulary
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
index 80c38a7..a4a2698 100644
--- a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 7
 source:
   plugin: d7_taxonomy_vocabulary
+  module: taxonomy
 process:
   vid: machine_name
   label: name
@@ -13,3 +14,4 @@ process:
   weight: weight
 destination:
   plugin: entity:taxonomy_vocabulary
+  module: taxonomy
diff --git a/core/modules/taxonomy/migration_templates/taxonomy_settings.yml b/core/modules/taxonomy/migration_templates/taxonomy_settings.yml
index c20372c..d99bca7 100644
--- a/core/modules/taxonomy/migration_templates/taxonomy_settings.yml
+++ b/core/modules/taxonomy/migration_templates/taxonomy_settings.yml
@@ -8,9 +8,11 @@ source:
   variables:
     - taxonomy_override_selector
     - taxonomy_terms_per_page_admin
+  module: taxonomy
 process:
   override_selector: taxonomy_override_selector
   terms_per_page_admin: taxonomy_terms_per_page_admin
 destination:
   plugin: config
   config_name: taxonomy.settings
+  module: taxonomy
diff --git a/core/modules/text/migration_templates/text_settings.yml b/core/modules/text/migration_templates/text_settings.yml
index 45d426d..0e93ade 100644
--- a/core/modules/text/migration_templates/text_settings.yml
+++ b/core/modules/text/migration_templates/text_settings.yml
@@ -7,8 +7,10 @@ source:
   plugin: variable
   variables:
     - teaser_length
+  module: text
 process:
   default_summary_length: teaser_length
 destination:
   plugin: config
   config_name: text.settings
+  module: text
diff --git a/core/modules/tracker/migration_templates/d7_tracker_settings.yml b/core/modules/tracker/migration_templates/d7_tracker_settings.yml
index ce06cbd..38cdc95 100644
--- a/core/modules/tracker/migration_templates/d7_tracker_settings.yml
+++ b/core/modules/tracker/migration_templates/d7_tracker_settings.yml
@@ -6,8 +6,10 @@ source:
   plugin: variable
   variables:
     - tracker_batch_size
+  module: tracker
 process:
   cron_index_limit: tracker_batch_size
 destination:
   plugin: config
   config_name: tracker.settings
+  module: tracker
diff --git a/core/modules/update/migration_templates/d6_update_settings.yml b/core/modules/update/migration_templates/d6_update_settings.yml
index 37e0ef1..9f6e1e8 100644
--- a/core/modules/update/migration_templates/d6_update_settings.yml
+++ b/core/modules/update/migration_templates/d6_update_settings.yml
@@ -10,6 +10,7 @@ source:
     - update_notification_threshold
     - update_notify_emails
     - update_check_frequency
+  module: update
 process:
   'fetch/max_attempts': update_max_fetch_attempts
   'fetch/url': update_fetch_url
@@ -19,3 +20,4 @@ process:
 destination:
   plugin: config
   config_name: update.settings
+  module: update
diff --git a/core/modules/user/migration_templates/d6_profile_values.yml b/core/modules/user/migration_templates/d6_profile_values.yml
index cb36b0e..9dc9336 100644
--- a/core/modules/user/migration_templates/d6_profile_values.yml
+++ b/core/modules/user/migration_templates/d6_profile_values.yml
@@ -6,12 +6,14 @@ builder:
   plugin: d6_profile_values
 source:
   plugin: d6_profile_field_values
+  module: profile
 load:
   plugin: drupal_entity
 process:
   uid: uid
 destination:
   plugin: entity:user
+  module: user
 migration_dependencies:
   required:
     - d6_user
diff --git a/core/modules/user/migration_templates/d6_user.yml b/core/modules/user/migration_templates/d6_user.yml
index 6d5795b..3f04b51 100644
--- a/core/modules/user/migration_templates/d6_user.yml
+++ b/core/modules/user/migration_templates/d6_user.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_user
+  module: user
 process:
   uid: uid
   name: name
@@ -29,6 +30,7 @@ process:
 destination:
   plugin: entity:user
   md5_passwords: true
+  module: user
 migration_dependencies:
   required:
     - d6_user_role
diff --git a/core/modules/user/migration_templates/d6_user_contact_settings.yml b/core/modules/user/migration_templates/d6_user_contact_settings.yml
index 0d9a228..fef8020 100644
--- a/core/modules/user/migration_templates/d6_user_contact_settings.yml
+++ b/core/modules/user/migration_templates/d6_user_contact_settings.yml
@@ -7,6 +7,7 @@ source:
   constants:
     key: contact
     module: contact
+  module: user
 process:
   uid: uid
   key: 'constants/key'
@@ -18,6 +19,7 @@ process:
 
 destination:
   plugin: user_data
+  module: user
 migration_dependencies:
   required:
     - d6_user
diff --git a/core/modules/user/migration_templates/d6_user_mail.yml b/core/modules/user/migration_templates/d6_user_mail.yml
index b06b6ea..fd80c82 100644
--- a/core/modules/user/migration_templates/d6_user_mail.yml
+++ b/core/modules/user/migration_templates/d6_user_mail.yml
@@ -19,6 +19,7 @@ source:
     - user_mail_register_pending_approval_body
     - user_mail_status_blocked_subject
     - user_mail_status_blocked_body
+  module: user
 process:
   'status_activated/subject':
     plugin: convert_tokens
@@ -65,3 +66,4 @@ process:
 destination:
   plugin: config
   config_name: user.mail
+  module: user
diff --git a/core/modules/user/migration_templates/d6_user_picture_file.yml b/core/modules/user/migration_templates/d6_user_picture_file.yml
index e4d572a..6328be2 100644
--- a/core/modules/user/migration_templates/d6_user_picture_file.yml
+++ b/core/modules/user/migration_templates/d6_user_picture_file.yml
@@ -6,6 +6,7 @@ source:
   plugin: d6_user_picture_file
   constants:
     is_public: true
+  module: user
 process:
   filename: filename
   uid: uid
@@ -19,6 +20,7 @@ process:
 destination:
   plugin: entity:file
   source_path_property: picture
+  module: user
 migration_dependencies:
   # Every migration that saves into {file_managed} must have the d6_file
   # migration as an optional dependency to ensure it runs first.
diff --git a/core/modules/user/migration_templates/d6_user_role.yml b/core/modules/user/migration_templates/d6_user_role.yml
index a97d519..7e964aa 100644
--- a/core/modules/user/migration_templates/d6_user_role.yml
+++ b/core/modules/user/migration_templates/d6_user_role.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_user_role
+  module: user
 process:
   id:
     -
@@ -41,6 +42,7 @@ process:
     - plugin: filter_format_permission
 destination:
   plugin: entity:user_role
+  module: user
 migration_dependencies:
   required:
     - d6_filter_format
diff --git a/core/modules/user/migration_templates/d6_user_settings.yml b/core/modules/user/migration_templates/d6_user_settings.yml
index 3db99e9..8066414 100644
--- a/core/modules/user/migration_templates/d6_user_settings.yml
+++ b/core/modules/user/migration_templates/d6_user_settings.yml
@@ -10,6 +10,7 @@ source:
     - user_email_verification
     - user_register
     - anonymous
+  module: user
 process:
   'notify/status_blocked': user_mail_status_blocked_notify
   'notify/status_activated': user_mail_status_activated_notify
@@ -26,3 +27,4 @@ process:
 destination:
   plugin: config
   config_name: user.settings
+  module: user
diff --git a/core/modules/user/migration_templates/d7_user.yml b/core/modules/user/migration_templates/d7_user.yml
index 703b136..46525d7 100755
--- a/core/modules/user/migration_templates/d7_user.yml
+++ b/core/modules/user/migration_templates/d7_user.yml
@@ -6,6 +6,7 @@ builder:
   plugin: d7_user
 source:
   plugin: d7_user
+  module: user
 process:
   uid: uid
   name: name
@@ -34,6 +35,7 @@ process:
       migration: d7_file
 destination:
   plugin: entity:user
+  module: user
 migration_dependencies:
   required:
     - d7_user_role
diff --git a/core/modules/user/migration_templates/d7_user_flood.yml b/core/modules/user/migration_templates/d7_user_flood.yml
index ae00ce0..6e19cc3 100755
--- a/core/modules/user/migration_templates/d7_user_flood.yml
+++ b/core/modules/user/migration_templates/d7_user_flood.yml
@@ -10,6 +10,7 @@ source:
     - user_failed_login_ip_window
     - user_failed_login_user_window
     - user_failed_login_user_limit
+  module: user
 process:
   uid_only: user_failed_login_identifier_uid_only
   ip_limit: user_failed_login_ip_limit
@@ -19,3 +20,4 @@ process:
 destination:
   plugin: config
   config_name: user.flood
+  module: user
diff --git a/core/modules/user/migration_templates/d7_user_mail.yml b/core/modules/user/migration_templates/d7_user_mail.yml
index 0c5e74c..98bb101 100644
--- a/core/modules/user/migration_templates/d7_user_mail.yml
+++ b/core/modules/user/migration_templates/d7_user_mail.yml
@@ -19,6 +19,7 @@ source:
     - user_mail_register_pending_approval_body
     - user_mail_status_blocked_subject
     - user_mail_status_blocked_body
+  module: user
 process:
    'status_activated/subject': user_mail_status_activated_subject
    'status_activated/body': user_mail_status_activated_body
@@ -37,3 +38,4 @@ process:
 destination:
   plugin: config
   config_name: user.mail
+  module: user
diff --git a/core/modules/user/migration_templates/d7_user_role.yml b/core/modules/user/migration_templates/d7_user_role.yml
index 68c0d11..2f7555c 100755
--- a/core/modules/user/migration_templates/d7_user_role.yml
+++ b/core/modules/user/migration_templates/d7_user_role.yml
@@ -4,6 +4,7 @@ migration_tags:
   - Drupal 7
 source:
   plugin: d7_user_role
+  module: user
 process:
   id:
     -
@@ -39,6 +40,7 @@ process:
   weight: weight
 destination:
   plugin: entity:user_role
+  module: user
 migration_dependencies:
   optional:
     - d7_filter_format
diff --git a/core/modules/user/migration_templates/user_picture_entity_display.yml b/core/modules/user/migration_templates/user_picture_entity_display.yml
index 3f404d6..1f6584b 100644
--- a/core/modules/user/migration_templates/user_picture_entity_display.yml
+++ b/core/modules/user/migration_templates/user_picture_entity_display.yml
@@ -16,6 +16,7 @@ source:
       settings:
         image_style: ''
         image_link: content
+  module: user
 process:
   entity_type: 'constants/entity_type'
   bundle: 'constants/bundle'
@@ -26,6 +27,7 @@ process:
   'options/type': '@type'
 destination:
   plugin: component_entity_display
+  module: user
 migration_dependencies:
   required:
     - user_picture_field_instance
diff --git a/core/modules/user/migration_templates/user_picture_entity_form_display.yml b/core/modules/user/migration_templates/user_picture_entity_form_display.yml
index 4d0f8bc..b70d5bc 100644
--- a/core/modules/user/migration_templates/user_picture_entity_form_display.yml
+++ b/core/modules/user/migration_templates/user_picture_entity_form_display.yml
@@ -15,6 +15,7 @@ source:
       settings:
         progress_indicator: throbber
         preview_image_style: thumbnail
+  module: user
 process:
   entity_type: 'constants/entity_type'
   bundle: 'constants/bundle'
@@ -25,6 +26,7 @@ process:
   'options/type': '@type'
 destination:
   plugin: component_entity_form_display
+  module: user
 migration_dependencies:
   required:
     - user_picture_field_instance
diff --git a/core/modules/user/migration_templates/user_picture_field.yml b/core/modules/user/migration_templates/user_picture_field.yml
index a484ab8..8dd708a 100644
--- a/core/modules/user/migration_templates/user_picture_field.yml
+++ b/core/modules/user/migration_templates/user_picture_field.yml
@@ -12,6 +12,7 @@ source:
     type: image
     name: user_picture
     cardinality: 1
+  module: user
 process:
   entity_type: 'constants/entity_type'
   field_name: 'constants/name'
@@ -19,3 +20,4 @@ process:
   cardinality: 'constants/cardinality'
 destination:
   plugin: md_entity:field_storage_config
+  module: user
diff --git a/core/modules/user/migration_templates/user_picture_field_instance.yml b/core/modules/user/migration_templates/user_picture_field_instance.yml
index 4332e09..d2a3ec7 100644
--- a/core/modules/user/migration_templates/user_picture_field_instance.yml
+++ b/core/modules/user/migration_templates/user_picture_field_instance.yml
@@ -16,6 +16,7 @@ source:
       min_resolution: ''
       alt_field_required: false
       title_field_required: false
+  module: user
 process:
   entity_type: 'constants/entity_type'
   bundle: 'constants/bundle'
@@ -26,6 +27,7 @@ process:
   'settings/max_resolution': max_resolution
 destination:
   plugin: entity:field_config
+  module: user
 migration_dependencies:
   required:
     - user_picture_field
diff --git a/core/modules/user/migration_templates/user_profile_entity_display.yml b/core/modules/user/migration_templates/user_profile_entity_display.yml
index f4353dd..e65cf7e 100644
--- a/core/modules/user/migration_templates/user_profile_entity_display.yml
+++ b/core/modules/user/migration_templates/user_profile_entity_display.yml
@@ -12,6 +12,7 @@ source:
     options:
       label: hidden
       settings: {}
+  module: profile
 process:
   entity_type: 'constants/entity_type'
   bundle: 'constants/bundle'
@@ -39,6 +40,7 @@ process:
       4: true # PROFILE_HIDDEN
 destination:
   plugin: component_entity_display
+  module: user
 migration_dependencies:
   required:
     - user_profile_field_instance
diff --git a/core/modules/user/migration_templates/user_profile_entity_form_display.yml b/core/modules/user/migration_templates/user_profile_entity_form_display.yml
index 1aab3b7..1135a3c 100644
--- a/core/modules/user/migration_templates/user_profile_entity_form_display.yml
+++ b/core/modules/user/migration_templates/user_profile_entity_form_display.yml
@@ -10,6 +10,7 @@ source:
     entity_type: user
     bundle: user
     form_mode: default
+  module: profile
 process:
   entity_type: 'constants/entity_type'
   bundle: 'constants/bundle'
@@ -48,3 +49,4 @@ process:
       4: true # PROFILE_HIDDEN
 destination:
   plugin: component_entity_form_display
+  module: user
diff --git a/core/modules/user/migration_templates/user_profile_field.yml b/core/modules/user/migration_templates/user_profile_field.yml
index bf81898..0bcf103 100644
--- a/core/modules/user/migration_templates/user_profile_field.yml
+++ b/core/modules/user/migration_templates/user_profile_field.yml
@@ -7,6 +7,7 @@ source:
   plugin: profile_field
   constants:
     entity_type: user
+  module: profile
 process:
   entity_type: 'constants/entity_type'
   field_name: name
@@ -33,3 +34,4 @@ process:
       list: -1
 destination:
   plugin: md_entity:field_storage_config
+  module: user
diff --git a/core/modules/user/migration_templates/user_profile_field_instance.yml b/core/modules/user/migration_templates/user_profile_field_instance.yml
index b9f213b..0f1bfb0 100644
--- a/core/modules/user/migration_templates/user_profile_field_instance.yml
+++ b/core/modules/user/migration_templates/user_profile_field_instance.yml
@@ -8,6 +8,7 @@ source:
   constants:
     entity_type: user
     bundle: user
+  module: profile
 process:
   entity_type: 'constants/entity_type'
   bundle: 'constants/bundle'
@@ -17,6 +18,7 @@ process:
   required: required
 destination:
   plugin: entity:field_config
+  module: user
 migration_dependencies:
   required:
     - user_profile_field
