diff -u b/core/modules/comment/migration_templates/d7_comment.yml b/core/modules/comment/migration_templates/d7_comment.yml
--- b/core/modules/comment/migration_templates/d7_comment.yml
+++ b/core/modules/comment/migration_templates/d7_comment.yml
@@ -17,19 +17,14 @@
   entity_id: nid
   entity_type: 'constants/entity_type'
   comment_type:
-    plugin: static_map
-    source: comment_type
-    bypass: true
-    map:
-      comment_node_article: comment
-      comment_node_forum: comment_forum
-  field_name:
-    plugin: static_map
-    source: comment_type
-    bypass: true
-    map:
-      comment_node_article: comment
-      comment_node_forum: comment_forum
+    -
+      plugin: migration_lookup
+      source: comment_type
+      migration: d7_comment_type
+    -
+      plugin: skip_on_empty
+      method: row
+  field_name: '@comment_type'
   subject: subject
   uid: uid
   name: name
diff -u b/core/modules/comment/migration_templates/d7_comment_entity_display.yml b/core/modules/comment/migration_templates/d7_comment_entity_display.yml
--- b/core/modules/comment/migration_templates/d7_comment_entity_display.yml
+++ b/core/modules/comment/migration_templates/d7_comment_entity_display.yml
@@ -14,12 +14,13 @@
 process:
   entity_type: 'constants/entity_type'
   field_name:
-    plugin: static_map
-    source: bundle
-    bypass: true
-    map:
-      comment_node_article: comment
-      comment_node_forum: comment_forum
+    -
+      plugin: migration_lookup
+      source: bundle
+      migration: d7_comment_type
+    -
+      plugin: skip_on_empty
+      method: row
   view_mode: 'constants/view_mode'
   options: 'constants/options'
   bundle: node_type
diff -u b/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
--- b/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
@@ -23,12 +23,13 @@
       0: true
       1: false
   bundle:
-    plugin: static_map
-    source: bundle
-    bypass: true
-    map:
-      comment_node_article: comment
-      comment_node_forum: comment_forum
+    -
+      plugin: migration_lookup
+      source: bundle
+      migration: d7_comment_type
+    -
+      plugin: skip_on_empty
+      method: row
 destination:
   plugin: component_entity_form_display
 migration_dependencies:
diff -u b/core/modules/comment/migration_templates/d7_comment_field.yml b/core/modules/comment/migration_templates/d7_comment_field.yml
--- b/core/modules/comment/migration_templates/d7_comment_field.yml
+++ b/core/modules/comment/migration_templates/d7_comment_field.yml
@@ -10,20 +10,15 @@
 process:
   entity_type: 'constants/entity_type'
   field_name:
-    plugin: static_map
-    source: bundle
-    bypass: true
-    map:
-      comment_node_article: comment
-      comment_node_forum: comment_forum
+    -
+      plugin: migration_lookup
+      source: bundle
+      migration: d7_comment_type
+    -
+      plugin: skip_on_empty
+      method: row
   type: 'constants/type'
-  'settings/comment_type':
-    plugin: static_map
-    source: bundle
-    bypass: true
-    map:
-      comment_node_article: comment
-      comment_node_forum: comment_forum
+  'settings/comment_type': '@field_name'
 destination:
   plugin: entity:field_storage_config
 migration_dependencies:
diff -u b/core/modules/comment/migration_templates/d7_comment_field_instance.yml b/core/modules/comment/migration_templates/d7_comment_field_instance.yml
--- b/core/modules/comment/migration_templates/d7_comment_field_instance.yml
+++ b/core/modules/comment/migration_templates/d7_comment_field_instance.yml
@@ -13,12 +13,13 @@
   label: 'constants/label'
   required: 'constants/required'
   field_name:
-    plugin: static_map
-    source: bundle
-    bypass: true
-    map:
-      comment_node_article: comment
-      comment_node_forum: comment_forum
+    -
+      plugin: migration_lookup
+      source: bundle
+      migration: d7_comment_type
+    -
+      plugin: skip_on_empty
+      method: row
   bundle: node_type
   'default_value/0/status': 'constants/required'
   'settings/default_mode': default_mode