diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityListController.php b/core/lib/Drupal/Core/Entity/Controller/EntityListController.php
index 0240923..3e22cc3 100644
--- a/core/lib/Drupal/Core/Entity/Controller/EntityListController.php
+++ b/core/lib/Drupal/Core/Entity/Controller/EntityListController.php
@@ -45,14 +45,14 @@ public static function create(ContainerInterface $container) {
   /**
    * Provides the listing page for any entity type.
    *
-   * @param string $entity_type
+   * @param string $_entity_list
    *   The entity type to render.
    *
    * @return array
    *   A render array as expected by drupal_render().
    */
-  public function listing($entity_type) {
-    return $this->entityManager->getListController($entity_type)->render();
+  public function listing($_entity_list) {
+    return $this->entityManager->getListController($_entity_list)->render();
   }
 
 }
diff --git a/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php b/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php
index 2337658..d44d79a 100644
--- a/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php
+++ b/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php
@@ -42,7 +42,8 @@ public function enhance(array $defaults, Request $request) {
         $defaults['_controller'] = '\Drupal\Core\Entity\HtmlEntityFormController::content';
       }
       elseif (!empty($defaults['_entity_list'])) {
-        $defaults['_controller'] = '\Drupal\Core\Entity\HtmlEntityListController::content';
+        $defaults['_controller'] = 'controller.page:content';
+        $defaults['_content'] = '\Drupal\Core\Entity\Controller\EntityListController::listing';
       }
     }
     return $defaults;