diff --git a/core/lib/Drupal/Core/Entity/Display/EntityViewDisplayInterface.php b/core/lib/Drupal/Core/Entity/Display/EntityViewDisplayInterface.php
index 374549a..0472a89 100644
--- a/core/lib/Drupal/Core/Entity/Display/EntityViewDisplayInterface.php
+++ b/core/lib/Drupal/Core/Entity/Display/EntityViewDisplayInterface.php
@@ -17,7 +17,7 @@
   /**
    * Returns a renderable array for the components of an entity.
    *
-   * See the collectRenderDisplays() method for details.
+   * See the buildMultiple() method for details.
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity being displayed.
diff --git a/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php b/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php
index 1887306..11f2246 100644
--- a/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php
+++ b/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php
@@ -13,7 +13,7 @@
  * Defines a FieldFormatter annotation object.
  *
  * Formatters handle the display of field values. They are typically
- * instanciated and invoked by an EntityDisplay object.
+ * instantiated and invoked by an EntityDisplay object.
  *
  * Additional annotation keys for formatters can be defined in
  * hook_field_formatter_info_alter().
diff --git a/core/modules/system/entity.api.php b/core/modules/system/entity.api.php
index b13a8be..af0785c 100644
--- a/core/modules/system/entity.api.php
+++ b/core/modules/system/entity.api.php
@@ -586,9 +586,9 @@ function hook_entity_display_alter(\Drupal\Core\Entity\Display\EntityViewDisplay
 /**
  * Alter the render array generated by an EntityDisplay for an entity.
  *
- * @param $build
+ * @param array $build
  *   The renderable array generated by the EntityDisplay.
- * @param $context
+ * @param array $context
  *   An associative array containing:
  *   - entity: The entity being rendered.
  *   - view_mode: The view mode; for example, 'full' or 'teaser'.
diff --git a/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php b/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
index bd2800a..f8f21d0 100644
--- a/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
+++ b/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
@@ -212,7 +212,7 @@ function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
     // Display the entity.
     $entity = entity_load('entity_test', $id);
     $display = entity_get_display($entity->getEntityTypeId(), $entity->bundle(), 'full');
-    $content = $display->view($entity);
+    $content = $display->build($entity);
     $this->drupalSetContent(drupal_render($content));
     $this->assertNoRaw($value, 'HTML tags are not displayed.');
     $this->assertRaw(check_plain($value), 'Escaped HTML is displayed correctly.');
@@ -254,7 +254,7 @@ function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
     $this->container->get('entity.manager')->getStorageController('entity_test')->resetCache(array($id));
     $entity = entity_load('entity_test', $id);
     $display = entity_get_display($entity->getEntityTypeId(), $entity->bundle(), 'full');
-    $content = $display->view($entity);
+    $content = $display->build($entity);
     $this->drupalSetContent(drupal_render($content));
     $this->assertRaw($value, 'Value is displayed unfiltered');
   }