diff --git a/core/modules/file/migration_templates/d7_file.yml b/core/modules/file/migration_templates/d7_file.yml
index 88996ca..a6ce2c3 100644
--- a/core/modules/file/migration_templates/d7_file.yml
+++ b/core/modules/file/migration_templates/d7_file.yml
@@ -16,6 +16,7 @@ process:
   # If you are using this file to build a custom migration consider removing
   # the fid and uid fields to allow incremental migrations.
   fid: fid
+  uid: uid
   filename: filename
   source_full_path:
     -
@@ -40,6 +41,5 @@ process:
   # had was the vague "timestamp" column. So we'll use it for both.
   created: timestamp
   changed: timestamp
-  uid: uid
 destination:
   plugin: entity:file
diff --git a/core/modules/node/migration_templates/d6_node.yml b/core/modules/node/migration_templates/d6_node.yml
index cc4a904..cec2123 100644
--- a/core/modules/node/migration_templates/d6_node.yml
+++ b/core/modules/node/migration_templates/d6_node.yml
@@ -10,15 +10,15 @@ process:
   # We normalize it to equal the nid in that case.
   # @see \Drupal\node\Plugin\migrate\source\d6\Node::prepareRow().
   # If you are using this file to build a custom migration consider removing
-  # the nid, uid and vid fields to allow incremental migrations.
+  # the nid and uid fields to allow incremental migrations.
   nid: tnid
+  uid: node_uid
   vid: vid
   langcode:
     plugin: default_value
     source: language
     default_value: "und"
   title: title
-  uid: node_uid
   status: status
   created: created
   changed: changed
diff --git a/core/modules/node/migration_templates/d6_node_revision.yml b/core/modules/node/migration_templates/d6_node_revision.yml
index 20884e0..457c264 100644
--- a/core/modules/node/migration_templates/d6_node_revision.yml
+++ b/core/modules/node/migration_templates/d6_node_revision.yml
@@ -7,15 +7,15 @@ source:
   plugin: d6_node_revision
 process:
   # If you are using this file to build a custom migration consider removing
-  # the nid, uid and vid fields to allow incremental migrations.
+  # the nid and uid fields to allow incremental migrations.
   nid: nid
+  uid: node_uid
   vid: vid
   langcode:
     plugin: default_value
     source: language
     default_value: "und"
   title: title
-  uid: node_uid
   status: status
   created: created
   changed: changed
diff --git a/core/modules/node/migration_templates/d6_node_translation.yml b/core/modules/node/migration_templates/d6_node_translation.yml
index a37c0bb..8f89df0 100644
--- a/core/modules/node/migration_templates/d6_node_translation.yml
+++ b/core/modules/node/migration_templates/d6_node_translation.yml
@@ -10,13 +10,13 @@ process:
   # If you are using this file to build a custom migration consider removing
   # the nid and uid fields to allow incremental migrations.
   nid: tnid
+  uid: node_uid
   type: type
   langcode:
     plugin: default_value
     source: language
     default_value: "und"
   title: title
-  uid: node_uid
   status: status
   created: created
   changed: changed
diff --git a/core/modules/node/migration_templates/d7_node.yml b/core/modules/node/migration_templates/d7_node.yml
index 3816ee5..3a9a2e1 100644
--- a/core/modules/node/migration_templates/d7_node.yml
+++ b/core/modules/node/migration_templates/d7_node.yml
@@ -7,15 +7,15 @@ source:
   plugin: d7_node
 process:
   # If you are using this file to build a custom migration consider removing
-  # the nid, uid and vid fields to allow incremental migrations.
+  # the nid and uid fields to allow incremental migrations.
   nid: nid
+  uid: node_uid
   vid: vid
   langcode:
     plugin: default_value
     source: language
     default_value: "und"
   title: title
-  uid: node_uid
   status: status
   created: created
   changed: changed
diff --git a/core/modules/node/migration_templates/d7_node_revision.yml b/core/modules/node/migration_templates/d7_node_revision.yml
index df3e8d0..c094b6b 100644
--- a/core/modules/node/migration_templates/d7_node_revision.yml
+++ b/core/modules/node/migration_templates/d7_node_revision.yml
@@ -6,16 +6,16 @@ deriver: Drupal\node\Plugin\migrate\D7NodeDeriver
 source:
   plugin: d7_node_revision
 process:
-  #If you are using this file to build a custom migration consider commenting
+  # If you are using this file to build a custom migration consider removing
   # out the nid, uid and vid migrations to allow incremental migrations.
   nid: nid
+  uid: node_uid
   vid: vid
   langcode:
     plugin: default_value
     source: language
     default_value: "und"
   title: title
-  uid: node_uid
   status: status
   created: created
   changed: changed
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
index a141d35..909fb4c 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
@@ -6,7 +6,7 @@ source:
   plugin: taxonomy_term
 process:
   # If you are using this file to build a custom migration consider removing
-  # the tid and vid fields to allow incremental migrations.
+  # the tid field to allow incremental migrations.
   tid: tid
   vid:
     plugin: migration
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
index ecd099d..654a076 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
@@ -5,8 +5,6 @@ migration_tags:
 source:
   plugin: d6_taxonomy_vocabulary
 process:
-  # If you are using this file to build a custom migration consider removing
-  # the vid field to allow incremental migrations.
   vid:
     -
       plugin: machine_name
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 040fbbf..cf1c682 100644
--- a/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
+++ b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
@@ -6,8 +6,6 @@ deriver: Drupal\taxonomy\Plugin\migrate\D6TermNodeDeriver
 source:
   plugin: d6_term_node_revision
 process:
-  # If you are using this file to build a custom migration consider removing
-  # the vid field to allow incremental migrations.
   vid:
     -
       plugin: migration
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
index 8d4adbb..a47ab46 100644
--- a/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
@@ -5,6 +5,8 @@ migration_tags:
 source:
   plugin: taxonomy_term
 process:
+  # If you are using this file to build a custom migration consider removing
+  # the tid field to allow incremental migrations.
   tid: tid
   vid:
     plugin: migration
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
index 927bc6e..80c38a7 100644
--- a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
@@ -5,8 +5,6 @@ migration_tags:
 source:
   plugin: d7_taxonomy_vocabulary
 process:
-  # If you are using this file to build a custom migration consider removing
-  # the vid field to allow incremental migrations.
   vid: machine_name
   label: name
   name: name
diff --git a/core/modules/user/migration_templates/d6_user_role.yml b/core/modules/user/migration_templates/d6_user_role.yml
index 8ba447a..1d224f4 100644
--- a/core/modules/user/migration_templates/d6_user_role.yml
+++ b/core/modules/user/migration_templates/d6_user_role.yml
@@ -5,8 +5,6 @@ migration_tags:
 source:
   plugin: d6_user_role
 process:
-  # If you are using this file to build a custom migration consider removing
-  # the id field to allow incremental migrations.
   id:
     -
       plugin: machine_name
diff --git a/core/modules/user/migration_templates/d7_user_role.yml b/core/modules/user/migration_templates/d7_user_role.yml
index a47c224..5f88757 100644
--- a/core/modules/user/migration_templates/d7_user_role.yml
+++ b/core/modules/user/migration_templates/d7_user_role.yml
@@ -5,8 +5,6 @@ migration_tags:
 source:
   plugin: d7_user_role
 process:
-  # If you are using this file to build a custom migration consider removing
-  # the id field to allow incremental migrations.
   id:
     -
       plugin: machine_name