diff --git a/core/modules/taxonomy/src/Entity/Term.php b/core/modules/taxonomy/src/Entity/Term.php
index 42ae1ba..505a489 100644
--- a/core/modules/taxonomy/src/Entity/Term.php
+++ b/core/modules/taxonomy/src/Entity/Term.php
@@ -43,7 +43,7 @@
  *     "uuid" = "uuid"
  *   },
  *   bundle_entity_type = "taxonomy_vocabulary",
- *   field_ui_base_route = "entity.taxonomy_term.admin_form",
+ *   field_ui_base_route = "entity.taxonomy_vocabulary.overview_form",
  *   links = {
  *     "canonical" = "entity.taxonomy_term.canonical",
  *     "delete-form" = "entity.taxonomy_term.delete_form",
diff --git a/core/modules/taxonomy/src/Entity/Vocabulary.php b/core/modules/taxonomy/src/Entity/Vocabulary.php
index 1265fd1..a1d2329 100644
--- a/core/modules/taxonomy/src/Entity/Vocabulary.php
+++ b/core/modules/taxonomy/src/Entity/Vocabulary.php
@@ -38,7 +38,7 @@
  *     "add-form" = "entity.taxonomy_term.add_form",
  *     "delete-form" = "entity.taxonomy_vocabulary.delete_form",
  *     "reset-form" = "entity.taxonomy_vocabulary.reset_form",
- *     "overview-form" = "entity.taxonomy_term.admin_form",
+ *     "overview-form" = "entity.taxonomy_vocabulary.overview_form",
  *     "edit-form" = "entity.taxonomy_vocabulary.edit_form"
  *   }
  * )
diff --git a/core/modules/taxonomy/taxonomy.links.action.yml b/core/modules/taxonomy/taxonomy.links.action.yml
index 6e45293..102e9b7 100644
--- a/core/modules/taxonomy/taxonomy.links.action.yml
+++ b/core/modules/taxonomy/taxonomy.links.action.yml
@@ -8,4 +8,4 @@ entity.taxonomy_term.add_form:
   route_name: entity.taxonomy_term.add_form
   title: 'Add term'
   appears_on:
-    - entity.taxonomy_term.admin_form
+    - entity.taxonomy_vocabulary.overview_form
diff --git a/core/modules/taxonomy/taxonomy.links.task.yml b/core/modules/taxonomy/taxonomy.links.task.yml
index a0bc9f7..fef9e90 100644
--- a/core/modules/taxonomy/taxonomy.links.task.yml
+++ b/core/modules/taxonomy/taxonomy.links.task.yml
@@ -8,12 +8,12 @@ entity.taxonomy_term.edit_form:
   route_name: entity.taxonomy_term.edit_form
   base_route: entity.taxonomy_term.canonical
 
-entity.taxonomy_term.admin_form:
+entity.taxonomy_vocabulary.overview_form:
   title: 'List'
-  route_name: entity.taxonomy_term.admin_form
-  base_route: entity.taxonomy_term.admin_form
+  route_name: entity.taxonomy_vocabulary.overview_form
+  base_route: entity.taxonomy_vocabulary.overview_form
 
 entity.taxonomy_vocabulary.edit_form:
   title: 'Edit'
   route_name: entity.taxonomy_vocabulary.edit_form
-  base_route: entity.taxonomy_term.admin_form
+  base_route: entity.taxonomy_vocabulary.overview_form
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 1606edb..f1d1b49 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -79,7 +79,7 @@ function taxonomy_help($route_name, RouteMatchInterface $route_match) {
       $output = '<p>' . t('Taxonomy is for categorizing content. Terms are grouped into vocabularies. For example, a vocabulary called "Fruit" would contain the terms "Apple" and "Banana".') . '</p>';
       return $output;
 
-    case 'entity.taxonomy_term.admin_form':
+    case 'entity.taxonomy_vocabulary.overview_form':
       $vocabulary = $route_match->getParameter('taxonomy_vocabulary');
       switch ($vocabulary->hierarchy) {
         case TAXONOMY_HIERARCHY_DISABLED:
diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml
index 962bf52..5b065c2 100644
--- a/core/modules/taxonomy/taxonomy.routing.yml
+++ b/core/modules/taxonomy/taxonomy.routing.yml
@@ -80,7 +80,7 @@ taxonomy.autocomplete_vid:
   requirements:
     _permission: 'access content'
 
-entity.taxonomy_term.admin_form:
+entity.taxonomy_vocabulary.overview_form:
   path: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/overview'
   defaults:
     _form: 'Drupal\taxonomy\Form\OverviewTerms'