diff -u b/core/lib/Drupal/Core/Entity/Form/RevisionableContentEntityForm.php b/core/lib/Drupal/Core/Entity/Form/RevisionableContentEntityForm.php
--- b/core/lib/Drupal/Core/Entity/Form/RevisionableContentEntityForm.php
+++ b/core/lib/Drupal/Core/Entity/Form/RevisionableContentEntityForm.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Entity\Form\RevisionableContentEntityForm.
- */
-
 namespace Drupal\Core\Entity\Form;
 
 use Drupal\Core\Entity\ContentEntityForm;
@@ -39,6 +34,7 @@
    * Returns the bundle entity of the entity, or NULL if there is none.
    *
    * @return \Drupal\Core\Entity\EntityInterface|null
+   *   The bundle entity.
    */
   protected function getBundleEntity() {
     if ($bundle_entity_type = $this->entity->getEntityType()->getBundleEntityType()) {
@@ -75,8 +71,6 @@
 
     // Add a log field if the "Create new revision" option is checked, or if the
     // current user has the ability to check that option.
-    // @todo Could we autogenerate this form by using some widget on the
-    //   revision info field.
     $form['revision_information'] = [
       '#type' => 'details',
       '#title' => $this->t('Revision information'),
@@ -106,10 +100,6 @@
       ];
     }
 
-    if (isset($form['revision_log'])) {
-      $form['revision_log']['#group'] = 'revision_information';
-    }
-
     return parent::form($form, $form_state);
   }
 
diff -u b/core/lib/Drupal/Core/Entity/RevisionableEntityBundleInterface.php b/core/lib/Drupal/Core/Entity/RevisionableEntityBundleInterface.php
--- b/core/lib/Drupal/Core/Entity/RevisionableEntityBundleInterface.php
+++ b/core/lib/Drupal/Core/Entity/RevisionableEntityBundleInterface.php
@@ -1,14 +1,12 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Entity\RevisionableEntityBundleInterface.
- */
-
 namespace Drupal\Core\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 
+/**
+ * Provides an interface defining a revisionable entity bundle.
+ */
 interface RevisionableEntityBundleInterface extends ConfigEntityInterface {
 
   /**
diff -u b/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
--- b/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\node;
 
-use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\Form\RevisionableContentEntityForm;
 use Drupal\Core\Form\FormStateInterface;
@@ -27,7 +26,7 @@
   protected $hasBeenPreviewed = FALSE;
 
   /**
-   * Constructs a ContentEntityForm object.
+   * Constructs a NodeForm object.
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
@@ -97,7 +96,7 @@
     $form = parent::form($form, $form_state);
 
     if ($this->operation == 'edit') {
-      $form['#title'] = $this->t('<em>Edit @type</em> @title', array('@type' => node_get_type_label($node), '@title' => $node->label()));
+      $form['#title'] = $this->t('<em>Edit @type</em> @title', array('@type' => $node->type->entity->label(), '@title' => $node->label()));
     }
 
     $form['revision_information']['#attributes']['class'][] = 'node-form-revision-information';
@@ -106,6 +105,7 @@
     $form['revision']['#access'] = $current_user->hasPermission('administer nodes') && !$node->isNew();
 
     $form['revision_log'] += array(
+      '#group' => 'revision_information',
       '#states' => array(
         'visible' => array(
           ':input[name="revision"]' => array('checked' => TRUE),
diff -u b/core/modules/node/src/NodeTypeInterface.php b/core/modules/node/src/NodeTypeInterface.php
--- b/core/modules/node/src/NodeTypeInterface.php
+++ b/core/modules/node/src/NodeTypeInterface.php
@@ -8,7 +8,7 @@
 /**
  * Provides an interface defining a node type entity.
  */
-interface NodeTypeInterface extends ConfigEntityInterface, RevisionableEntityBundleInterface  {
+interface NodeTypeInterface extends ConfigEntityInterface, RevisionableEntityBundleInterface {
 
   /**
    * Determines whether the node type is locked.
@@ -29,7 +29,7 @@
   /**
    * Sets whether a new revision should be created by default.
    *
-   * @param bool $new_revision_
+   * @param bool $new_revision
    *   TRUE if a new revision should be created by default.
    */
   public function setNewRevision($new_revision);
diff -u b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
--- b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
@@ -800,7 +800,7 @@
   /**
    * Check that field schema is correctly handled with long-named fields.
    */
-  function testLongNameFieldIndexes() {
+  public function testLongNameFieldIndexes() {
     $this->addLongNameBaseField();
     $entity_type_id = 'entity_test_update';
     $entity_type = $this->entityManager->getDefinition($entity_type_id);