diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php
index 35453ed..24ed0bc 100644
--- a/core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php
@@ -7,10 +7,11 @@
 
 namespace Drupal\entity\Entity;
 
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\Annotation\EntityType;
 use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Entity\Display\EntityDisplayInterface;
 use Drupal\entity\EntityDisplayBase;
-use Drupal\entity\EntityDisplayConfigEntityInterface;
 
 /**
  * Configuration entity that contains display options for all components of a
@@ -31,7 +32,7 @@
  *   }
  * )
  */
-class EntityDisplay extends EntityDisplayBase implements EntityDisplayConfigEntityInterface {
+class EntityDisplay extends EntityDisplayBase implements EntityDisplayInterface, ConfigEntityInterface {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php
index e71b5a7..34c62cc 100644
--- a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php
@@ -7,10 +7,11 @@
 
 namespace Drupal\entity\Entity;
 
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\Annotation\EntityType;
 use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
 use Drupal\entity\EntityDisplayBase;
-use Drupal\entity\EntityFormDisplayConfigEntityInterface;
 
 /**
  * Configuration entity that contains widget options for all components of a
@@ -31,7 +32,7 @@
  *   }
  * )
  */
-class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayConfigEntityInterface, \Serializable {
+class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayInterface, ConfigEntityInterface, \Serializable {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayConfigEntityInterface.php b/core/modules/entity/lib/Drupal/entity/EntityDisplayConfigEntityInterface.php
deleted file mode 100644
index d6b6b73..0000000
--- a/core/modules/entity/lib/Drupal/entity/EntityDisplayConfigEntityInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\entity\EntityDisplayConfigEntityInterface.
- */
-
-namespace Drupal\entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-use Drupal\Core\Entity\Display\EntityDisplayInterface;
-
-/**
- * Provides an interface for the entity display config entity.
- */
-interface EntityDisplayConfigEntityInterface extends EntityDisplayInterface, ConfigEntityInterface {
-
-}
-
diff --git a/core/modules/entity/lib/Drupal/entity/EntityFormDisplayConfigEntityInterface.php b/core/modules/entity/lib/Drupal/entity/EntityFormDisplayConfigEntityInterface.php
deleted file mode 100644
index 2fa847f..0000000
--- a/core/modules/entity/lib/Drupal/entity/EntityFormDisplayConfigEntityInterface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\entity\EntityFormDisplayConfigEntityInterface.
- */
-
-namespace Drupal\entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
-
-/**
- * Provides an interface defining an entity display entity.
- */
-interface EntityFormDisplayConfigEntityInterface extends EntityFormDisplayInterface, ConfigEntityInterface {
-
-}