diff --git a/core/lib/Drupal/Core/Entity/Display/EntityViewDisplayInterface.php b/core/lib/Drupal/Core/Entity/Display/EntityViewDisplayInterface.php
index 8d86a6b..69ecb78 100644
--- a/core/lib/Drupal/Core/Entity/Display/EntityViewDisplayInterface.php
+++ b/core/lib/Drupal/Core/Entity/Display/EntityViewDisplayInterface.php
@@ -34,7 +34,7 @@ public function build(ContentEntityInterface $entity);
    *
    * This only includes the components handled by the Display object, but
    * excludes 'extra fields', that are typically rendered through specific,
-   * ad-hoc code in EntityViewBuilderInterface::buildContent() or in
+   * ad-hoc code in EntityViewBuilderInterface::buildComponents() or in
    * hook_entity_view() implementations.
    *
    * hook_entity_display_build_alter() is invoked on each entity, allowing 3rd
diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
index f128ade..9154dcd 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
@@ -91,7 +91,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
   /**
    * {@inheritdoc}
    */
-  public function buildContent(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
+  public function buildComponents(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
     $entities_by_bundle = array();
     foreach ($entities as $id => $entity) {
       // Initialize the field item attributes for the fields being displayed.
@@ -306,7 +306,7 @@ public function buildMultiple(array $build_list) {
     // Build content for the displays represented by the entities.
     foreach ($view_modes as $view_mode => $view_mode_entities) {
       $displays = EntityViewDisplay::collectRenderDisplays($view_mode_entities, $view_mode);
-      $this->buildContent($build_list, $view_mode_entities, $displays, $view_mode, $langcode);
+      $this->buildComponents($build_list, $view_mode_entities, $displays, $view_mode, $langcode);
       foreach (array_keys($view_mode_entities) as $key) {
         // Allow for alterations while building, before rendering.
         $entity = $build_list[$key][$entity_type_key];
diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php b/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
index 5b77d27..ee1c193 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
@@ -16,7 +16,7 @@
 interface EntityViewBuilderInterface {
 
   /**
-   * Build the structured $content property on the entity.
+   * Builds the component fields and properties of a set of entities.
    *
    * @param &$build
    *   The renderable array representing the entity content.
@@ -31,7 +31,7 @@
    *   (optional) For which language the entity should be build, defaults to
    *   the current content language.
    */
-  public function buildContent(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL);
+  public function buildComponents(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL);
 
   /**
    * Returns the render array for the provided entity.
diff --git a/core/modules/block/lib/Drupal/block/BlockViewBuilder.php b/core/modules/block/lib/Drupal/block/BlockViewBuilder.php
index 9cd29d7..9e3b1b5 100644
--- a/core/modules/block/lib/Drupal/block/BlockViewBuilder.php
+++ b/core/modules/block/lib/Drupal/block/BlockViewBuilder.php
@@ -22,7 +22,7 @@ class BlockViewBuilder extends EntityViewBuilder {
   /**
    * {@inheritdoc}
    */
-  public function buildContent(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
+  public function buildComponents(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
   }
 
   /**
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index c8ad565..4d35ff5 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1282,7 +1282,7 @@ function comment_preprocess_block(&$variables) {
  *   A user account, for use with theme_username() or the user_picture template.
  */
 function comment_prepare_author(CommentInterface $comment) {
-  // The account has been pre-loaded by CommentViewBuilder::buildContent().
+  // The account has been pre-loaded by CommentViewBuilder::buildComponents().
   $account = $comment->getOwner();
   if (empty($account->uid->value)) {
     // @todo Avoid creating a new entity by just creating a new instance
diff --git a/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php b/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php
index 2bd3d28..02e427f 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php
@@ -80,7 +80,7 @@ public function __construct(EntityTypeInterface $entity_type, EntityManagerInter
   }
 
   /**
-   * Overrides Drupal\Core\Entity\EntityViewBuilder::buildContent().
+   * Overrides Drupal\Core\Entity\EntityViewBuilder::buildComponents().
    *
    * In addition to modifying the content key on entities, this implementation
    * will also set the comment entity key which all comments carry.
@@ -88,7 +88,7 @@ public function __construct(EntityTypeInterface $entity_type, EntityManagerInter
    * @throws \InvalidArgumentException
    *   Thrown when a comment is attached to an entity that no longer exists.
    */
-  public function buildContent(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
+  public function buildComponents(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
     /** @var \Drupal\comment\CommentInterface[] $entities */
     if (empty($entities)) {
       return;
@@ -101,7 +101,7 @@ public function buildContent(array &$build, array $entities, array $displays, $v
     }
     $this->entityManager->getStorage('user')->loadMultiple(array_unique($uids));
 
-    parent::buildContent($build, $entities, $displays, $view_mode, $langcode);
+    parent::buildComponents($build, $entities, $displays, $view_mode, $langcode);
 
     // Load all the entities that have comments attached.
     $commented_entity_ids = array();
diff --git a/core/modules/contact/lib/Drupal/contact/MessageViewBuilder.php b/core/modules/contact/lib/Drupal/contact/MessageViewBuilder.php
index 701336c..4cbbd2c 100644
--- a/core/modules/contact/lib/Drupal/contact/MessageViewBuilder.php
+++ b/core/modules/contact/lib/Drupal/contact/MessageViewBuilder.php
@@ -20,8 +20,8 @@ class MessageViewBuilder extends EntityViewBuilder {
   /**
    * {@inheritdoc}
    */
-  public function buildContent(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
-    parent::buildContent($build, $entities, $displays, $view_mode, $langcode);
+  public function buildComponents(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
+    parent::buildComponents($build, $entities, $displays, $view_mode, $langcode);
 
     foreach ($entities as $id => $entity) {
       // Add the message extra field, if enabled.
diff --git a/core/modules/node/lib/Drupal/node/NodeViewBuilder.php b/core/modules/node/lib/Drupal/node/NodeViewBuilder.php
index 53d909e..494183f 100644
--- a/core/modules/node/lib/Drupal/node/NodeViewBuilder.php
+++ b/core/modules/node/lib/Drupal/node/NodeViewBuilder.php
@@ -19,7 +19,7 @@ class NodeViewBuilder extends EntityViewBuilder {
   /**
    * {@inheritdoc}
    */
-  public function buildContent(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
+  public function buildComponents(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
     /** @var \Drupal\node\NodeInterface[] $entities */
     if (empty($entities)) {
       return;
@@ -28,7 +28,7 @@ public function buildContent(array &$build, array $entities, array $displays, $v
     // Attach user account.
     user_attach_accounts($build, $entities);
 
-    parent::buildContent($build, $entities, $displays, $view_mode, $langcode);
+    parent::buildComponents($build, $entities, $displays, $view_mode, $langcode);
 
     foreach ($entities as $id => $entity) {
       $bundle = $entity->bundle();
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestViewBuilder.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestViewBuilder.php
index b96f5c3..15f6b6d 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestViewBuilder.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestViewBuilder.php
@@ -19,8 +19,8 @@ class EntityTestViewBuilder extends EntityViewBuilder {
   /**
    * {@inheritdoc}
    */
-  public function buildContent(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
-    parent::buildContent($build, $entities, $displays, $view_mode, $langcode);
+  public function buildComponents(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
+    parent::buildComponents($build, $entities, $displays, $view_mode, $langcode);
 
     foreach ($entities as $id => $entity) {
       $build[$id]['label'] = array(
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 79fe1eb..b96e609 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -165,7 +165,7 @@ function user_uri($user) {
 /**
  * Populates $entity->account for each prepared entity.
  *
- * Called by Drupal\Core\Entity\EntityViewBuilderInterface::buildContent()
+ * Called by Drupal\Core\Entity\EntityViewBuilderInterface::buildComponents()
  * implementations.
  *
  * @param array &$build