diff --git a/core/modules/comment/migration_templates/d6_comment_type.yml b/core/modules/comment/migration_templates/d6_comment_type.yml
index 97bbf00..429e424 100644
--- a/core/modules/comment/migration_templates/d6_comment_type.yml
+++ b/core/modules/comment/migration_templates/d6_comment_type.yml
@@ -13,7 +13,7 @@ process:
         plugin: get
         source: comment_type
       -
-        plugin: dedupe_entity
+        plugin: make_unique_entity_field
         entity_type: comment_type
         field: id
         length: 32
diff --git a/core/modules/comment/migration_templates/d7_comment.yml b/core/modules/comment/migration_templates/d7_comment.yml
index cff760f..b7e53a4 100644
--- a/core/modules/comment/migration_templates/d7_comment.yml
+++ b/core/modules/comment/migration_templates/d7_comment.yml
@@ -18,7 +18,7 @@ process:
   entity_type: 'constants/entity_type'
   comment_type:
     -
-      plugin: migration
+      plugin: migration_lookup
       migration: d7_comment_type
       source: comment_type
   field_name: @comment_type
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 45999f4..cc55d7a 100644
--- 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
@@ -24,7 +24,7 @@ process:
       1: false
   bundle:
     -
-      plugin: migration
+      plugin: migration_lookup
       migration: d7_comment_type
       source: bundle
 destination:
diff --git a/core/modules/comment/migration_templates/d7_comment_field.yml b/core/modules/comment/migration_templates/d7_comment_field.yml
index bc014b3..d07f782 100644
--- a/core/modules/comment/migration_templates/d7_comment_field.yml
+++ b/core/modules/comment/migration_templates/d7_comment_field.yml
@@ -11,7 +11,7 @@ process:
   entity_type: 'constants/entity_type'
   field_name:
     -
-      plugin: migration
+      plugin: migration_lookup
       migration: d7_comment_type
       source: bundle
   type: 'constants/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 6d208e9..4b3d10b 100644
--- a/core/modules/comment/migration_templates/d7_comment_field_instance.yml
+++ b/core/modules/comment/migration_templates/d7_comment_field_instance.yml
@@ -14,7 +14,7 @@ process:
   required: 'constants/required'
   field_name:
     -
-      plugin: migration
+      plugin: migration_lookup
       migration: d7_comment_type
       source: bundle
   bundle: node_type
diff --git a/core/modules/comment/migration_templates/d7_comment_type.yml b/core/modules/comment/migration_templates/d7_comment_type.yml
index fce58bf..ead903c 100644
--- a/core/modules/comment/migration_templates/d7_comment_type.yml
+++ b/core/modules/comment/migration_templates/d7_comment_type.yml
@@ -13,7 +13,7 @@ process:
         plugin: get
         source: bundle
       -
-        plugin: dedupe_entity
+        plugin: make_unique_entity_field
         entity_type: comment_type
         field: id
         length: 32
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 d041d43..9ced956 100644
--- a/core/modules/field/migration_templates/d7_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
@@ -28,7 +28,7 @@ process:
   entity_type: entity_type
   bundle:
     -
-      plugin: migration
+      plugin: migration_lookup
       migration:
         - d7_comment_type
         - d7_node_type
diff --git a/core/modules/field/migration_templates/d7_field_instance.yml b/core/modules/field/migration_templates/d7_field_instance.yml
index 945a3a5..8fbfe89 100644
--- a/core/modules/field/migration_templates/d7_field_instance.yml
+++ b/core/modules/field/migration_templates/d7_field_instance.yml
@@ -13,7 +13,7 @@ process:
   field_name: field_name
   bundle:
     -
-      plugin: migration
+      plugin: migration_lookup
       migration:
         - d7_node_type
         - d7_comment_type