diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index bd86e95..b073d7c 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -323,9 +323,9 @@ public function getController($entity_type, $controller_type, $controller_class_
    * {@inheritdoc}
    */
   public function getAdminRouteInfo($entity_type_id, $bundle) {
-    if (($entity_type = $this->getDefinition($entity_type_id, FALSE)) && $admin_form = $entity_type->get('field_ui_base_route')) {
+    if (($entity_type = $this->getDefinition($entity_type_id, FALSE)) && $route_name = $entity_type->get('field_ui_base_route')) {
       return array(
-        'route_name' => $admin_form,
+        'route_name' => $route_name,
         'route_parameters' => array(
           $entity_type->getBundleEntityType() => $bundle,
         ),
diff --git a/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php b/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
index 0108a3f..e473663 100644
--- a/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
+++ b/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
@@ -173,19 +173,18 @@ public function getDerivativeDefinitions($base_plugin_definition) {
   public function alterLocalTasks(&$local_tasks) {
     foreach ($this->entityManager->getDefinitions() as $entity_type => $entity_info) {
       if ($entity_info->isFieldable() && $route_name = $entity_info->get('field_ui_base_route')) {
-        $admin_form = $route_name;
-        $local_tasks["field_ui.fields:overview_$entity_type"]['base_route'] = $admin_form;
-        $local_tasks["field_ui.fields:form_display_overview_$entity_type"]['base_route'] = $admin_form;
-        $local_tasks["field_ui.fields:display_overview_$entity_type"]['base_route'] = $admin_form;
-        $local_tasks["field_ui.fields:field_form_display_default_$entity_type"]['base_route'] = $admin_form;
-        $local_tasks["field_ui.fields:field_display_default_$entity_type"]['base_route'] = $admin_form;
+        $local_tasks["field_ui.fields:overview_$entity_type"]['base_route'] = $route_name;
+        $local_tasks["field_ui.fields:form_display_overview_$entity_type"]['base_route'] = $route_name;
+        $local_tasks["field_ui.fields:display_overview_$entity_type"]['base_route'] = $route_name;
+        $local_tasks["field_ui.fields:field_form_display_default_$entity_type"]['base_route'] = $route_name;
+        $local_tasks["field_ui.fields:field_display_default_$entity_type"]['base_route'] = $route_name;
 
         foreach ($this->entityManager->getFormModes($entity_type) as $form_mode => $form_mode_info) {
-          $local_tasks['field_ui.fields:field_form_display_' . $form_mode . '_' . $entity_type]['base_route'] = $admin_form;
+          $local_tasks['field_ui.fields:field_form_display_' . $form_mode . '_' . $entity_type]['base_route'] = $route_name;
         }
 
         foreach ($this->entityManager->getViewModes($entity_type) as $view_mode => $form_mode_info) {
-          $local_tasks['field_ui.fields:field_display_' . $view_mode . '_' . $entity_type]['base_route'] = $admin_form;
+          $local_tasks['field_ui.fields:field_display_' . $view_mode . '_' . $entity_type]['base_route'] = $route_name;
         }
       }
     }