diff --git a/core/modules/views/src/Views.php b/core/modules/views/src/Views.php
index 525177f..819bf94 100644
--- a/core/modules/views/src/Views.php
+++ b/core/modules/views/src/Views.php
@@ -419,6 +419,7 @@ public static function pluginList() {
    *   - ltitle: The lowercase title of the handler type.
    *   - stitle: A singular title of the handler type.
    *   - lstitle: A singular lowercase title of the handler type.
+   *   - otitle: The original untranslated title of the handler type.
    *   - plural: Plural version of the handler type.
    *   - (optional) type: The actual internal used handler type. This key is
    *     just used for header,footer,empty to link to the internal type: area.
@@ -437,6 +438,9 @@ public static function getHandlerTypes() {
           'stitle' => static::t('Field'),
           // Singular lowercase title for mid sentence
           'lstitle' => static::t('field'),
+          // Original title.
+          'otitle' => 'Fields',
+          // Singular lowercase title for mid sentence
           'plural' => 'fields',
         ),
         'argument' => array(
@@ -444,6 +448,7 @@ public static function getHandlerTypes() {
           'ltitle' => static::t('contextual filters'),
           'stitle' => static::t('Contextual filter'),
           'lstitle' => static::t('contextual filter'),
+          'otitle' => 'Contextual filters',
           'plural' => 'arguments',
         ),
         'sort' => array(
@@ -451,6 +456,7 @@ public static function getHandlerTypes() {
           'ltitle' => static::t('sort criteria'),
           'stitle' => static::t('Sort criterion'),
           'lstitle' => static::t('sort criterion'),
+          'otitle' => 'Sort criteria',
           'plural' => 'sorts',
         ),
         'filter' => array(
@@ -458,6 +464,7 @@ public static function getHandlerTypes() {
           'ltitle' => static::t('filter criteria'),
           'stitle' => static::t('Filter criterion'),
           'lstitle' => static::t('filter criterion'),
+          'otitle' => 'filter criterion',
           'plural' => 'filters',
         ),
         'relationship' => array(
@@ -465,6 +472,7 @@ public static function getHandlerTypes() {
           'ltitle' => static::t('relationships'),
           'stitle' => static::t('Relationship'),
           'lstitle' => static::t('Relationship'),
+          'otitle' => 'Relationships',
           'plural' => 'relationships',
         ),
         'header' => array(
@@ -472,6 +480,7 @@ public static function getHandlerTypes() {
           'ltitle' => static::t('header'),
           'stitle' => static::t('Header'),
           'lstitle' => static::t('Header'),
+          'otitle' => 'Header',
           'plural' => 'header',
           'type' => 'area',
         ),
@@ -480,6 +489,7 @@ public static function getHandlerTypes() {
           'ltitle' => static::t('footer'),
           'stitle' => static::t('Footer'),
           'lstitle' => static::t('Footer'),
+          'otitle' => 'Footer',
           'plural' => 'footer',
           'type' => 'area',
         ),
@@ -488,6 +498,7 @@ public static function getHandlerTypes() {
           'ltitle' => static::t('no results behavior'),
           'stitle' => static::t('No results behavior'),
           'lstitle' => static::t('No results behavior'),
+          'otitle' => 'No results behavior',
           'plural' => 'empty',
           'type' => 'area',
         ),
diff --git a/core/modules/views_ui/config/install/tour.tour.views-ui.yml b/core/modules/views_ui/config/install/tour.tour.views-ui.yml
index 1b4e475..23d4328 100644
--- a/core/modules/views_ui/config/install/tour.tour.views-ui.yml
+++ b/core/modules/views_ui/config/install/tour.tour.views-ui.yml
@@ -44,7 +44,7 @@ tips:
     body: 'If this view uses fields, they are listed here. You can click on a field to configure it.'
     weight: 5
     attributes:
-      data-class: views-ui-display-tab-bucket.field
+      data-class: views-ui-display-tab-bucket.fields
   views-ui-filter:
     id: views-ui-filter
     plugin: text
@@ -52,7 +52,7 @@ tips:
     body: 'Add filters to limit the results in the output. E.g., to only show content that is <em>published</em>, you would add a filter for <em>Published</em> and select <em>Yes</em>.'
     weight: 6
     attributes:
-      data-class: views-ui-display-tab-bucket.filter
+      data-class: views-ui-display-tab-bucket.filter-criteria
   views-ui-filter-operations:
     id: views-ui-filter-operations
     plugin: text
@@ -60,7 +60,7 @@ tips:
     body: 'Add, rearrange or remove filters.'
     weight: 7
     attributes:
-      data-class: 'views-ui-display-tab-bucket.filter .dropbutton-widget'
+      data-class: 'views-ui-display-tab-bucket.filter-criteria .dropbutton-widget'
   views-ui-sorts:
     id: views-ui-sorts
     plugin: text
@@ -68,7 +68,7 @@ tips:
     body: 'Control the order in which the results are output. Click on an active sort rule to configure it.'
     weight: 8
     attributes:
-      data-class: views-ui-display-tab-bucket.sort
+      data-class: views-ui-display-tab-bucket.sort-criteria
   views-ui-sorts-operations:
     id: views-ui-sorts-operations
     plugin: text
@@ -76,7 +76,7 @@ tips:
     body: 'Add, rearrange or remove sorting rules.'
     weight: 9
     attributes:
-      data-class: 'views-ui-display-tab-bucket.sort .dropbutton-widget'
+      data-class: 'views-ui-display-tab-bucket.sort-criteria .dropbutton-widget'
   views-ui-preview:
     id: views-ui-preview
     plugin: text
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index 4933a3f..c9a609a 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -932,7 +932,7 @@ public function getFormBucket(ViewUI $view, $type, $display) {
     $build['#overridden'] = FALSE;
     $build['#defaulted'] = FALSE;
 
-    $build['#name'] = $type;
+    $build['#name'] = $types[$type]['otitle'];;
     $build['#title'] = $types[$type]['title'];
 
     $rearrange_url = Url::fromRoute('views_ui.form_rearrange', ['js' => 'nojs', 'view' => $view->id(), 'display_id' => $display['id'], 'type' => $type]);