diff --git a/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php b/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php
index 2205c4a..e46c425 100644
--- a/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php
+++ b/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php
@@ -31,17 +31,17 @@ public function enhance(array $defaults, Request $request) {
         }
       }
       elseif (!empty($defaults['_entity_list'])) {
-        $enhance_route_defaults['_controller'] = '\Drupal\Core\Entity\Controller\EntityListController::listing';
-        $enhance_route_defaults['entity_type'] = $defaults['_entity_list'];
-        unset($enhance_route_defaults['_entity_list']);
+        $enhanced_route_defaults['_controller'] = '\Drupal\Core\Entity\Controller\EntityListController::listing';
+        $enhanced_route_defaults['entity_type'] = $defaults['_entity_list'];
+        unset($enhanced_route_defaults['_entity_list']);
       }
       elseif (!empty($defaults['_entity_view'])) {
-        $enhance_route_defaults['_controller'] = '\Drupal\Core\Entity\Controller\EntityViewController::view';
+        $enhanced_route_defaults['_controller'] = '\Drupal\Core\Entity\Controller\EntityViewController::view';
         $enhanced_route_defaults['_title_callback'] = '\Drupal\Core\Entity\Controller\EntityViewController::title';
         if (strpos($defaults['_entity_view'], '.') !== FALSE) {
           // The _entity_view entry is of the form entity_type.view_mode.
           list($entity_type, $view_mode) = explode('.', $defaults['_entity_view']);
-          $enhance_route_defaults['view_mode'] = $view_mode;
+          $enhanced_route_defaults['view_mode'] = $view_mode;
         }
         else {
           // Only the entity type is nominated, the view mode will use the
@@ -50,7 +50,7 @@ public function enhance(array $defaults, Request $request) {
         }
         // Set by reference so that we get the upcast value.
         if (!empty($defaults[$entity_type])) {
-          $enhance_route_defaults['_entity'] = &$defaults[$entity_type];
+          $enhanced_route_defaults['_entity'] = &$defaults[$entity_type];
         }
         else {
           // The entity is not keyed by its entity_type. Attempt to find it
@@ -68,7 +68,7 @@ public function enhance(array $defaults, Request $request) {
                     // We have the matching entity type. Set the '_entity' key
                     // to point to this named placeholder. The entity in this
                     // position is the one being rendered.
-                    $enhance_route_defaults['_entity'] = &$defaults[$name];
+                    $enhanced_route_defaults['_entity'] = &$defaults[$name];
                   }
                 }
               }