diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 3ed6e4a..0177326 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -435,7 +435,7 @@ function entity_page_label(EntityInterface $entity, $langcode = NULL) {
  * @return \Drupal\Core\Entity\EntityAccessControllerInterface
  *   An entity access controller instance.
  *
- * @deprecated Use \Drupal\Core\Entity\EntityManager::getViewBuilder().
+ * @deprecated Use \Drupal\Core\Entity\EntityManager::getAccessController().
  */
 function entity_access_controller($entity_type) {
   return \Drupal::entityManager()
diff --git a/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php b/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php
index cd078da..9a8260e 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php
@@ -84,8 +84,6 @@ public function __construct($entity_type, EntityManager $entity_manager, FieldIn
    *   Thrown when a comment is attached to an entity that no longer exists.
    */
   public function buildContent(array $entities, array $displays, $view_mode, $langcode = NULL) {
-    // In addition to modifying the content key on entities, this implementation
-    // will also set the node key which all comments carry.
     $return = array();
     if (empty($entities)) {
       return $return;
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php
deleted file mode 100644
index 138b50d..0000000
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\entity_test\Entity\EntityTestRender.
- */
-
-namespace Drupal\entity_test\Entity;
-
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * Defines a test entity class with a render controller.
- *
- * @EntityType(
- *   id = "entity_test_render",
- *   label = @Translation("Test render entity"),
- *   module = "entity_test",
- *   controllers = {
- *     "storage" = "Drupal\entity_test\EntityTestStorageController",
- *     "render" = "Drupal\entity_test\EntityTestRenderController",
- *     "access" = "Drupal\entity_test\EntityTestAccessController",
- *     "form" = {
- *       "default" = "Drupal\entity_test\EntityTestFormController"
- *     },
- *   },
- *   base_table = "entity_test",
- *   fieldable = TRUE,
- *   route_base_path = "admin/structure/entity-test-render/manage/{bundle}",
- *   entity_keys = {
- *     "id" = "id",
- *     "uuid" = "uuid",
- *     "label" = "name",
- *     "bundle" = "type"
- *   },
- *   links = {
- *     "canonical" = "/entity-test-render/{entity_test_render}",
- *     "edit-form" = "/entity-\_test_render/manage/{entity_test_render}/edit"
- *   }
- * )
- */
-class EntityTestRender extends EntityTest {
-
-}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php
index 0484149..6107be3 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php
@@ -93,7 +93,7 @@ public function getDerivativeDefinition($derivative_id, array $base_plugin_defin
   public function getDerivativeDefinitions(array $base_plugin_definition) {
     foreach ($this->entityManager->getDefinitions() as $entity_type => $entity_info) {
       // Just add support for entity types which have a views integration.
-      if (isset($entity_info['base_table']) && $this->viewsData->get($entity_info['base_table']) && $this->entityManager->hasController($entity_type, 'render')) {
+      if (isset($entity_info['base_table']) && $this->viewsData->get($entity_info['base_table']) && $this->entityManager->hasController($entity_type, 'view_builder')) {
         $this->derivatives[$entity_type] = array(
           'id' => 'entity:' . $entity_type,
           'provider' => 'views',
diff --git a/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php b/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php
index e727ad8..59a60fe 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php
@@ -49,7 +49,7 @@ public function testView() {
       ->will($this->returnValue($render_controller));
 
     // Mock an 'entity_test' entity.
-    $entity = $this->getMockBuilder('Drupal\entity_test\Entity\EntityTestRender')
+    $entity = $this->getMockBuilder('Drupal\entity_test\Entity\EntityTest')
       ->disableOriginalConstructor()
       ->getMock();