diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
index 4b6dae12a55d..aa5d1a6e174f 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -45383,7 +45383,7 @@ $connection->insert('taxonomy_vocabulary')
 ))
 ->values(array(
   'vid' => '4',
-  'name' => 'vocabulary name much longer than thirty two characters',
+  'name' => 'vocabulary name clearly different than machine name and much longer than thirty two characters',
   'machine_name' => 'vocabulary_name_much_longer_than_thirty_two_characters',
   'description' => 'description of vocabulary name much longer than thirty two characters',
   'hierarchy' => '1',
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
index 3c41e980c80a..751f018371cc 100644
--- a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
@@ -6,11 +6,9 @@ source:
   plugin: d7_taxonomy_vocabulary
 process:
   vid:
-    -
-      plugin: machine_name
-      source: name
     -
       plugin: make_unique_entity_field
+      source: machine_name
       entity_type: taxonomy_vocabulary
       field: vid
       length: 32
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
index 78a00a528557..5663ea6cda61 100644
--- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
@@ -57,7 +57,7 @@ class MigrateTaxonomyVocabularyTest extends MigrateDrupal7TestBase {
     $this->assertEntity('tags', 'Tags', 'Use tags to group articles on similar topics into categories.', VocabularyInterface::HIERARCHY_DISABLED, 0);
     $this->assertEntity('forums', 'Sujet de discussion', 'Forum navigation vocabulary', VocabularyInterface::HIERARCHY_SINGLE, -10);
     $this->assertEntity('test_vocabulary', 'Test Vocabulary', 'This is the vocabulary description', VocabularyInterface::HIERARCHY_SINGLE, 0);
-    $this->assertEntity('vocabulary_name_much_longer_than', 'vocabulary name much longer than thirty two characters', 'description of vocabulary name much longer than thirty two characters', VocabularyInterface::HIERARCHY_SINGLE, 0);
+    $this->assertEntity('vocabulary_name_much_longer_than', 'vocabulary name clearly different than machine name and much longer than thirty two characters', 'description of vocabulary name much longer than thirty two characters', VocabularyInterface::HIERARCHY_SINGLE, 0);
   }
 
 }