diff --git a/core/lib/Drupal/Core/Entity/EntityFormController.php b/core/lib/Drupal/Core/Entity/EntityFormController.php
index da2e525..ce761b4 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormController.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormController.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\Core\Entity;
 
+use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
 use Drupal\Core\Form\FormBase;
-use Drupal\entity\EntityFormDisplayConfigEntityInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Language\Language;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -468,7 +468,7 @@ public function getFormDisplay(array $form_state) {
   /**
    * {@inheritdoc}
    */
-  public function setFormDisplay(EntityFormDisplayConfigEntityInterface $form_display, array &$form_state) {
+  public function setFormDisplay(EntityFormDisplayInterface $form_display, array &$form_state) {
     $form_state['form_display'] = $form_display;
     return $this;
   }
diff --git a/core/lib/Drupal/Core/Entity/EntityFormControllerInterface.php b/core/lib/Drupal/Core/Entity/EntityFormControllerInterface.php
index 8d996f9..9a635ae 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormControllerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormControllerInterface.php
@@ -7,10 +7,10 @@
 
 namespace Drupal\Core\Entity;
 
+use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\BaseFormIdInterface;
 use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\entity\EntityFormDisplayConfigEntityInterface;
 
 /**
  * Defines a common interface for entity form controller classes.
@@ -64,7 +64,7 @@ public function getOperation();
    * @param array $form_state
    *   An associative array containing the current state of the form.
    *
-   * @return \Drupal\entity\EntityFormDisplayConfigEntityInterface
+   * @return \Drupal\Core\Entity\Display\EntityFormDisplayInterface.
    *   The current form display.
    */
   public function getFormDisplay(array $form_state);
@@ -75,12 +75,12 @@ public function getFormDisplay(array $form_state);
    * Sets the form display which will be used for populating form element
    * defaults.
    *
-   * @param \Drupal\entity\EntityFormDisplayConfigEntityInterface $form_display
+   * @param \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display
    *   The form display that the current form operates with.
    * @param array $form_state
    *   An associative array containing the current state of the form.
    */
-  public function setFormDisplay(EntityFormDisplayConfigEntityInterface $form_display, array &$form_state);
+  public function setFormDisplay(EntityFormDisplayInterface $form_display, array &$form_state);
 
   /**
    * Returns the form entity.
diff --git a/core/lib/Drupal/Core/Entity/EntityRenderController.php b/core/lib/Drupal/Core/Entity/EntityRenderController.php
index fe6bd10..be33824 100644
--- a/core/lib/Drupal/Core/Entity/EntityRenderController.php
+++ b/core/lib/Drupal/Core/Entity/EntityRenderController.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Entity;
 
-use Drupal\entity\Entity\EntityDisplay;
+use Drupal\Core\Entity\Display\EntityDisplayInterface;
 use Drupal\Core\Language\Language;
 
 /**
@@ -136,7 +136,7 @@ protected function getBuildDefaults(EntityInterface $entity, $view_mode, $langco
    *   The render array that is being created.
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity to be prepared.
-   * @param \Drupal\entity\Entity\EntityDisplay $display
+   * @param \Drupal\Core\Entity\Display\EntityDisplayInterface $display
    *   The entity_display object holding the display options configured for
    *   the entity components.
    * @param string $view_mode
@@ -145,7 +145,7 @@ protected function getBuildDefaults(EntityInterface $entity, $view_mode, $langco
    *   (optional) For which language the entity should be prepared, defaults to
    *   the current content language.
    */
-  protected function alterBuild(array &$build, EntityInterface $entity, EntityDisplay $display, $view_mode, $langcode = NULL) { }
+  protected function alterBuild(array &$build, EntityInterface $entity, EntityDisplayInterface $display, $view_mode, $langcode = NULL) { }
 
   /**
    * Implements \Drupal\Core\Entity\EntityRenderControllerInterface::view().