diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 490470d..04365ab 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -8,7 +8,6 @@
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Entity\Entity;
-use Drupal\Core\TypedData\ContextAwareInterface;
 
 /**
  * Defines a base configuration entity class.
@@ -126,54 +125,4 @@ public function getExportProperties() {
     }
     return $properties;
   }
-
-  /**
-   * Implements Drupal\Core\Entity\EntityInterface::getBCEntity().
-   */
-  public function getBCEntity() {
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Entity\EntityInterface::getOriginalEntity().
-   */
-  public function getOriginalEntity() {
-    return $this;
-  }
-
-  /**
-   * Implements \Drupal\Core\TypedData\ContextAwareInterface::getName().
-   */
-  public function getName() {
-    return NULL;
-  }
-
-  /**
-   * Implements \Drupal\Core\TypedData\ContextAwareInterface::getRoot().
-   */
-  public function getRoot() {
-    return $this;
-  }
-
-  /**
-   * Implements \Drupal\Core\TypedData\ContextAwareInterface::getPropertyPath().
-   */
-  public function getPropertyPath() {
-    return '';
-  }
-
-  /**
-   * Implements \Drupal\Core\TypedData\ContextAwareInterface::getParent().
-   */
-  public function getParent() {
-    return NULL;
-  }
-
-  /**
-   * Implements \Drupal\Core\TypedData\ContextAwareInterface::setContext().
-   */
-  public function setContext($name = NULL, ContextAwareInterface $parent = NULL) {
-    // As entities are always the root of the tree, we do not need to set any
-    // context.
-  }
 }
diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php
index adbb047..98602cc 100644
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -388,9 +388,9 @@ public function getBCEntity() {
   }
 
   /**
-   * Implements Drupal\Core\Entity\EntityInterface::getOriginalEntity().
+   * Implements Drupal\Core\Entity\EntityInterface::getNGEntity().
    */
-  public function getOriginalEntity() {
+  public function getNGEntity() {
     return $this;
   }
 
diff --git a/core/lib/Drupal/Core/Entity/EntityBCDecorator.php b/core/lib/Drupal/Core/Entity/EntityBCDecorator.php
index 9f77649..73167b9 100644
--- a/core/lib/Drupal/Core/Entity/EntityBCDecorator.php
+++ b/core/lib/Drupal/Core/Entity/EntityBCDecorator.php
@@ -44,9 +44,9 @@ function __construct(EntityNG $decorated) {
   }
 
   /**
-   * Overrides Entity::getOriginalEntity().
+   * Overrides Entity::getNGEntity().
    */
-  public function getOriginalEntity() {
+  public function getNGEntity() {
     return $this->decorated;
   }
 
diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php
index 94ecc3b..4c686ad 100644
--- a/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -197,7 +197,7 @@ public function getExportProperties();
    * @return \Drupal\Core\Entity\EntityInterface
    *   The backward compatible entity.
    *
-   * @see \Drupal\Core\Entity\EntityInterface::getOriginalEntity()
+   * @see \Drupal\Core\Entity\EntityInterface::getNGEntity()
    */
   public function getBCEntity();
 
@@ -209,5 +209,5 @@ public function getBCEntity();
    *
    * @see \Drupal\Core\Entity\EntityInterface::getBCEntity()
    */
-  public function getOriginalEntity();
+  public function getNGEntity();
 }
diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc
index 26f6e07..16a63ed 100644
--- a/core/modules/field/field.attach.inc
+++ b/core/modules/field/field.attach.inc
@@ -1457,7 +1457,7 @@ function field_attach_view($entity_type, EntityInterface $entity, EntityDisplay
   $null = NULL;
   $output = field_invoke_method('view', $target_function, $entity, $null, $null, $options);
   // Remove the BC layer now.
-  $entity = $entity->getOriginalEntity();
+  $entity = $entity->getNGEntity();
 
   // Let other modules alter the renderable array.
   $view_mode = $display->originalViewMode;
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
index db6c900..cf43b32 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
@@ -1089,9 +1089,9 @@ public function getBCEntity() {
   }
 
   /**
-   * Implements Drupal\Core\Entity\EntityInterface::getOriginalEntity().
+   * Implements Drupal\Core\Entity\EntityInterface::getNGEntity().
    */
-  public function getOriginalEntity() {
+  public function getNGEntity() {
     return $this->__call(__FUNCTION__, func_get_args());
   }