diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTest.php
index ac4a364..1dca5f7 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTest.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\entity_test\Plugin\Core\Entity\EntityTestCache.
+ * Definition of Drupal\entity_test\Plugin\Core\Entity\EntityTest.
  */
 
 namespace Drupal\entity_test\Plugin\Core\Entity;
@@ -10,13 +10,14 @@
 use Drupal\Core\Entity\EntityNG;
 use Drupal\Core\Entity\Annotation\EntityType;
 use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Language\Language;
 
 /**
  * Defines the test entity class.
  *
  * @EntityType(
- *   id = "entity_test_cache",
- *   label = @Translation("Test entity with field cache"),
+ *   id = "entity_test",
+ *   label = @Translation("Test entity"),
  *   module = "entity_test",
  *   controllers = {
  *     "storage" = "Drupal\entity_test\EntityTestStorageController",
@@ -28,7 +29,6 @@
  *   },
  *   base_table = "entity_test",
  *   fieldable = TRUE,
- *   field_cache = TRUE,
  *   field_cache = FALSE,
  *   entity_keys = {
  *     "id" = "id",
@@ -38,7 +38,7 @@
  *   menu_base_path = "entity-test/manage/%entity_test"
  * )
  */
-class EntityTestCache extends EntityNG {
+class EntityTest extends EntityNG {
 
   /**
    * The entity ID.
@@ -91,7 +91,7 @@ protected function init() {
   /**
    * Overrides Drupal\entity\Entity::label().
    */
-  public function label($langcode = LANGUAGE_DEFAULT) {
+  public function label($langcode = Language::LANGCODE_DEFAULT) {
     $info = $this->entityInfo();
     if (isset($info['entity_keys']['label']) && $info['entity_keys']['label'] == 'name') {
       return $this->getTranslation($langcode)->name->value;