diff --git a/core/modules/entity_ui/css/entity_ui.admin.css b/core/modules/entity_ui/css/entity_ui.admin.css
index 858fdd7..53093a1 100644
--- a/core/modules/entity_ui/css/entity_ui.admin.css
+++ b/core/modules/entity_ui/css/entity_ui.admin.css
@@ -2,7 +2,14 @@
  * @file
  * Stylesheet for the administration pages of the Entity UI module.
  */
- 
+
 .operations {
-	width: 100px;
+  width: 100px;
+}
+
+table caption {
+  font-size: 110%;
+  font-weight: bold;
+  text-align: left;
+  padding-bottom: 0.5em;
 }
diff --git a/core/modules/entity_ui/lib/Drupal/entity_ui/ViewModeListController.php b/core/modules/entity_ui/lib/Drupal/entity_ui/ViewModeListController.php
index f227980..f612d91 100644
--- a/core/modules/entity_ui/lib/Drupal/entity_ui/ViewModeListController.php
+++ b/core/modules/entity_ui/lib/Drupal/entity_ui/ViewModeListController.php
@@ -37,7 +37,7 @@ public function load() {
    * Overrides Drupal\Core\Entity\EntityListController::buildHeader();
    */
   public function buildHeader() {
-    $header['name'] = check_plain($this->type['label']);
+    $header['name'] = t('Name');
     $header['operations'] = t('Operations');
     return $header;
   }
@@ -79,6 +79,7 @@ public function render() {
       ),
       'colspan' => count($build['#header']),
     );
+    $build['#caption'] = check_plain($this->type['label']);
     return $build;
   }
 
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 560cbd1..9f6c28a 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -2196,10 +2196,10 @@ function system_update_8031() {
   // We can't call entity_info() in an update hook, so we hardcode them.
   // We only care about the core view modes as hook_entity_info_alter() will
   // still work since that was the only way to add custom view modes in D7.
-  $view_modes = array(
+  $entity_view_modes = array(
     'node' => array(
       'full' => 'Full content',
-      'teaser', 'Teaser',
+      'teaser' => 'Teaser',
       'rss' => 'RSS',
       'search_index' => 'Search index',
       'search_result' => 'Search result',
@@ -2219,11 +2219,11 @@ function system_update_8031() {
     ),
   );
 
-  foreach ($view_modes as $entity_type => $view_modes) {
+  foreach ($entity_view_modes as $entity_type => $view_modes) {
     foreach ($view_modes as $key => $name) {
       config('view_mode.' . $entity_type . '.' . $key)
         ->set('machine_name', $entity_type . '.' . $key)
-        ->set('name', $key)
+        ->set('name', $name)
         ->set('type', $entity_type)
         ->set('locked', TRUE)
         ->set('custom', FALSE)