diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
index 98d4ce385f..336f502ef7 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
@@ -16,9 +16,9 @@ process:
       length: 32
       migrated: true
     -
-      # This plugin checks if the vocabulary being migrated is the one used for
-      # forums. If it is, the specified machine name, the one expected by the
-      # forum module, will be used . Otherwise, it is left unchanged.
+      # This plugin checks if the vocabulary being migrated is the one used by
+      # Forum. If so, we use the machine name that Forum expects. Otherwise, we
+      # leave it unchanged.
       plugin: forum_vocabulary
       machine_name: forums
   label: name
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 a479032b1a..0a62458221 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
@@ -45,9 +45,9 @@ process:
       plugin: substr
       length: 32
     -
-      # This plugin checks if the vocabulary being migrated is the one used for
-      # forums. If it is, the specified machine name, the one expected by the
-      # forum module, will be used . Otherwise, it is left unchanged.
+      # This plugin checks if the vocabulary being migrated is the one used by
+      # Forum. If so, we use the machine name that Forum expects. Otherwise, we
+      # leave it unchanged.
       plugin: forum_vocabulary
       machine_name: taxonomy_forums
 destination:
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 a6735f4969..abd31911c1 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
@@ -49,9 +49,9 @@ process:
       plugin: substr
       length: 32
     -
-      # This plugin checks if the vocabulary being migrated is the one used for
-      # forums. If it is, the specified machine name, the one expected by the
-      # forum module, will be used . Otherwise, it is left unchanged.
+      # This plugin checks if the vocabulary being migrated is the one used by
+      # Forum. If so, we use the machine name that Forum expects. Otherwise, we
+      # leave it unchanged.
       plugin: forum_vocabulary
       machine_name: taxonomy_forums
 destination:
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
index 81d800acca..893a95d33a 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
@@ -33,9 +33,9 @@ process:
       plugin: substr
       length: 32
     -
-      # This plugin checks if the vocabulary being migrated is the one used for
-      # forums. If it is, the specified machine name, the one expected by the
-      # forum module, will be used . Otherwise, it is left unchanged.
+      # This plugin checks if the vocabulary being migrated is the one used by
+      # Forum. If so, we use the machine name that Forum expects. Otherwise, we
+      # leave it unchanged.
       plugin: forum_vocabulary
       machine_name: taxonomy_forums
   'settings/target_type': 'constants/target_entity_type'
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 1d2712f556..7e28377866 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
@@ -40,9 +40,9 @@ process:
       plugin: substr
       length: 32
     -
-      # This plugin checks if the vocabulary being migrated is the one used for
-      # forums. If it is, the specified machine name, the one expected by the
-      # forum module, will be used . Otherwise, it is left unchanged.
+      # This plugin checks if the vocabulary being migrated is the one used by
+      # Forum. If so, we use the machine name that Forum expects. Otherwise, we
+      # leave it unchanged.
       plugin: forum_vocabulary
       machine_name: taxonomy_forums
   label: name
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
index cd0e14c88b..3c41e980c8 100644
--- a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
@@ -16,9 +16,9 @@ process:
       length: 32
       migrated: true
     -
-      # This plugin checks if the vocabulary being migrated is the one used for
-      # forums. If it is, the specified machine name, the one expected by the
-      # forum module, will be used . Otherwise, it is left unchanged.
+      # This plugin checks if the vocabulary being migrated is the one used by
+      # Forum. If so, we use the machine name that Forum expects. Otherwise, we
+      # leave it unchanged.
       plugin: forum_vocabulary
       machine_name: forums
   label: name
diff --git a/core/modules/taxonomy/src/Plugin/migrate/process/ForumVocabulary.php b/core/modules/taxonomy/src/Plugin/migrate/process/ForumVocabulary.php
index e835b4b8bc..677f246519 100644
--- a/core/modules/taxonomy/src/Plugin/migrate/process/ForumVocabulary.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/process/ForumVocabulary.php
@@ -9,7 +9,7 @@
 /**
  * Checks if the vocabulary being migrated is the one used for forums.
  *
- * The forum module is expecting specific machine names for its field and
+ * Drupal 8 Forum is expecting specific machine names for its field and
  * vocabulary names. This process plugin forces a given machine name to the
  * field or vocabulary that is being migrated.
  *
diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php
index f8c601d8eb..767daf45e1 100644
--- a/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php
@@ -70,9 +70,9 @@ public function prepareRow(Row $row) {
     $row->setSourceProperty('node_types', $node_types);
     $row->setSourceProperty('cardinality', ($row->getSourceProperty('tags') == 1 || $row->getSourceProperty('multiple') == 1) ? FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED : 1);
 
-    // If the vid of the vocabulary being migrated is equal to the vid in the
+    // If the vocabulary being migrated is the one defined in the
     // 'forum_nav_vocabulary' variable, set the 'forum_vocabulary' source
-    // property to true so we can know this is the vocabulary used for forums.
+    // property to true so we know this is the vocabulary used by Forum.
     if ($this->variableGet('forum_nav_vocabulary', 0) == $row->getSourceProperty('vid')) {
       $row->setSourceProperty('forum_vocabulary', TRUE);
     }
diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/d7/Vocabulary.php b/core/modules/taxonomy/src/Plugin/migrate/source/d7/Vocabulary.php
index 894e22edb6..185990185d 100644
--- a/core/modules/taxonomy/src/Plugin/migrate/source/d7/Vocabulary.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/source/d7/Vocabulary.php
@@ -51,9 +51,9 @@ public function fields() {
    * {@inheritdoc}
    */
   public function prepareRow(Row $row) {
-    // If the vid of the vocabulary being migrated is equal to the vid in the
+    // If the vocabulary being migrated is the one defined in the
     // 'forum_nav_vocabulary' variable, set the 'forum_vocabulary' source
-    // property to true so we can know this is the vocabulary used for forums.
+    // property to true so we know this is the vocabulary used by Forum.
     if ($this->variableGet('forum_nav_vocabulary', 0) == $row->getSourceProperty('vid')) {
       $row->setSourceProperty('forum_vocabulary', TRUE);
     }