diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
index fd25a15..3883987 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
@@ -167,9 +167,9 @@ protected function getBuildDefaults(EntityInterface $entity, $view_mode) {
       $build['#theme'] = 'entity';
       $build['#entity'] = $entity;
 
-      // For backwards compatitbility for enitty types that used this without a
-      // valid theme hook in the past, also put the entity type into the old
-      // place.
+      // For backwards compatibility for entity types that used this without a
+      // valid theme hook in the past and also to put the entity type into the
+      // old place.
       $build["#{$this->entityTypeId}"] = $entity;
     }
 
diff --git a/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php b/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php
index 41f7c08..dc18702 100644
--- a/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php
@@ -55,7 +55,7 @@ function testEntityViewController() {
       $this->assertRaw($get_label_markup($entity->label()));
       $this->assertRaw('full');
 
-      // Verify that the h2 label is hidden for the full view mode
+      // Verify that the <h2> label is hidden for the full view mode.
       $this->assertNoRaw('<h2');
 
       $this->drupalGet('entity_test_converter/' . $entity->id());
@@ -70,7 +70,7 @@ function testEntityViewController() {
       $this->assertRaw($entity->label());
       $this->assertRaw('test');
 
-      // Verify that the h2 label is shown for the full view mode
+      // Verify that the <h2> label is shown for the full view mode.
       $this->assertRaw('<h2');
     }
 
diff --git a/core/themes/classy/templates/content/entity.html.twig b/core/themes/classy/templates/content/entity.html.twig
index d57a43d..d5870b8 100644
--- a/core/themes/classy/templates/content/entity.html.twig
+++ b/core/themes/classy/templates/content/entity.html.twig
@@ -1,3 +1,4 @@
+{% extends "entity.html.twig" %}
 {#
 /**
  * @file
@@ -42,18 +43,4 @@ set classes = [
   view_mode ? entity.getEntityTypeId() ~ '--view-mode-' ~ view_mode|clean_class,
 ]
 %}
-<article{{ attributes.addClass(classes) }}>
-
-  {% if label and view_mode != "full" %}
-    {{ title_prefix }}
-    <h2{{ title_attributes }}>
-      {{ label }}
-    </h2>
-    {{ title_suffix }}
-  {% endif %}
-
-  <div{{ content_attributes }}>
-    {{ content }}
-  </div>
-
-</article>
+{% set attributes = attributes.addClass(classes) %}