Rename asset_comment and log_comment bundles to simply asset and log.

modules/core/comment/farm_comment.module

@@ -31,8 +31,8 @@ function farm_comment_base_field_definition(string $entity_type) {
   // Set the field label.
   $field->setLabel(t('Comments'));
 
-  // We assume that the comment type is "[entity-type]_comment".
+  // We assume that the comment type matches the entity type.
-  $field->setSetting('comment_type', $entity_type . '_comment');
+  $field->setSetting('comment_type', $entity_type);
 
   // A default value must be set for comment fields.
   // Enable comments on entities by default.

modules/core/comment/modules/asset/config/install/comment.type.asset.yml

@@ -4,7 +4,7 @@ dependencies:
   enforced:
     module:
       - farm_comment_asset
-id: asset_comment
+id: asset
 label: 'Asset comment'
 target_entity_type_id: asset
 description: ''

modules/core/comment/modules/asset/config/install/core.entity_form_display.comment.asset.default.yml

@@ -2,16 +2,16 @@ langcode: en
 status: true
 dependencies:
   config:
-    - comment.type.asset_comment
+    - comment.type.asset
-    - field.field.comment.asset_comment.comment_body
+    - field.field.comment.asset.comment_body
   enforced:
     module:
       - farm_comment_asset
   module:
     - text
-id: comment.asset_comment.default
+id: comment.asset.default
 targetEntityType: comment
-bundle: asset_comment
+bundle: asset
 mode: default
 content:
   author:

modules/core/comment/modules/asset/config/install/core.entity_view_display.comment.asset.default.yml

@@ -2,16 +2,16 @@ langcode: en
 status: true
 dependencies:
   config:
-    - comment.type.asset_comment
+    - comment.type.asset
-    - field.field.comment.asset_comment.comment_body
+    - field.field.comment.asset.comment_body
   enforced:
     module:
       - farm_comment_asset
   module:
     - text
-id: comment.asset_comment.default
+id: comment.asset.default
 targetEntityType: comment
-bundle: asset_comment
+bundle: asset
 mode: default
 content:
   comment_body:

modules/core/comment/modules/asset/config/install/field.field.comment.asset.comment_body.yml

@@ -2,17 +2,17 @@ langcode: en
 status: true
 dependencies:
   config:
-    - comment.type.asset_comment
+    - comment.type.asset
     - field.storage.comment.comment_body
   enforced:
     module:
       - farm_comment_asset
   module:
     - text
-id: comment.asset_comment.comment_body
+id: comment.asset.comment_body
 field_name: comment_body
 entity_type: comment
-bundle: asset_comment
+bundle: asset
 label: Comment
 description: ''
 required: true

modules/core/comment/modules/log/config/install/comment.type.log.yml

@@ -4,7 +4,7 @@ dependencies:
   enforced:
     module:
       - farm_comment_log
-id: log_comment
+id: log
 label: 'Log comment'
 target_entity_type_id: log
 description: ''

modules/core/comment/modules/log/config/install/core.entity_form_display.comment.log.default.yml

@@ -2,16 +2,16 @@ langcode: en
 status: true
 dependencies:
   config:
-    - comment.type.log_comment
+    - comment.type.log
-    - field.field.comment.log_comment.comment_body
+    - field.field.comment.log.comment_body
   enforced:
     module:
       - farm_comment_log
   module:
     - text
-id: comment.log_comment.default
+id: comment.log.default
 targetEntityType: comment
-bundle: log_comment
+bundle: log
 mode: default
 content:
   author:

modules/core/comment/modules/log/config/install/core.entity_view_display.comment.log.default.yml

@@ -2,16 +2,16 @@ langcode: en
 status: true
 dependencies:
   config:
-    - comment.type.log_comment
+    - comment.type.log
-    - field.field.comment.log_comment.comment_body
+    - field.field.comment.log.comment_body
   enforced:
     module:
       - farm_comment_log
   module:
     - text
-id: comment.log_comment.default
+id: comment.log.default
 targetEntityType: comment
-bundle: log_comment
+bundle: log
 mode: default
 content:
   comment_body:

modules/core/comment/modules/log/config/install/field.field.comment.log.comment_body.yml

@@ -2,17 +2,17 @@ langcode: en
 status: true
 dependencies:
   config:
-    - comment.type.log_comment
+    - comment.type.log
     - field.storage.comment.comment_body
   enforced:
     module:
       - farm_comment_log
   module:
     - text
-id: comment.log_comment.comment_body
+id: comment.log.comment_body
 field_name: comment_body
 entity_type: comment
-bundle: log_comment
+bundle: log
 label: Comment
 description: ''
 required: true