diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 7a22be3..4d98701 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -11,6 +11,7 @@
 use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Entity\EntityViewModeInterface;
+use Drupal\Core\Url;
 use Drupal\field_ui\FieldUI;
 use Drupal\field_ui\Plugin\Derivative\FieldUiLocalTask;
 
@@ -98,9 +99,7 @@ function field_ui_entity_type_build(array &$entity_types) {
       // This allows us to not require route information inside this hook, which
       // otherwise could result in circular dependencies.
       $entity_type
-        ->setLinkTemplate('field_ui-fields', "/admin/{$entity_type->id()}/fields")
-        ->setLinkTemplate('field_ui-form-display', "/admin/{$entity_type->id()}/fields-form-display")
-        ->setLinkTemplate('field_ui-display', "/admin/{$entity_type->id()}/fields-display");
+        ->setLinkTemplate('field_ui-fields', "/admin/{$entity_type->id()}/fields");
     }
   }
 }
@@ -165,14 +164,18 @@ function field_ui_entity_operation(EntityInterface $entity) {
       $operations['manage-form-display'] = array(
         'title' => t('Manage form display'),
         'weight' => 20,
-        'url' => $entity->urlInfo('field_ui-form-display'),
+        'url' => Url::fromRoute("entity.entity_form_display.{$entity->getEntityTypeId()}.default", array(
+          $entity->getEntityTypeId() => $entity->id(),
+        )),
       );
     }
     if ($account->hasPermission('administer '. $bundle_of . ' display')) {
       $operations['manage-display'] = array(
         'title' => t('Manage display'),
         'weight' => 25,
-        'url' => $entity->urlInfo('field_ui-display'),
+        'url' => Url::fromRoute("entity.entity_view_display.{$entity->getEntityTypeId()}.default", array(
+          $entity->getEntityTypeId() => $entity->id(),
+        )),
       );
     }
   }