diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php
index 0b2ca59a0a..4fe37866f1 100644
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -518,9 +518,9 @@ public function getCacheMaxAge() {
    * {@inheritdoc}
    */
   public static function load($id) {
-    $entity_repository = \Drupal::service('entity_type.repository');
+    $entity_type_repository = \Drupal::service('entity_type.repository');
     $entity_type_manager = \Drupal::entityTypeManager();
-    $storage = $entity_type_manager->getStorage($entity_repository->getEntityTypeFromClass(get_called_class()));
+    $storage = $entity_type_manager->getStorage($entity_type_repository->getEntityTypeFromClass(get_called_class()));
     return $storage->load($id);
   }
 
@@ -528,9 +528,9 @@ public static function load($id) {
    * {@inheritdoc}
    */
   public static function loadMultiple(array $ids = NULL) {
-    $entity_repository = \Drupal::service('entity_type.repository');
+    $entity_type_repository = \Drupal::service('entity_type.repository');
     $entity_type_manager = \Drupal::entityTypeManager();
-    $storage = $entity_type_manager->getStorage($entity_repository->getEntityTypeFromClass(get_called_class()));
+    $storage = $entity_type_manager->getStorage($entity_type_repository->getEntityTypeFromClass(get_called_class()));
     return $storage->loadMultiple($ids);
   }
 
@@ -538,9 +538,9 @@ public static function loadMultiple(array $ids = NULL) {
    * {@inheritdoc}
    */
   public static function create(array $values = []) {
-    $entity_repository = \Drupal::service('entity_type.repository');
+    $entity_type_repository = \Drupal::service('entity_type.repository');
     $entity_type_manager = \Drupal::entityTypeManager();
-    $storage = $entity_type_manager->getStorage($entity_repository->getEntityTypeFromClass(get_called_class()));
+    $storage = $entity_type_manager->getStorage($entity_type_repository->getEntityTypeFromClass(get_called_class()));
     return $storage->create($values);
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
index bb04b58d41..1acb20c4e6 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
@@ -115,7 +115,8 @@ protected function setUp() {
     $this->cacheTagsInvalidator = $this->getMock('Drupal\Core\Cache\CacheTagsInvalidator');
 
     $container = new ContainerBuilder();
-    $container->set('entity.manager', 'do not use this deprecated service');
+    // Ensure that Entity doesn't use the deprecated entity.manager service.
+    $container->set('entity.manager', NULL);
     $container->set('entity_type.manager', $this->entityTypeManager);
     $container->set('uuid', $this->uuid);
     $container->set('language_manager', $this->languageManager);