diff --git a/core/lib/Drupal/Core/Entity/EntityList.php b/core/lib/Drupal/Core/Entity/EntityList.php
index 0b8ebfb..b7dddb5 100644
--- a/core/lib/Drupal/Core/Entity/EntityList.php
+++ b/core/lib/Drupal/Core/Entity/EntityList.php
@@ -13,7 +13,7 @@
 use Drupal\Component\Utility\String;
 
 /**
- * Provides a generic implementation of an entity list.
+ * Provides a generic implementation of an entity listing.
  */
 class EntityList extends EntityControllerBase implements EntityListBuilderInterface, EntityControllerInterface {
 
@@ -148,7 +148,7 @@ public function buildRow(EntityInterface $entity) {
    * @return array
    *   A renderable array of operation links.
    *
-   * @see \Drupal\Core\Entity\EntityList::render()
+   * @see \Drupal\Core\Entity\EntityList::buildRow()
    */
   public function buildOperations(EntityInterface $entity) {
     // Retrieve and sort operations.
@@ -165,7 +165,7 @@ public function buildOperations(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    *
-   * Builds the entity list as renderable array for theme_table().
+   * Builds the entity listing as renderable array for theme_table().
    *
    * @todo Add a link to add a new item to the #empty text.
    */
@@ -199,7 +199,6 @@ protected function t($string, array $args = array(), array $options = array()) {
    *
    * @return string
    *   A string title of the page.
-   *
    */
   protected function getTitle() {
     return;
diff --git a/core/lib/Drupal/Core/Entity/EntityListBuilderInterface.php b/core/lib/Drupal/Core/Entity/EntityListBuilderInterface.php
index 4e3fe71..8c84f9b 100644
--- a/core/lib/Drupal/Core/Entity/EntityListBuilderInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityListBuilderInterface.php
@@ -8,7 +8,7 @@
 namespace Drupal\Core\Entity;
 
 /**
- * Defines an interface for entity lists.
+ * Defines an interface to build entity listings.
  */
 interface EntityListBuilderInterface {
 
@@ -16,18 +16,18 @@
    * Gets the entity storage controller.
    *
    * @return \Drupal\Core\Entity\EntityStorageControllerInterface
-   *   The storage controller used by the entity type of this list.
+   *   The storage controller used by the entity type of this listing.
    */
   public function getStorageController();
 
   /**
    * Loads entities of this type from storage for listing.
    *
-   * This allows the controller to manipulate the list, like filtering or
+   * This allows the implementation to manipulate the listing, like filtering or
    * sorting the loaded entities.
    *
    * @return \Drupal\Core\Entity\EntityInterface[]
-   *   An array of entities implementing Drupal\Core\Entity\EntityInterface.
+   *   An array of entities implementing \Drupal\Core\Entity\EntityInterface.
    */
   public function load();
 
@@ -48,10 +48,10 @@ public function load();
   public function getOperations(EntityInterface $entity);
 
   /**
-   * Renders the list page markup to be output.
+   * Returns a listing of entities for the given entity type.
    *
-   * @return string
-   *   The output markup for the listing page.
+   * @return array
+   *   A render array as expected by drupal_render().
    */
   public function render();
 
diff --git a/core/lib/Drupal/Core/Entity/EntityManagerInterface.php b/core/lib/Drupal/Core/Entity/EntityManagerInterface.php
index ef91b72..7ad92cb 100644
--- a/core/lib/Drupal/Core/Entity/EntityManagerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityManagerInterface.php
@@ -129,13 +129,13 @@ public function clearCachedDefinitions();
   public function getViewBuilder($entity_type);
 
   /**
-   * Creates a new entity list.
+   * Creates a new entity list builder.
    *
    * @param string $entity_type
-   *   The entity type for this list.
+   *   The entity type to build the list of.
    *
    * @return \Drupal\Core\Entity\EntityListBuilderInterface
-   *   An entity list instance.
+   *   An entity list builder instance.
    */
   public function getList($entity_type);