diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 9eb6731..4e29b77 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -545,7 +545,7 @@ function entity_get_form(EntityInterface $entity, $operation = 'default', array
  * @return \Drupal\Core\Entity\EntityListInterface
  *   An entity list.
  *
- * @deprecated Use \Drupal\Core\Entity\EntityManagerInterface::getFormController().
+ * @deprecated Use \Drupal\Core\Entity\EntityManagerInterface::getList().
  */
 function entity_list_controller($entity_type) {
   return \Drupal::entityManager()
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 27a98d2..b83c323 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -35,7 +35,7 @@
  * block.admin_display:
  *   path: '/admin/structure/block'
  *   defaults:
- *     _content: '\Drupal\block\Controller\BlockList::listing'
+ *     _content: '\Drupal\block\Controller\BlockListController::listing'
  *   requirements:
  *     _permission: 'administer blocks'
  * @endcode
diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityListController.php b/core/lib/Drupal/Core/Entity/Controller/EntityListController.php
index bcfa972..e30d8c4 100644
--- a/core/lib/Drupal/Core/Entity/Controller/EntityListController.php
+++ b/core/lib/Drupal/Core/Entity/Controller/EntityListController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Controller\EntityList.
+ * Contains \Drupal\Core\Entity\Controller\EntityListController.
  */
 
 namespace Drupal\Core\Entity\Controller;
diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
index 5a9a28a..0cfc032 100644
--- a/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
+++ b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
@@ -25,7 +25,7 @@ class EntityViewController implements ContainerInjectionInterface {
   protected $entityManager;
 
   /**
-   * Creates an EntityList object.
+   * Creates an EntityViewController object.
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
diff --git a/core/lib/Drupal/Core/Entity/EntityListInterface.php b/core/lib/Drupal/Core/Entity/EntityListInterface.php
index af325bb..7302876 100644
--- a/core/lib/Drupal/Core/Entity/EntityListInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityListInterface.php
@@ -16,7 +16,7 @@
    * Gets the entity storage controller.
    *
    * @return \Drupal\Core\Entity\EntityStorageControllerInterface
-   *   The storage controller used by this list.
+   *   The storage controller used by the entity type of this list.
    */
   public function getStorageController();
 
diff --git a/core/modules/action/action.module b/core/modules/action/action.module
index 1127bf4..1a44ea0 100644
--- a/core/modules/action/action.module
+++ b/core/modules/action/action.module
@@ -66,4 +66,3 @@ function action_entity_info(&$entity_info) {
   $entity_info['action']['controllers']['list'] = 'Drupal\action\ActionList';
   $entity_info['action']['links']['edit-form'] = 'action.admin_configure';
 }
-
diff --git a/core/modules/block/lib/Drupal/block/Controller/BlockListController.php b/core/modules/block/lib/Drupal/block/Controller/BlockListController.php
index a040fa3..b87bec8 100644
--- a/core/modules/block/lib/Drupal/block/Controller/BlockListController.php
+++ b/core/modules/block/lib/Drupal/block/Controller/BlockListController.php
@@ -2,13 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\block\Controller\BlockList.
+ * Contains \Drupal\block\Controller\BlockListController.
  */
 
 namespace Drupal\block\Controller;
 
 use Drupal\Core\Entity\Controller\EntityListController;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/core/modules/config_translation/config_translation.module b/core/modules/config_translation/config_translation.module
index 0fc1170..6c83c97 100644
--- a/core/modules/config_translation/config_translation.module
+++ b/core/modules/config_translation/config_translation.module
@@ -97,7 +97,7 @@ function config_translation_config_translation_info(&$info) {
           'title' => '!label field',
           'class' => '\Drupal\config_translation\ConfigFieldInstanceMapper',
           'base_entity_type' => $entity_type,
-          'list_controller' => '\Drupal\config_translation\Controller\ConfigTranslationFieldInstanceListController',
+          'list_controller' => '\Drupal\config_translation\Controller\ConfigTranslationFieldInstanceList',
           'weight' => 10,
         );
       }
@@ -131,7 +131,7 @@ function config_translation_config_translation_info(&$info) {
 
     if ($entity_type == 'block') {
       // Blocks placements need a specific list controller.
-      $info['block']['list_controller'] = '\Drupal\config_translation\Controller\ConfigTranslationBlockListController';
+      $info['block']['list_controller'] = '\Drupal\config_translation\Controller\ConfigTranslationBlockList';
     }
   }
 }
diff --git a/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationBlockListController.php b/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationBlockList.php
similarity index 95%
rename from core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationBlockListController.php
rename to core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationBlockList.php
index 18639f7..7d8adcc 100644
--- a/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationBlockListController.php
+++ b/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationBlockList.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\config_translation\Controller\ConfigTranslationBlockListController.
+ * Contains \Drupal\config_translation\Controller\ConfigTranslationBlockList.
  */
 
 namespace Drupal\config_translation\Controller;
@@ -15,7 +15,7 @@
 /**
  * Defines the config translation controller for blocks.
  */
-class ConfigTranslationBlockListController extends ConfigTranslationEntityList {
+class ConfigTranslationBlockList extends ConfigTranslationEntityList {
 
   /**
    * An array of theme info keyed by theme name.
diff --git a/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceListController.php b/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceList.php
similarity index 96%
rename from core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceListController.php
rename to core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceList.php
index 69354cb..20ee210 100644
--- a/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceListController.php
+++ b/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceList.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\config_translation\Controller\ConfigTranslationFieldInstanceListController.
+ * Contains \Drupal\config_translation\Controller\ConfigTranslationFieldInstanceList.
  */
 
 namespace Drupal\config_translation\Controller;
@@ -19,7 +19,7 @@
 /**
  * Defines the config translation controller for field instance entities.
  */
-class ConfigTranslationFieldInstanceListController extends ConfigTranslationEntityList {
+class ConfigTranslationFieldInstanceList extends ConfigTranslationEntityList {
 
   /**
    * The name of the entity type the field instances are attached to.
@@ -76,7 +76,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
   }
 
   /**
-   * Constructs a new ConfigTranslationFieldInstanceListController object.
+   * Constructs a new ConfigTranslationFieldInstanceList object.
    *
    * @param string $entity_type
    *   The type of entity to be listed.
diff --git a/core/modules/contact/lib/Drupal/contact/CategoryList.php b/core/modules/contact/lib/Drupal/contact/CategoryList.php
index 9def7b3..9decd02 100644
--- a/core/modules/contact/lib/Drupal/contact/CategoryList.php
+++ b/core/modules/contact/lib/Drupal/contact/CategoryList.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\contact\CategoryList.
  */
 
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeList.php b/core/modules/entity/lib/Drupal/entity/EntityDisplayModeList.php
index bfe5893..71f438b 100644
--- a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeList.php
+++ b/core/modules/entity/lib/Drupal/entity/EntityDisplayModeList.php
@@ -26,7 +26,7 @@ class EntityDisplayModeList extends ConfigEntityList {
   protected $entityInfoComplete;
 
   /**
-   * Constructs a new EntityList object.
+   * Constructs a new EntityDisplayModeList object.
    *
    * @param string $entity_type
    *   The type of entity to be listed.
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldList.php b/core/modules/field_ui/lib/Drupal/field_ui/FieldList.php
index 3d5f9f4..fc4379d 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FieldList.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FieldList.php
@@ -48,7 +48,7 @@ class FieldList extends ConfigEntityList {
   protected $fieldTypeManager;
 
   /**
-   * Constructs a new EntityList object.
+   * Constructs a new FieldList object.
    *
    * @param string $entity_type
    *   The type of entity to be listed.
diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatList.php b/core/modules/filter/lib/Drupal/filter/FilterFormatList.php
index 5cf795a..76f40cd 100644
--- a/core/modules/filter/lib/Drupal/filter/FilterFormatList.php
+++ b/core/modules/filter/lib/Drupal/filter/FilterFormatList.php
@@ -10,7 +10,6 @@
 use Drupal\Component\Utility\String;
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Config\Entity\DraggableListBase;
-use Drupal\Core\Entity\EntityControllerInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
@@ -19,7 +18,7 @@
 /**
  * Defines the filter format list.
  */
-class FilterFormatList extends DraggableListBase implements EntityControllerInterface {
+class FilterFormatList extends DraggableListBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/image/lib/Drupal/image/ImageStyleList.php b/core/modules/image/lib/Drupal/image/ImageStyleList.php
index 44d4928..07815d5 100644
--- a/core/modules/image/lib/Drupal/image/ImageStyleList.php
+++ b/core/modules/image/lib/Drupal/image/ImageStyleList.php
@@ -12,7 +12,6 @@
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Routing\UrlGeneratorInterface;
-use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -55,8 +54,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
       $entity_info,
       $container->get('entity.manager')->getStorageController($entity_type),
       $container->get('module_handler'),
-      $container->get('url_generator'),
-      $container->get('string_translation')
+      $container->get('url_generator')
     );
   }
 
diff --git a/core/modules/language/lib/Drupal/language/LanguageList.php b/core/modules/language/lib/Drupal/language/LanguageList.php
index 1a7651d..5d5526b 100644
--- a/core/modules/language/lib/Drupal/language/LanguageList.php
+++ b/core/modules/language/lib/Drupal/language/LanguageList.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Contains \Drupal\language\Form\LanguageList.
diff --git a/core/modules/menu/lib/Drupal/menu/MenuList.php b/core/modules/menu/lib/Drupal/menu/MenuList.php
index 84a1c30..29ce5a5 100644
--- a/core/modules/menu/lib/Drupal/menu/MenuList.php
+++ b/core/modules/menu/lib/Drupal/menu/MenuList.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\menu\MenuList.
  */
 
@@ -15,7 +16,7 @@
 class MenuList extends ConfigEntityList {
 
   /**
-   * Overrides \Drupal\Core\Entity\EntityList::buildHeader().
+   * {@inheritdoc}
    */
   public function buildHeader() {
     $header['title'] = t('Title');
@@ -27,7 +28,7 @@ public function buildHeader() {
   }
 
   /**
-   * Overrides \Drupal\Core\Entity\EntityList::buildRow().
+   * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
     $row['title'] = array(
@@ -61,7 +62,7 @@ public function getOperations(EntityInterface $entity) {
   }
 
   /**
-   * Overrides \Drupal\Core\Entity\EntityList::render();
+   * {@inheritdoc}
    */
   public function render() {
     $build = parent::render();
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 6e94485..ac85957 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -718,4 +718,3 @@ function menu_library_info() {
 
   return $libraries;
 }
-
diff --git a/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php b/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php
index 60df068..159b1be 100644
--- a/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php
+++ b/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php
@@ -23,7 +23,7 @@
  *   module = "migrate",
  *   controllers = {
  *     "storage" = "Drupal\Core\Config\Entity\ConfigStorageController",
- *     "list" = "Drupal\Core\Config\Entity\DraggableListController",
+ *     "list" = "Drupal\Core\Config\Entity\DraggableListBase",
  *     "access" = "Drupal\Core\Entity\EntityAccessController",
  *     "form" = {
  *       "add" = "Drupal\Core\Entity\EntityFormController",
diff --git a/core/modules/node/lib/Drupal/node/NodeList.php b/core/modules/node/lib/Drupal/node/NodeList.php
index 313f425..f30b2db 100644
--- a/core/modules/node/lib/Drupal/node/NodeList.php
+++ b/core/modules/node/lib/Drupal/node/NodeList.php
@@ -14,11 +14,10 @@
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Language\Language;
-use Drupal\Core\StringTranslation\TranslationInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Lists nodes.
+ * Provides a list of nodes.
  */
 class NodeList extends EntityList {
 
@@ -42,8 +41,6 @@ class NodeList extends EntityList {
    *   The module handler to invoke hooks on.
    * @param \Drupal\Core\Datetime\Date $date_service
    *   The date service.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
    */
   public function __construct($entity_type, array $entity_info, EntityStorageControllerInterface $storage, ModuleHandlerInterface $module_handler, Date $date_service) {
     parent::__construct($entity_type, $entity_info, $storage, $module_handler);
diff --git a/core/modules/node/lib/Drupal/node/NodeTypeList.php b/core/modules/node/lib/Drupal/node/NodeTypeList.php
index 357fc47..c15d407 100644
--- a/core/modules/node/lib/Drupal/node/NodeTypeList.php
+++ b/core/modules/node/lib/Drupal/node/NodeTypeList.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\node\NodeTypeList.
  */
 
@@ -13,7 +14,6 @@
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Component\Utility\Xss;
-use Drupal\Component\Utility\String;
 
 /**
  * Provides a listing of node types.
diff --git a/core/modules/picture/lib/Drupal/picture/PictureMappingList.php b/core/modules/picture/lib/Drupal/picture/PictureMappingList.php
index 7fad7ff..2846358 100644
--- a/core/modules/picture/lib/Drupal/picture/PictureMappingList.php
+++ b/core/modules/picture/lib/Drupal/picture/PictureMappingList.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\picture\PictureList.
+ * Contains \Drupal\picture\PictureMappingList.
  */
 
 namespace Drupal\picture;
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetList.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetList.php
index 4455085..4f406b5 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetList.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetList.php
@@ -16,7 +16,7 @@
 class ShortcutSetList extends ConfigEntityList {
 
   /**
-   * Overrides \Drupal\Core\Entity\EntityList::buildHeader().
+   * {@inheritdoc}
    */
   public function buildHeader() {
     $header['name'] = t('Name');
@@ -43,7 +43,7 @@ public function getOperations(EntityInterface $entity) {
   }
 
   /**
-   * Overrides \Drupal\Core\Entity\EntityList::buildRow().
+   * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
     $row['name'] = $this->getLabel($entity);
diff --git a/core/modules/system/entity.api.php b/core/modules/system/entity.api.php
index 3cf9535..df48b05 100644
--- a/core/modules/system/entity.api.php
+++ b/core/modules/system/entity.api.php
@@ -693,7 +693,7 @@ function hook_entity_field_info_alter(&$info, $entity_type) {
  *
  * @param array $operations
  *   Operations array as returned by
- *   \Drupal\Core\Entity\EntityListControllerInterface::getOperations().
+ *   \Drupal\Core\Entity\EntityListInterface::getOperations().
  * @param \Drupal\Core\Entity\EntityInterface $entity
  *   The entity on which the linked operations will be performed.
  */
diff --git a/core/modules/user/lib/Drupal/user/Entity/User.php b/core/modules/user/lib/Drupal/user/Entity/User.php
index 17f0d12..6554f14 100644
--- a/core/modules/user/lib/Drupal/user/Entity/User.php
+++ b/core/modules/user/lib/Drupal/user/Entity/User.php
@@ -22,7 +22,7 @@
  *   controllers = {
  *     "storage" = "Drupal\user\UserStorageController",
  *     "access" = "Drupal\user\UserAccessController",
- *     "list" = "Drupal\user\Controller\UserList",
+ *     "list" = "Drupal\user\UserList",
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
  *     "form" = {
  *       "default" = "Drupal\user\ProfileFormController",
diff --git a/core/modules/user/lib/Drupal/user/Controller/UserList.php b/core/modules/user/lib/Drupal/user/UserList.php
similarity index 96%
rename from core/modules/user/lib/Drupal/user/Controller/UserList.php
rename to core/modules/user/lib/Drupal/user/UserList.php
index 1b1b6a9..dbc87ac 100644
--- a/core/modules/user/lib/Drupal/user/Controller/UserList.php
+++ b/core/modules/user/lib/Drupal/user/UserList.php
@@ -2,12 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\user\Controller\UserList.
+ * Contains \Drupal\user\UserList.
  */
 
 namespace Drupal\user\Controller;
 
-use Drupal\Core\Entity\EntityControllerInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityList;
 use Drupal\Core\Entity\EntityStorageControllerInterface;
@@ -20,7 +19,7 @@
  *
  * @see \Drupal\user\Entity\User
  */
-class UserList extends EntityList implements EntityControllerInterface {
+class UserList extends EntityList {
 
   /**
    * The entity query factory.
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewList.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewList.php
index d347b8b..1c5933b 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewList.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewList.php
@@ -41,7 +41,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
   }
 
   /**
-   * Constructs a new EntityList object.
+   * Constructs a new ViewList object.
    *
    * @param string $entity_type.
    *   The type of entity to be listed.
diff --git a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListTest.php b/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListTest.php
index 571a90c..b01af1a 100644
--- a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListTest.php
+++ b/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\views_ui\Tests\ViewListTest
+ * Contains \Drupal\views_ui\Tests\ViewListTest.
  */
 
 namespace Drupal\views_ui\Tests;
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityListTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityListTest.php
index 842663f..d6e8929 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityListTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityListTest.php
@@ -30,7 +30,7 @@ class EntityListTest extends UnitTestCase {
    *
    * @var \Drupal\Core\Entity\EntityList
    */
-  protected $entityListController;
+  protected $entityList;
 
   public static function getInfo() {
     return array(
@@ -78,9 +78,9 @@ protected function setUp() {
       ->disableOriginalConstructor()
       ->getMock();
 
-    $this->entityListController = $this->getMock('Drupal\entity_test\EntityTestList', array('buildOperations'), array('user_role', static::$entityInfo, $role_storage_controller, $module_handler));
+    $this->entityList = $this->getMock('Drupal\entity_test\EntityTestList', array('buildOperations'), array('user_role', static::$entityInfo, $role_storage_controller, $module_handler));
 
-    $this->entityListController->expects($this->any())
+    $this->entityList->expects($this->any())
       ->method('buildOperations')
       ->will($this->returnValue(array()));
 
@@ -101,7 +101,7 @@ protected function setUp() {
    * @param bool $ignorewarnings
    *   Whether or not to ignore PHP 5.3+ invalid multibyte sequence warnings.
    *
-   * @see \Drupal\Component\Utility\Drupal\Core\Entity\EntityListController::buildRow()
+   * @see \Drupal\Core\Entity\EntityList::buildRow()
    */
   public function testBuildRow($input, $expected, $message, $ignorewarnings = FALSE) {
     $this->role->expects($this->any())
@@ -109,10 +109,10 @@ public function testBuildRow($input, $expected, $message, $ignorewarnings = FALS
       ->will($this->returnValue($input));
 
     if ($ignorewarnings) {
-      $built_row = @$this->entityListController->buildRow($this->role);
+      $built_row = @$this->entityList->buildRow($this->role);
     }
     else {
-      $built_row = $this->entityListController->buildRow($this->role);
+      $built_row = $this->entityList->buildRow($this->role);
     }
 
     $this->assertEquals($built_row['label'], $expected, $message);