diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
index 111e835..03a6252 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
@@ -321,8 +321,8 @@ public function viewFieldItem(FieldItemInterface $item, $display = array()) {
     // Clone the entity since we are going to modify field values.
     $clone = clone $entity;
 
-    // Push the item as the single value for the field, and defer to
-    // viewFieldItemList() to build the render array for the whole list.
+    // Push the item as the single value for the field, and defer to viewField()
+    // to build the render array for the whole list.
     $clone->{$field_name}->setValue(array($item->getValue()));
     $elements = $this->viewField($clone->{$field_name}, $display);
 
diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php b/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
index 3abaa0e..b41848b 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
@@ -140,7 +140,7 @@ public function viewField(FieldItemListInterface $items, $display_options = arra
    *   FieldItem to be displayed.
    * @param array $display_options
    *   Can be either the name of a view mode, or an array of display settings.
-   *   See EntityViewBuilderInterface::viewFieldItemList() for more information.
+   *   See EntityViewBuilderInterface::viewField() for more information.
    *
    * @return array
    *   A renderable array for the field item.
diff --git a/core/lib/Drupal/Core/Field/FieldItemInterface.php b/core/lib/Drupal/Core/Field/FieldItemInterface.php
index 19aea8e..ccb13b8 100644
--- a/core/lib/Drupal/Core/Field/FieldItemInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldItemInterface.php
@@ -176,7 +176,7 @@ public function deleteRevision();
    *
    * @param array $display_options
    *   Can be either the name of a view mode, or an array of display settings.
-   *   See EntityViewBuilderInterface::viewFieldItemList() for more information.
+   *   See EntityViewBuilderInterface::viewField() for more information.
    *
    * @return array
    *   A renderable array for the field item.
diff --git a/core/lib/Drupal/Core/Field/FieldItemListInterface.php b/core/lib/Drupal/Core/Field/FieldItemListInterface.php
index 7b4d97a..7e48840 100644
--- a/core/lib/Drupal/Core/Field/FieldItemListInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldItemListInterface.php
@@ -183,7 +183,7 @@ public function deleteRevision();
    *
    * @param array $display_options
    *   Can be either the name of a view mode, or an array of display settings.
-   *   See EntityViewBuilderInterface::viewFieldItemList() for more information.
+   *   See EntityViewBuilderInterface::viewField() for more information.
    *
    * @return array
    *   A renderable array for the field values.