diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
index e933a82..0d9881f 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
@@ -12,7 +12,7 @@
 use Drupal\Tests\UnitTestCase;
 
 /**
- * Tests the entity list.
+ * Tests the entity list builder.
  *
  * @group Entity
  *
@@ -32,12 +32,12 @@ class EntityListBuilderTest extends UnitTestCase {
    *
    * @var \Drupal\Core\Entity\EntityListBuilder
    */
-  protected $entityList;
+  protected $entityListBuilder;
 
   public static function getInfo() {
     return array(
-      'name' => 'Entity list test',
-      'description' => 'Unit test of entity access checking system.',
+      'name' => 'Entity list builder test',
+      'description' => 'Unit test of entity list builder system.',
       'group' => 'Entity'
     );
   }
@@ -52,7 +52,7 @@ protected function setUp() {
     $role_storage_controller = $this->getMock('Drupal\user\RoleStorageControllerInterface');
     $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
-    $this->entityList = new TestEntityListBuilder($entity_type, $role_storage_controller, $module_handler);
+    $this->entityListBuilder = new TestEntityListBuilder($entity_type, $role_storage_controller, $module_handler);
   }
 
   /**
@@ -70,7 +70,7 @@ protected function setUp() {
    * @param bool $ignorewarnings
    *   Whether or not to ignore PHP 5.3+ invalid multibyte sequence warnings.
    *
-   * @see \Drupal\Core\Entity\EntityList::buildRow()
+   * @see \Drupal\Core\Entity\EntityListBuilder::buildRow()
    */
   public function testBuildRow($input, $expected, $message, $ignorewarnings = FALSE) {
     $this->role->expects($this->any())
@@ -78,10 +78,10 @@ public function testBuildRow($input, $expected, $message, $ignorewarnings = FALS
       ->will($this->returnValue($input));
 
     if ($ignorewarnings) {
-      $built_row = @$this->entityList->buildRow($this->role);
+      $built_row = @$this->entityListBuilder->buildRow($this->role);
     }
     else {
-      $built_row = $this->entityList->buildRow($this->role);
+      $built_row = $this->entityListBuilder->buildRow($this->role);
     }
 
     $this->assertEquals($built_row['label'], $expected, $message);