diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php
index 0cc6f05..2d0f1bc 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php
@@ -7,13 +7,13 @@
 
 namespace Drupal\custom_block\Form;
 
-use Drupal\Core\Entity\EntityNGConfirmFormBase;
+use Drupal\Core\Entity\ContentEntityConfirmFormBase;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Provides a confirmation form for deleting a custom block entity.
  */
-class CustomBlockDeleteForm extends EntityNGConfirmFormBase {
+class CustomBlockDeleteForm extends ContentEntityConfirmFormBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php b/core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php
index fd86ddf..fc4a2e6 100644
--- a/core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php
+++ b/core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php
@@ -8,13 +8,13 @@
 namespace Drupal\comment\Form;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Entity\EntityNGConfirmFormBase;
+use Drupal\Core\Entity\ContentEntityConfirmFormBase;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Provides the comment delete confirmation form.
  */
-class DeleteForm extends EntityNGConfirmFormBase {
+class DeleteForm extends ContentEntityConfirmFormBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
index 9f0de30..a888331 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
@@ -316,20 +316,6 @@ public function isTranslatable() {
   }
 
   /**
-   * Implements \Drupal\Core\TypedData\TranslatableInterface::language().
-   */
-  public function language() {
-    // @todo: Replace by EntityNG implementation once all entity types have been
-    // converted to use the entity field API.
-    $language = language_load($this->langcode);
-    if (!$language) {
-      // Make sure we return a proper language object.
-      $language = new Language(array('id' => Language::LANGCODE_NOT_SPECIFIED));
-    }
-    return $language;
-  }
-
-  /**
    * {@inheritdoc}
    */
   public function preSaveRevision(EntityStorageControllerInterface $storage_controller, \stdClass $record) {
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
index 2c452d4..05aac4a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
@@ -520,9 +520,9 @@ public function testUserHooks() {
   }
 
   /**
-   * Tests rollback from failed insert in EntityNG.
+   * Tests rollback from failed entity save.
    */
-  function testEntityNGRollback() {
+  function testEntityRollback() {
     // Create a block.
     try {
       $entity = entity_create('entity_test', array('name' => 'fail_insert'))->save();