diff -u b/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php b/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
--- b/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
@@ -20,7 +20,7 @@
    * Gets the built and processed entity form for the given entity.
    *
    * The form may also be retrieved from the cache if the form was built in a
-   * previous pageload. The form is then passed on for processing, validation,
+   * previous page load. The form is then passed on for processing, validation,
    * and submission if there is proper input.
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
@@ -33,7 +33,7 @@
    *   @endcode
    *   where "book_outline" is the value of $operation. The class name for the
    *   form for each operation (edit, delete, etc.) can be found in the form
-   *   section of the handlers entity annotation.For example:
+   *   section of the handlers entity annotation. For example:
    *   @code
    *   handlers = {
    *     "form" = {
@@ -56,7 +56,7 @@
    * @see \Drupal\Core\Form\FormBuilderInterface::getForm()
    * @see \Drupal\Core\Entity\EntityTypeInterface::getFormClass()
    * @see \Drupal\Core\Entity\EntityTypeInterface::setFormClass()
-   * @see book_entity_type_build()
+   * @see system_entity_type_build()
    */
   public function getForm(EntityInterface $entity, $operation = 'default', array $form_state_additions = array());
 
diff -u b/core/lib/Drupal/Core/Form/FormBuilderInterface.php b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
--- b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
+++ b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
@@ -70,7 +70,7 @@
    * Builds and processes a form for a given form ID.
    *
    * The form may also be retrieved from the cache if the form was built in a
-   * previous pageload. The form is then passed on for processing, validation,
+   * previous page load. The form is then passed on for processing, validation,
    * and submission if there is proper input.
    *
    * @param \Drupal\Core\Form\FormInterface|string $form_id