diff --git a/core/modules/action/migration_templates/d6_action_settings.yml b/core/modules/action/migration_templates/d6_action_settings.yml
index a1b6265..f46092c 100644
--- a/core/modules/action/migration_templates/d6_action_settings.yml
+++ b/core/modules/action/migration_templates/d6_action_settings.yml
@@ -1,5 +1,5 @@
 id: d6_action_settings
-label: Drupal 6 action configuration
+label: Action configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml b/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
index e94ae9e..361f35c 100644
--- a/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
@@ -1,5 +1,5 @@
 id: d6_aggregator_feed
-label: Drupal 6 aggregator feeds
+label: Aggregator feeds
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_item.yml b/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
index 615c550..6698c22 100644
--- a/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
@@ -1,5 +1,5 @@
 id: d6_aggregator_item
-label: Drupal 6 aggregator items
+label: Aggregator items
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
index 5b8e605..72372e4 100644
--- a/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
@@ -1,5 +1,5 @@
 id: d6_aggregator_settings
-label: Drupal 6 aggregator configuration
+label: Aggregator configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
index a60d7e3..c8c793f 100644
--- a/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
+++ b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
@@ -1,5 +1,5 @@
 id: d7_aggregator_settings
-label: Drupal 7 aggregator configuration
+label: Aggregator configuration
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/ban/migration_templates/d7_blocked_ips.yml b/core/modules/ban/migration_templates/d7_blocked_ips.yml
index f48f977..0122dc6 100644
--- a/core/modules/ban/migration_templates/d7_blocked_ips.yml
+++ b/core/modules/ban/migration_templates/d7_blocked_ips.yml
@@ -1,5 +1,5 @@
 id: d7_blocked_ips
-label: Drupal 7 blocked IPs
+label: Blocked IPs
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/block/migration_templates/d6_block.yml b/core/modules/block/migration_templates/d6_block.yml
index cf40166..4c11864 100644
--- a/core/modules/block/migration_templates/d6_block.yml
+++ b/core/modules/block/migration_templates/d6_block.yml
@@ -1,5 +1,5 @@
 id: d6_block
-label: Drupal 6 blocks
+label: Blocks
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/block_content/migration_templates/d6_block_content_body_field.yml b/core/modules/block_content/migration_templates/d6_block_content_body_field.yml
index e8164e1..bc4b3e6 100644
--- a/core/modules/block_content/migration_templates/d6_block_content_body_field.yml
+++ b/core/modules/block_content/migration_templates/d6_block_content_body_field.yml
@@ -1,5 +1,5 @@
 id: d6_block_content_body_field
-label: Drupal 6 block content body field configuration
+label: Block content body field configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/block_content/migration_templates/d6_block_content_type.yml b/core/modules/block_content/migration_templates/d6_block_content_type.yml
index 8dcea2f..0200900 100644
--- a/core/modules/block_content/migration_templates/d6_block_content_type.yml
+++ b/core/modules/block_content/migration_templates/d6_block_content_type.yml
@@ -1,5 +1,5 @@
 id: d6_block_content_type
-label: Drupal 6 block content type
+label: Block content type
 migration_tags:
   - Drupal 6
 source:
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 0564f89..257737a 100644
--- a/core/modules/block_content/migration_templates/d6_custom_block.yml
+++ b/core/modules/block_content/migration_templates/d6_custom_block.yml
@@ -1,5 +1,5 @@
 id: d6_custom_block
-label: Drupal 6 custom blocks
+label: Custom blocks
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/book/migration_templates/d6_book.yml b/core/modules/book/migration_templates/d6_book.yml
index 0aaad33..dca43b1 100644
--- a/core/modules/book/migration_templates/d6_book.yml
+++ b/core/modules/book/migration_templates/d6_book.yml
@@ -1,5 +1,5 @@
 id: d6_book
-label: Drupal 6 books
+label: Books
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/book/migration_templates/d6_book_settings.yml b/core/modules/book/migration_templates/d6_book_settings.yml
index e885d37..16e6695 100644
--- a/core/modules/book/migration_templates/d6_book_settings.yml
+++ b/core/modules/book/migration_templates/d6_book_settings.yml
@@ -1,5 +1,5 @@
 id: d6_book_settings
-label: Drupal 6 book configuration
+label: Book configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/comment/migration_templates/d6_comment.yml b/core/modules/comment/migration_templates/d6_comment.yml
index 5945434..62f3f64 100644
--- a/core/modules/comment/migration_templates/d6_comment.yml
+++ b/core/modules/comment/migration_templates/d6_comment.yml
@@ -1,5 +1,5 @@
 id: d6_comment
-label: Drupal 6 comments
+label: Comments
 migration_tags:
   - Drupal 6
 source:
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 cb9512b..c650673 100644
--- a/core/modules/comment/migration_templates/d6_comment_entity_display.yml
+++ b/core/modules/comment/migration_templates/d6_comment_entity_display.yml
@@ -1,5 +1,5 @@
 id: d6_comment_entity_display
-label: Drupal 6 comment display configuration
+label: Comment display configuration
 migration_tags:
   - Drupal 6
 source:
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 e3d7d4c..c33685f 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
@@ -1,5 +1,5 @@
 id: d6_comment_entity_form_display
-label: Drupal 6 comment field form display configuration
+label: Comment field form display configuration
 migration_tags:
   - Drupal 6
 source:
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 8c6c607..abe6191 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
@@ -1,5 +1,5 @@
 id: d6_comment_entity_form_display_subject
-label: Drupal 6 comment subject form display configuration
+label: Comment subject form display configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/comment/migration_templates/d6_comment_field.yml b/core/modules/comment/migration_templates/d6_comment_field.yml
index aca8783..469d604 100644
--- a/core/modules/comment/migration_templates/d6_comment_field.yml
+++ b/core/modules/comment/migration_templates/d6_comment_field.yml
@@ -1,5 +1,5 @@
 id: d6_comment_field
-label: Drupal 6 comment field configuration
+label: Comment field configuration
 migration_tags:
   - Drupal 6
 source:
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 c32636e..372db03 100644
--- a/core/modules/comment/migration_templates/d6_comment_field_instance.yml
+++ b/core/modules/comment/migration_templates/d6_comment_field_instance.yml
@@ -1,5 +1,5 @@
 id: d6_comment_field_instance
-label: Drupal 6 comment field instance configuration
+label: Comment field instance configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/comment/migration_templates/d6_comment_type.yml b/core/modules/comment/migration_templates/d6_comment_type.yml
index 54ffec1..69a2bd8 100644
--- a/core/modules/comment/migration_templates/d6_comment_type.yml
+++ b/core/modules/comment/migration_templates/d6_comment_type.yml
@@ -1,5 +1,5 @@
 id: d6_comment_type
-label: Drupal 6 comment type
+label: Comment type
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/comment/migration_templates/d7_comment.yml b/core/modules/comment/migration_templates/d7_comment.yml
index da44b1f..b1b35bf 100755
--- a/core/modules/comment/migration_templates/d7_comment.yml
+++ b/core/modules/comment/migration_templates/d7_comment.yml
@@ -1,5 +1,5 @@
 id: d7_comment
-label: Drupal 7 comments
+label: Comments
 migration_tags:
   - Drupal 7
 source:
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 3d51220..2004505 100755
--- a/core/modules/comment/migration_templates/d7_comment_entity_display.yml
+++ b/core/modules/comment/migration_templates/d7_comment_entity_display.yml
@@ -1,5 +1,5 @@
 id: d7_comment_entity_display
-label: Drupal 7 comment display configuration
+label: Comment display configuration
 migration_tags:
   - Drupal 7
 source:
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 a8a0b21..0315c4a 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
@@ -1,5 +1,5 @@
 id: d7_comment_entity_form_display
-label: Drupal 7 comment field form display configuration
+label: Comment field form display configuration
 migration_tags:
   - Drupal 7
 source:
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 57c405c..c27303e 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
@@ -1,5 +1,5 @@
 id: d7_comment_entity_form_display_subject
-label: Drupal 7 comment subject form display configuration
+label: Comment subject form display configuration
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/comment/migration_templates/d7_comment_field.yml b/core/modules/comment/migration_templates/d7_comment_field.yml
index e3ab90b..b4b3543 100755
--- a/core/modules/comment/migration_templates/d7_comment_field.yml
+++ b/core/modules/comment/migration_templates/d7_comment_field.yml
@@ -1,5 +1,5 @@
 id: d7_comment_field
-label: Drupal 7 comment field configuration
+label: Comment field configuration
 migration_tags:
   - Drupal 7
 source:
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 f28b3ea..80a1a51 100755
--- a/core/modules/comment/migration_templates/d7_comment_field_instance.yml
+++ b/core/modules/comment/migration_templates/d7_comment_field_instance.yml
@@ -1,5 +1,5 @@
 id: d7_comment_field_instance
-label: Drupal 7 comment field instance configuration
+label: Comment field instance configuration
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/comment/migration_templates/d7_comment_type.yml b/core/modules/comment/migration_templates/d7_comment_type.yml
index a40fd2e..090bfdd 100755
--- a/core/modules/comment/migration_templates/d7_comment_type.yml
+++ b/core/modules/comment/migration_templates/d7_comment_type.yml
@@ -1,5 +1,5 @@
 id: d7_comment_type
-label: Drupal 7 comment type
+label: Comment type
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/contact/migration_templates/d6_contact_category.yml b/core/modules/contact/migration_templates/d6_contact_category.yml
index d50e4fe..6e545ed 100644
--- a/core/modules/contact/migration_templates/d6_contact_category.yml
+++ b/core/modules/contact/migration_templates/d6_contact_category.yml
@@ -1,5 +1,5 @@
 id: d6_contact_category
-label: Drupal 6 contact category configuration
+label: Contact category configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/contact/migration_templates/d6_contact_settings.yml b/core/modules/contact/migration_templates/d6_contact_settings.yml
index e0897fe..b1da5a9 100644
--- a/core/modules/contact/migration_templates/d6_contact_settings.yml
+++ b/core/modules/contact/migration_templates/d6_contact_settings.yml
@@ -1,5 +1,5 @@
 id: d6_contact_settings
-label: Drupal 6 contact configuration
+label: Contact configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/dblog/migration_templates/d6_dblog_settings.yml b/core/modules/dblog/migration_templates/d6_dblog_settings.yml
index 6c94b1e..64da0a7 100644
--- a/core/modules/dblog/migration_templates/d6_dblog_settings.yml
+++ b/core/modules/dblog/migration_templates/d6_dblog_settings.yml
@@ -1,5 +1,5 @@
 id: d6_dblog_settings
-label: Drupal 6 database logging configuration
+label: Database logging configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/dblog/migration_templates/d7_dblog_settings.yml b/core/modules/dblog/migration_templates/d7_dblog_settings.yml
index 8e681fd..e22768f 100644
--- a/core/modules/dblog/migration_templates/d7_dblog_settings.yml
+++ b/core/modules/dblog/migration_templates/d7_dblog_settings.yml
@@ -1,5 +1,5 @@
 id: d7_dblog_settings
-label: Drupal 7 database logging configuration
+label: Database logging configuration
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/field/migration_templates/d6_field.yml b/core/modules/field/migration_templates/d6_field.yml
index 353a97f..2e07692 100644
--- a/core/modules/field/migration_templates/d6_field.yml
+++ b/core/modules/field/migration_templates/d6_field.yml
@@ -1,5 +1,5 @@
 id: d6_field
-label: Drupal 6 field configuration
+label: Field configuration
 migration_tags:
   - Drupal 6
 builder:
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 3e241a1..c851bf5 100644
--- a/core/modules/field/migration_templates/d6_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
@@ -1,5 +1,5 @@
 id: d6_field_formatter_settings
-label: Drupal 6 field formatter configuration
+label: Field formatter configuration
 migration_tags:
   - Drupal 6
 builder:
diff --git a/core/modules/field/migration_templates/d6_field_instance.yml b/core/modules/field/migration_templates/d6_field_instance.yml
index bdd5274..78b81ad 100644
--- a/core/modules/field/migration_templates/d6_field_instance.yml
+++ b/core/modules/field/migration_templates/d6_field_instance.yml
@@ -1,5 +1,5 @@
 id: d6_field_instance
-label: Drupal 6 field instance configuration
+label: Field instance configuration
 migration_tags:
   - Drupal 6
 builder:
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 7b9255e..ad9c74a 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
@@ -1,5 +1,5 @@
 id: d6_field_instance_widget_settings
-label: Drupal 6 field instance widget configuration
+label: Field instance widget configuration
 migration_tags:
   - Drupal 6
 builder:
diff --git a/core/modules/field/migration_templates/d7_field.yml b/core/modules/field/migration_templates/d7_field.yml
index 44ea36d..3b01f54 100755
--- a/core/modules/field/migration_templates/d7_field.yml
+++ b/core/modules/field/migration_templates/d7_field.yml
@@ -1,5 +1,5 @@
 id: d7_field
-label: Drupal 7 field configuration
+label: Field configuration
 migration_tags:
   - Drupal 7
 source:
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 7ee6fe2..2eb8ec8 100644
--- a/core/modules/field/migration_templates/d7_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
@@ -1,5 +1,5 @@
 id: d7_field_formatter_settings
-label: Drupal 7 field formatter configuration
+label: Field formatter configuration
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/field/migration_templates/d7_field_instance.yml b/core/modules/field/migration_templates/d7_field_instance.yml
index d121927..62ec9ce 100755
--- a/core/modules/field/migration_templates/d7_field_instance.yml
+++ b/core/modules/field/migration_templates/d7_field_instance.yml
@@ -1,4 +1,5 @@
 id: d7_field_instance
+label: Field instance configuration
 migration_tags:
   - Drupal 7
 source:
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 3463ae9..e710fbe 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
@@ -1,5 +1,5 @@
 id: d7_field_instance_widget_settings
-label: Drupal 7 field instance widget configuration
+label: Field instance widget configuration
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/field/migration_templates/d7_view_modes.yml b/core/modules/field/migration_templates/d7_view_modes.yml
index 0f34088..b4f9998 100644
--- a/core/modules/field/migration_templates/d7_view_modes.yml
+++ b/core/modules/field/migration_templates/d7_view_modes.yml
@@ -1,5 +1,5 @@
 id: d7_view_modes
-label: Drupal 7 view modes
+label: View modes
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/file/migration_templates/d6_file.yml b/core/modules/file/migration_templates/d6_file.yml
index e8ead68..07a9cc2 100644
--- a/core/modules/file/migration_templates/d6_file.yml
+++ b/core/modules/file/migration_templates/d6_file.yml
@@ -1,7 +1,7 @@
 # Every migration that saves into {file_managed} must have the d6_file
 # migration as an optional dependency to ensure d6_file runs first.
 id: d6_file
-label: Drupal 6 files
+label: Files
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/file/migration_templates/d6_file_settings.yml b/core/modules/file/migration_templates/d6_file_settings.yml
index f08d92e..d59aa47 100644
--- a/core/modules/file/migration_templates/d6_file_settings.yml
+++ b/core/modules/file/migration_templates/d6_file_settings.yml
@@ -1,5 +1,5 @@
 id: d6_file_settings
-label: Drupal 6 file configuration
+label: File configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/file/migration_templates/d6_upload.yml b/core/modules/file/migration_templates/d6_upload.yml
index 14a3771..4935a41 100644
--- a/core/modules/file/migration_templates/d6_upload.yml
+++ b/core/modules/file/migration_templates/d6_upload.yml
@@ -1,5 +1,5 @@
 id: d6_upload
-label: Drupal 6 file uploads
+label: File uploads
 migration_tags:
   - Drupal 6
 source:
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 28e154b..efc6632 100644
--- a/core/modules/file/migration_templates/d6_upload_entity_display.yml
+++ b/core/modules/file/migration_templates/d6_upload_entity_display.yml
@@ -1,5 +1,5 @@
 id: d6_upload_entity_display
-label: Drupal 6 upload display configuration
+label: Upload display configuration
 migration_tags:
   - Drupal 6
 source:
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 7725659..1d7a864 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
@@ -1,5 +1,5 @@
 id: d6_upload_entity_form_display
-label: Drupal 6 upload form display configuration
+label: Upload form display configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/file/migration_templates/d6_upload_field.yml b/core/modules/file/migration_templates/d6_upload_field.yml
index e92b801..c0b4569 100644
--- a/core/modules/file/migration_templates/d6_upload_field.yml
+++ b/core/modules/file/migration_templates/d6_upload_field.yml
@@ -1,5 +1,5 @@
 id: d6_upload_field
-label: Drupal 6 upload field configuration
+label: Upload field configuration
 migration_tags:
   - Drupal 6
 source:
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 4410ec0..8b53503 100644
--- a/core/modules/file/migration_templates/d6_upload_field_instance.yml
+++ b/core/modules/file/migration_templates/d6_upload_field_instance.yml
@@ -1,5 +1,5 @@
 id: d6_upload_field_instance
-label: Drupal 6 upload field instance configuration
+label: Upload field instance configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/file/migration_templates/d7_file.yml b/core/modules/file/migration_templates/d7_file.yml
index 5be3211..ea8f647 100644
--- a/core/modules/file/migration_templates/d7_file.yml
+++ b/core/modules/file/migration_templates/d7_file.yml
@@ -1,7 +1,7 @@
 # Every migration that references a file by fid should specify this migration
 # as an optional dependency.
 id: d7_file
-label: Drupal 7 files
+label: Files
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/filter/migration_templates/d6_filter_format.yml b/core/modules/filter/migration_templates/d6_filter_format.yml
index 16982d3..a91298c 100644
--- a/core/modules/filter/migration_templates/d6_filter_format.yml
+++ b/core/modules/filter/migration_templates/d6_filter_format.yml
@@ -1,5 +1,5 @@
 id: d6_filter_format
-label: Drupal 6 filter format configuration
+label: Filter format configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/filter/migration_templates/d7_filter_format.yml b/core/modules/filter/migration_templates/d7_filter_format.yml
index 01f820c..ac7729f 100755
--- a/core/modules/filter/migration_templates/d7_filter_format.yml
+++ b/core/modules/filter/migration_templates/d7_filter_format.yml
@@ -1,5 +1,5 @@
 id: d7_filter_format
-label: Drupal 7 filter format configuration
+label: Filter format configuration
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/forum/migration_templates/d6_forum_settings.yml b/core/modules/forum/migration_templates/d6_forum_settings.yml
index 2df6496..5516848 100644
--- a/core/modules/forum/migration_templates/d6_forum_settings.yml
+++ b/core/modules/forum/migration_templates/d6_forum_settings.yml
@@ -1,5 +1,5 @@
 id: d6_forum_settings
-label: Drupal 6 forum configuration
+label: Forum configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/image/migration_templates/d6_imagecache_presets.yml b/core/modules/image/migration_templates/d6_imagecache_presets.yml
index 91e1201..50f913a 100644
--- a/core/modules/image/migration_templates/d6_imagecache_presets.yml
+++ b/core/modules/image/migration_templates/d6_imagecache_presets.yml
@@ -1,5 +1,5 @@
 id: d6_imagecache_presets
-label: Drupal 6 ImageCache Presets
+label: ImageCache Presets
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/image/migration_templates/d7_image_settings.yml b/core/modules/image/migration_templates/d7_image_settings.yml
index 58f5928..bfae4d5 100755
--- a/core/modules/image/migration_templates/d7_image_settings.yml
+++ b/core/modules/image/migration_templates/d7_image_settings.yml
@@ -1,4 +1,5 @@
 id: d7_image_settings
+label: Image configuration
 migration_tags:
   - Drupal 7
 source:
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 aace5fd..f03be78 100644
--- a/core/modules/language/migration_templates/d7_language_negotiation_settings.yml
+++ b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml
@@ -1,5 +1,5 @@
 id: d7_language_negotiation_settings
-label: Drupal 7 language negotiation settings
+label: Language negotiation settings
 migration_tags:
   - Drupal 7
 source:
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 ac5ecd5..e58b202 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
@@ -1,5 +1,5 @@
 id: d6_menu_links
-label: Drupal 6 menu links
+label: Menu links
 migration_tags:
   - Drupal 6
 source:
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 0049480..3a3ac20 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
@@ -1,5 +1,5 @@
 id: d7_menu_links
-label: Drupal 7 menu links
+label: Menu links
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/node/migration_templates/d6_node.yml b/core/modules/node/migration_templates/d6_node.yml
index 2f9ba5b..01642f7 100644
--- a/core/modules/node/migration_templates/d6_node.yml
+++ b/core/modules/node/migration_templates/d6_node.yml
@@ -1,5 +1,5 @@
 id: d6_node
-label: Drupal 6 nodes
+label: Nodes
 migration_tags:
   - Drupal 6
 builder:
diff --git a/core/modules/node/migration_templates/d6_node_revision.yml b/core/modules/node/migration_templates/d6_node_revision.yml
index 9ba85d3..c22e62a 100644
--- a/core/modules/node/migration_templates/d6_node_revision.yml
+++ b/core/modules/node/migration_templates/d6_node_revision.yml
@@ -1,5 +1,5 @@
 id: d6_node_revision
-label: Drupal 6 node revisions
+label: Node revisions
 migration_tags:
   - Drupal 6
 builder:
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 8f6da35..14033ed 100644
--- a/core/modules/node/migration_templates/d6_node_setting_promote.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_promote.yml
@@ -1,5 +1,5 @@
 id: d6_node_setting_promote
-label: Drupal 6 node type 'promote' setting
+label: Node type 'promote' setting
 migration_tags:
   - Drupal 6
 source:
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 5d3e412..e1ea647 100644
--- a/core/modules/node/migration_templates/d6_node_setting_status.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_status.yml
@@ -1,5 +1,5 @@
 id: d6_node_setting_status
-label: Drupal 6 node type 'status' setting
+label: Node type 'status' setting
 migration_tags:
   - Drupal 6
 source:
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 8a8f7b7..89a0a86 100644
--- a/core/modules/node/migration_templates/d6_node_setting_sticky.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_sticky.yml
@@ -1,5 +1,5 @@
 id: d6_node_setting_sticky
-label: Drupal 6 node type 'sticky' setting
+label: Node type 'sticky' setting
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/node/migration_templates/d6_node_settings.yml b/core/modules/node/migration_templates/d6_node_settings.yml
index 3e12dd6..17b0857 100644
--- a/core/modules/node/migration_templates/d6_node_settings.yml
+++ b/core/modules/node/migration_templates/d6_node_settings.yml
@@ -1,5 +1,5 @@
 id: d6_node_settings
-label: Drupal 6 node configuration
+label: Node configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/node/migration_templates/d6_node_type.yml b/core/modules/node/migration_templates/d6_node_type.yml
index 009c3a0..4c76f66 100644
--- a/core/modules/node/migration_templates/d6_node_type.yml
+++ b/core/modules/node/migration_templates/d6_node_type.yml
@@ -1,5 +1,5 @@
 id: d6_node_type
-label: Drupal 6 node type configuration
+label: Node type configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/node/migration_templates/d6_view_modes.yml b/core/modules/node/migration_templates/d6_view_modes.yml
index 62eb6c8..815709b 100644
--- a/core/modules/node/migration_templates/d6_view_modes.yml
+++ b/core/modules/node/migration_templates/d6_view_modes.yml
@@ -1,5 +1,5 @@
 id: d6_view_modes
-label: Drupal 6 view modes
+label: View modes
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/node/migration_templates/d7_node.yml b/core/modules/node/migration_templates/d7_node.yml
index 8cd286e..a6d3cb8 100644
--- a/core/modules/node/migration_templates/d7_node.yml
+++ b/core/modules/node/migration_templates/d7_node.yml
@@ -1,5 +1,5 @@
 id: d7_node
-label: Drupal 7 nodes
+label: Nodes
 migration_tags:
   - Drupal 7
 builder:
diff --git a/core/modules/node/migration_templates/d7_node_revision.yml b/core/modules/node/migration_templates/d7_node_revision.yml
index b549a3b..edb56f3 100644
--- a/core/modules/node/migration_templates/d7_node_revision.yml
+++ b/core/modules/node/migration_templates/d7_node_revision.yml
@@ -1,5 +1,5 @@
 id: d7_node_revision
-label: Drupal 7 node revisions
+label: Node revisions
 migration_tags:
   - Drupal 7
 builder:
diff --git a/core/modules/node/migration_templates/d7_node_settings.yml b/core/modules/node/migration_templates/d7_node_settings.yml
index adff19c..0461754 100644
--- a/core/modules/node/migration_templates/d7_node_settings.yml
+++ b/core/modules/node/migration_templates/d7_node_settings.yml
@@ -1,5 +1,5 @@
 id: d7_node_settings
-label: Drupal 7 node configuration
+label: Node configuration
 migration_tags:
   - Drupal 7
 source:
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 2024949..53ae6ea 100644
--- a/core/modules/node/migration_templates/d7_node_title_label.yml
+++ b/core/modules/node/migration_templates/d7_node_title_label.yml
@@ -1,5 +1,5 @@
 id: d7_node_title_label
-label: Drupal 7 node title label
+label: Node title label
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/node/migration_templates/d7_node_type.yml b/core/modules/node/migration_templates/d7_node_type.yml
index c8e0dd0..6cf8e78 100644
--- a/core/modules/node/migration_templates/d7_node_type.yml
+++ b/core/modules/node/migration_templates/d7_node_type.yml
@@ -1,5 +1,5 @@
 id: d7_node_type
-label: Drupal 7 node type configuration
+label: Node type configuration
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php
index 3043507..4a5483a 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\node\Tests\Migrate\d6;
 
+use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\migrate\Entity\Migration;
 
@@ -18,6 +19,11 @@ class MigrateNodeBuilderTest extends MigrateDrupal6TestBase {
   public static $modules = ['migrate', 'migrate_drupal', 'node'];
 
   /**
+   * @var MigrationInterface[]
+   */
+  protected $builtMigrations = [];
+
+  /**
    * Asserts various aspects of a migration entity.
    *
    * @param string $id
@@ -26,7 +32,7 @@ class MigrateNodeBuilderTest extends MigrateDrupal6TestBase {
    *   The label.
    */
   protected function assertEntity($id, $label) {
-    $migration = Migration::load($id);
+    $migration = $this->builtMigrations[$id];
     $this->assertTrue($migration instanceof Migration);
     $this->assertIdentical($id, $migration->Id());
     $this->assertIdentical($label, $migration->label());
@@ -58,7 +64,11 @@ public function testCreateMigrations() {
     ];
 
     $migrations = \Drupal::service('migrate.migration_builder')->createMigrations($templates);
-    $this->assertIdentical(11, count($migrations));
+    // Key the array.
+    foreach ($migrations as $migration) {
+      $this->builtMigrations[$migration->id()] = $migration;
+    }
+    $this->assertIdentical(11, count($this->builtMigrations));
     $this->assertEntity('d6_node__article', 'Drupal 6 nodes (article)');
     $this->assertEntity('d6_node__company', 'Drupal 6 nodes (company)');
     $this->assertEntity('d6_node__employee', 'Drupal 6 nodes (employee)');
diff --git a/core/modules/path/migration_templates/d6_url_alias.yml b/core/modules/path/migration_templates/d6_url_alias.yml
index 7fcbaec..098835e 100644
--- a/core/modules/path/migration_templates/d6_url_alias.yml
+++ b/core/modules/path/migration_templates/d6_url_alias.yml
@@ -1,5 +1,5 @@
 id: d6_url_alias
-label: Drupal 6 URL aliases
+label: URL aliases
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/search/migration_templates/d6_search_page.yml b/core/modules/search/migration_templates/d6_search_page.yml
index d12aca6..f509d8c 100644
--- a/core/modules/search/migration_templates/d6_search_page.yml
+++ b/core/modules/search/migration_templates/d6_search_page.yml
@@ -1,5 +1,5 @@
 id: d6_search_page
-label: Drupal 6 search page configuration
+label: Search page configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/search/migration_templates/d6_search_settings.yml b/core/modules/search/migration_templates/d6_search_settings.yml
index 36f5447..8efb9fd 100644
--- a/core/modules/search/migration_templates/d6_search_settings.yml
+++ b/core/modules/search/migration_templates/d6_search_settings.yml
@@ -1,5 +1,5 @@
 id: d6_search_settings
-label: Drupal 6 search configuration
+label: Search configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/search/migration_templates/d7_search_settings.yml b/core/modules/search/migration_templates/d7_search_settings.yml
index 1da226c..ec27214 100644
--- a/core/modules/search/migration_templates/d7_search_settings.yml
+++ b/core/modules/search/migration_templates/d7_search_settings.yml
@@ -1,5 +1,5 @@
 id: d7_search_settings
-label: Drupal 7 search configuration
+label: Search configuration
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
index d616a59..c9eedbb 100644
--- a/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
+++ b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
@@ -1,5 +1,5 @@
 id: d6_simpletest_settings
-label: Drupal 6 simpletest configuration
+label: Simpletest configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml b/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
index 8303ebc..b77f76a 100644
--- a/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
+++ b/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
@@ -1,5 +1,5 @@
 id: d7_simpletest_settings
-label: Drupal 7 SimpleTest configuration
+label: SimpleTest configuration
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/statistics/migration_templates/d6_statistics_settings.yml b/core/modules/statistics/migration_templates/d6_statistics_settings.yml
index a8820db..348ad38 100644
--- a/core/modules/statistics/migration_templates/d6_statistics_settings.yml
+++ b/core/modules/statistics/migration_templates/d6_statistics_settings.yml
@@ -1,5 +1,5 @@
 id: d6_statistics_settings
-label: Drupal 6 statistics configuration
+label: Statistics configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/syslog/migration_templates/d6_syslog_settings.yml b/core/modules/syslog/migration_templates/d6_syslog_settings.yml
index 4c9fd49..86a7017 100644
--- a/core/modules/syslog/migration_templates/d6_syslog_settings.yml
+++ b/core/modules/syslog/migration_templates/d6_syslog_settings.yml
@@ -1,5 +1,5 @@
 id: d6_syslog_settings
-label: Drupal 6 system log configuration
+label: System log configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/syslog/migration_templates/d7_syslog_settings.yml b/core/modules/syslog/migration_templates/d7_syslog_settings.yml
index e99b78e..4000572 100644
--- a/core/modules/syslog/migration_templates/d7_syslog_settings.yml
+++ b/core/modules/syslog/migration_templates/d7_syslog_settings.yml
@@ -1,5 +1,5 @@
 id: d7_syslog_settings
-label: Drupal 7 syslog configuration
+label: Syslog configuration
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/system/migration_templates/d6_date_formats.yml b/core/modules/system/migration_templates/d6_date_formats.yml
index c7f3422..71257d4 100644
--- a/core/modules/system/migration_templates/d6_date_formats.yml
+++ b/core/modules/system/migration_templates/d6_date_formats.yml
@@ -1,5 +1,5 @@
 id: d6_date_formats
-label: Drupal 6 date format configuration
+label: Date format configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/system/migration_templates/d6_system_cron.yml b/core/modules/system/migration_templates/d6_system_cron.yml
index 01970a9..7dd3a2b 100644
--- a/core/modules/system/migration_templates/d6_system_cron.yml
+++ b/core/modules/system/migration_templates/d6_system_cron.yml
@@ -1,5 +1,5 @@
 id: d6_system_cron
-label: Drupal 6 cron settings
+label: Cron settings
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/system/migration_templates/d6_system_date.yml b/core/modules/system/migration_templates/d6_system_date.yml
index d9ee788..25f6728 100644
--- a/core/modules/system/migration_templates/d6_system_date.yml
+++ b/core/modules/system/migration_templates/d6_system_date.yml
@@ -1,5 +1,5 @@
 id: d6_system_date
-label: Drupal 6 system date configuration
+label: System date configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/system/migration_templates/d6_system_file.yml b/core/modules/system/migration_templates/d6_system_file.yml
index 1405ff5..60cd616 100644
--- a/core/modules/system/migration_templates/d6_system_file.yml
+++ b/core/modules/system/migration_templates/d6_system_file.yml
@@ -1,5 +1,5 @@
 id: d6_system_file
-label: Drupal 6 file system configuration
+label: File system configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/system/migration_templates/d6_system_image.yml b/core/modules/system/migration_templates/d6_system_image.yml
index f19d516..15d0ecc 100644
--- a/core/modules/system/migration_templates/d6_system_image.yml
+++ b/core/modules/system/migration_templates/d6_system_image.yml
@@ -1,5 +1,5 @@
 id: d6_system_image
-label: Drupal 6 image toolkit configuration
+label: Image toolkit configuration
 migration_tags:
   - Drupal 6
 source:
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 52b9052..543b162 100644
--- a/core/modules/system/migration_templates/d6_system_image_gd.yml
+++ b/core/modules/system/migration_templates/d6_system_image_gd.yml
@@ -1,5 +1,5 @@
 id: d6_system_image_gd
-label: Drupal 6 image quality configuration
+label: Image quality configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/system/migration_templates/d6_system_logging.yml b/core/modules/system/migration_templates/d6_system_logging.yml
index bca03ec..868d08f 100644
--- a/core/modules/system/migration_templates/d6_system_logging.yml
+++ b/core/modules/system/migration_templates/d6_system_logging.yml
@@ -1,5 +1,5 @@
 id: d6_system_logging
-label: Drupal 6 system logging
+label: System logging
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/system/migration_templates/d6_system_maintenance.yml b/core/modules/system/migration_templates/d6_system_maintenance.yml
index b902551..9f9f030 100644
--- a/core/modules/system/migration_templates/d6_system_maintenance.yml
+++ b/core/modules/system/migration_templates/d6_system_maintenance.yml
@@ -1,5 +1,5 @@
 id: d6_system_maintenance
-label: Drupal 6 maintenance page configuration
+label: Maintenance page configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/system/migration_templates/d6_system_performance.yml b/core/modules/system/migration_templates/d6_system_performance.yml
index edff811..6f9666e 100644
--- a/core/modules/system/migration_templates/d6_system_performance.yml
+++ b/core/modules/system/migration_templates/d6_system_performance.yml
@@ -1,5 +1,5 @@
 id: d6_system_performance
-label: Drupal 6 performance configuration
+label: Performance configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/system/migration_templates/d6_system_rss.yml b/core/modules/system/migration_templates/d6_system_rss.yml
index 7d5fd14..d112e82 100644
--- a/core/modules/system/migration_templates/d6_system_rss.yml
+++ b/core/modules/system/migration_templates/d6_system_rss.yml
@@ -1,5 +1,5 @@
 id: d6_system_rss
-label: Drupal 6 RSS configuration
+label: RSS configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/system/migration_templates/d6_system_site.yml b/core/modules/system/migration_templates/d6_system_site.yml
index 04b99ce..9e16219 100644
--- a/core/modules/system/migration_templates/d6_system_site.yml
+++ b/core/modules/system/migration_templates/d6_system_site.yml
@@ -1,5 +1,5 @@
 id: d6_system_site
-label: Drupal 6 site configuration
+label: Site configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_settings.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_settings.yml
index 3fe9e1f..e305cd4 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_settings.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_settings.yml
@@ -1,5 +1,5 @@
 id: d6_taxonomy_settings
-label: Drupal 6 taxonomy configuration
+label: Taxonomy configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
index 546f95f..0d950ea 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
@@ -1,5 +1,5 @@
 id: d6_taxonomy_term
-label: Drupal 6 taxonomy terms
+label: Taxonomy terms
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
index 414d2cb..654a076 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
@@ -1,5 +1,5 @@
 id: d6_taxonomy_vocabulary
-label: Drupal 6 taxonomy vocabularies
+label: Taxonomy vocabularies
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/taxonomy/migration_templates/d6_term_node.yml b/core/modules/taxonomy/migration_templates/d6_term_node.yml
index ee7f830..5384363 100644
--- a/core/modules/taxonomy/migration_templates/d6_term_node.yml
+++ b/core/modules/taxonomy/migration_templates/d6_term_node.yml
@@ -1,5 +1,5 @@
 id: d6_term_node
-label: Drupal 6 term/node relationships
+label: Term/node relationships
 migration_tags:
   - Drupal 6
 builder:
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 d904d41..3e6a346 100644
--- a/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
+++ b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
@@ -1,5 +1,5 @@
 id: d6_term_node_revision
-label: Drupal 6 term/node relationship revisions
+label: Term/node relationship revisions
 migration_tags:
   - Drupal 6
 builder:
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 9295acd..e24f01b 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
@@ -1,5 +1,5 @@
 id: d6_vocabulary_entity_display
-label: Drupal 6 vocabulary display configuration
+label: Vocabulary display configuration
 migration_tags:
   - Drupal 6
 source:
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 3dbc95b..1b9f5ef 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
@@ -1,5 +1,5 @@
 id: d6_vocabulary_entity_form_display
-label: Drupal 6 vocabulary form display configuration
+label: Vocabulary form display configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
index 2fc0e0f..5139f31 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
@@ -1,5 +1,5 @@
 id: d6_vocabulary_field
-label: Drupal 6 vocabulary field configuration
+label: Vocabulary field configuration
 migration_tags:
   - Drupal 6
 source:
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 3f6ef78..6b09edd 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
@@ -1,5 +1,5 @@
 id: d6_vocabulary_field_instance
-label: Drupal 6 vocabulary field instance configuration
+label: Vocabulary field instance configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/tracker/migration_templates/d7_tracker_settings.yml b/core/modules/tracker/migration_templates/d7_tracker_settings.yml
index 269c2ea..ce06cbd 100644
--- a/core/modules/tracker/migration_templates/d7_tracker_settings.yml
+++ b/core/modules/tracker/migration_templates/d7_tracker_settings.yml
@@ -1,5 +1,5 @@
 id: d7_tracker_settings
-label: Drupal 7 tracker settings
+label: Tracker settings
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/update/migration_templates/d6_update_settings.yml b/core/modules/update/migration_templates/d6_update_settings.yml
index 4e87350..37e0ef1 100644
--- a/core/modules/update/migration_templates/d6_update_settings.yml
+++ b/core/modules/update/migration_templates/d6_update_settings.yml
@@ -1,5 +1,5 @@
 id: d6_update_settings
-label: Drupal 6 update configuration
+label: Update configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/user/migration_templates/d6_profile_values.yml b/core/modules/user/migration_templates/d6_profile_values.yml
index 68c659a..cb36b0e 100644
--- a/core/modules/user/migration_templates/d6_profile_values.yml
+++ b/core/modules/user/migration_templates/d6_profile_values.yml
@@ -1,5 +1,5 @@
 id: d6_profile_values
-label: Drupal 6 profile values
+label: Profile values
 migration_tags:
   - Drupal 6
 builder:
diff --git a/core/modules/user/migration_templates/d6_user.yml b/core/modules/user/migration_templates/d6_user.yml
index 00dba32..6d5795b 100644
--- a/core/modules/user/migration_templates/d6_user.yml
+++ b/core/modules/user/migration_templates/d6_user.yml
@@ -1,5 +1,5 @@
 id: d6_user
-label: Drupal 6 user accounts
+label: User accounts
 migration_tags:
   - Drupal 6
 source:
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 0429155..0d9a228 100644
--- a/core/modules/user/migration_templates/d6_user_contact_settings.yml
+++ b/core/modules/user/migration_templates/d6_user_contact_settings.yml
@@ -1,5 +1,5 @@
 id: d6_user_contact_settings
-label: Drupal 6 user contact settings
+label: User contact settings
 migration_tags:
   - Drupal 6
 source:
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 0bc5a0b..e4d572a 100644
--- a/core/modules/user/migration_templates/d6_user_picture_file.yml
+++ b/core/modules/user/migration_templates/d6_user_picture_file.yml
@@ -1,5 +1,5 @@
 id: d6_user_picture_file
-label: Drupal 6 user pictures
+label: User pictures
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/user/migration_templates/d6_user_role.yml b/core/modules/user/migration_templates/d6_user_role.yml
index e15058b..a97d519 100644
--- a/core/modules/user/migration_templates/d6_user_role.yml
+++ b/core/modules/user/migration_templates/d6_user_role.yml
@@ -1,5 +1,5 @@
 id: d6_user_role
-label: Drupal 6 user roles
+label: User roles
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/user/migration_templates/d6_user_settings.yml b/core/modules/user/migration_templates/d6_user_settings.yml
index 5984d51..3db99e9 100644
--- a/core/modules/user/migration_templates/d6_user_settings.yml
+++ b/core/modules/user/migration_templates/d6_user_settings.yml
@@ -1,5 +1,5 @@
 id: d6_user_settings
-label: Drupal 6 user configuration
+label: User configuration
 migration_tags:
   - Drupal 6
 source:
diff --git a/core/modules/user/migration_templates/d7_user.yml b/core/modules/user/migration_templates/d7_user.yml
index 9d94b09..703b136 100755
--- a/core/modules/user/migration_templates/d7_user.yml
+++ b/core/modules/user/migration_templates/d7_user.yml
@@ -1,5 +1,5 @@
 id: d7_user
-label: Drupal 7 user accounts
+label: User accounts
 migration_tags:
   - Drupal 7
 builder:
diff --git a/core/modules/user/migration_templates/d7_user_flood.yml b/core/modules/user/migration_templates/d7_user_flood.yml
index 016acec..ae00ce0 100755
--- a/core/modules/user/migration_templates/d7_user_flood.yml
+++ b/core/modules/user/migration_templates/d7_user_flood.yml
@@ -1,4 +1,5 @@
 id: d7_user_flood
+label: User flood configuration
 migration_tags:
   - Drupal 7
 source:
diff --git a/core/modules/user/migration_templates/d7_user_role.yml b/core/modules/user/migration_templates/d7_user_role.yml
index 6688083..68c0d11 100755
--- a/core/modules/user/migration_templates/d7_user_role.yml
+++ b/core/modules/user/migration_templates/d7_user_role.yml
@@ -1,5 +1,5 @@
 id: d7_user_role
-label: Drupal 7 user roles
+label: User roles
 migration_tags:
   - Drupal 7
 source:
