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 23d4328..1b4e475 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.fields
+      data-class: views-ui-display-tab-bucket.field
   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-criteria
+      data-class: views-ui-display-tab-bucket.filter
   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-criteria .dropbutton-widget'
+      data-class: 'views-ui-display-tab-bucket.filter .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-criteria
+      data-class: views-ui-display-tab-bucket.sort
   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-criteria .dropbutton-widget'
+      data-class: 'views-ui-display-tab-bucket.sort .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 cdacd9c..4933a3f 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -556,7 +556,7 @@ public function getDisplayDetails($view, $display) {
         $build['columns'][$column][$id] = $bucket['build'];
         $build['columns'][$column][$id]['#theme_wrappers'][] = 'views_ui_display_tab_bucket';
         $build['columns'][$column][$id]['#title'] = !empty($bucket['title']) ? $bucket['title'] : '';
-        $build['columns'][$column][$id]['#name'] = !empty($bucket['title']) ? $bucket['title'] : $id;
+        $build['columns'][$column][$id]['#name'] = $id;
       }
     }
 
@@ -932,7 +932,8 @@ public function getFormBucket(ViewUI $view, $type, $display) {
     $build['#overridden'] = FALSE;
     $build['#defaulted'] = FALSE;
 
-    $build['#name'] = $build['#title'] = $types[$type]['title'];
+    $build['#name'] = $type;
+    $build['#title'] = $types[$type]['title'];
 
     $rearrange_url = Url::fromRoute('views_ui.form_rearrange', ['js' => 'nojs', 'view' => $view->id(), 'display_id' => $display['id'], 'type' => $type]);
     $class = 'icon compact rearrange';