diff --git a/core/modules/views/config/schema/views.argument.schema.yml b/core/modules/views/config/schema/views.argument.schema.yml
index d3882e4..92aa477 100644
--- a/core/modules/views/config/schema/views.argument.schema.yml
+++ b/core/modules/views/config/schema/views.argument.schema.yml
@@ -86,7 +86,7 @@ views.argument.date:
       label: 'Node Update Time'
 
 views.argument.date_day:
-  type: views_argument
+  type: views.argument.date
   label: 'Day Date'
   mapping:
     day:
@@ -105,7 +105,7 @@ views.argument.formula:
       label: 'Formula Used'
 
 views.argument.date_fulldate:
-  type: views_argument
+  type: views.argument.date
   label: 'Full Date'
   mapping:
     created:
@@ -117,7 +117,7 @@ views.argument.groupby_numeric:
   label: 'Group by Numeric'
 
 views.argument.date_month:
-  type: views_argument
+  type: views.argument.date
   label: 'Month Date'
   mapping:
     month:
@@ -129,15 +129,15 @@ views.argument.standard:
   label: 'Standard'
 
 views.argument.date_week:
-  type: views_argument
+  type: views.argument.date
   label: 'Week Date'
 
 views.argument.date_year:
-  type: views_argument
+  type: views.argument.date
   label: 'Year Date'
 
 views.argument.date_year_month:
-  type: views_argument
+  type: views.argument.date
   label: 'YearMonthDate'
   mapping:
     created:
diff --git a/core/modules/views/config/schema/views.data_types.schema.yml b/core/modules/views/config/schema/views.data_types.schema.yml
index 65697f2..4f3a87e 100644
--- a/core/modules/views/config/schema/views.data_types.schema.yml
+++ b/core/modules/views/config/schema/views.data_types.schema.yml
@@ -258,6 +258,13 @@ views_sort:
       type: string
       label: 'Plugin ID'
 
+views_sort_expose:
+  type: mapping
+  mapping:
+    label:
+      type: label
+      label: 'Label'
+
 views_area:
   type: views_handler
   label: 'Area'
diff --git a/core/modules/views/config/schema/views.filter.schema.yml b/core/modules/views/config/schema/views.filter.schema.yml
index 6af73f7..4f4f77a 100644
--- a/core/modules/views/config/schema/views.filter.schema.yml
+++ b/core/modules/views/config/schema/views.filter.schema.yml
@@ -132,3 +132,11 @@ views.filter.group_items.string:
 views.filter.group_items.boolean:
   type: views_filter_group_items
   label: 'Group items'
+
+# Schema for the views filter value.
+
+views.filter_value.boolean:
+  type: boolean
+
+views.filter_value.combine:
+  type: string
diff --git a/core/modules/views/config/schema/views.filter_value.schema.yml b/core/modules/views/config/schema/views.filter_value.schema.yml
deleted file mode 100644
index 3b21b88..0000000
--- a/core/modules/views/config/schema/views.filter_value.schema.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Schema for the views filter value.
-
-views.filter_value.boolean:
-  type: boolean
-
-views.filter_value.combine:
-  type: string
diff --git a/core/modules/views/config/schema/views.sort.schema.yml b/core/modules/views/config/schema/views.sort.schema.yml
index 757411f..e61c3d2 100644
--- a/core/modules/views/config/schema/views.sort.schema.yml
+++ b/core/modules/views/config/schema/views.sort.schema.yml
@@ -28,3 +28,24 @@ views.sort.standard:
   type: views_sort
   label: 'Standard'
 
+# Schema for the views sort expose.
+
+views.sort_expose.boolean:
+  type: views_sort_expose
+  label: 'Boolean sort expose settings'
+
+views.sort_expose.date:
+  type: views_sort_expose
+  label: 'Date sort expose settings'
+
+views.sort_expose.standard:
+  type: views_sort_expose
+  label: 'Standard sort expose settings'
+  mapping:
+    order:
+      type: string
+      label: 'Order'
+
+views.sort_expose.random:
+  type: views.sort_expose.standard
+  label: 'Random sort expose settings'
diff --git a/core/modules/views/config/schema/views.sort_expose.schema.yml b/core/modules/views/config/schema/views.sort_expose.schema.yml
deleted file mode 100644
index 3e14af3..0000000
--- a/core/modules/views/config/schema/views.sort_expose.schema.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Schema for the views sort expose.
-
-views_sort_expose:
-  type: mapping
-  mapping:
-    label:
-      type: label
-      label: 'Label'
-
-views.sort_expose.boolean:
-  type: views_sort_expose
-  label: 'Boolean sort expose settings'
-
-views.sort_expose.date:
-  type: views_sort_expose
-  label: 'Date sort expose settings'
-
-views.sort_expose.random:
-  type: views_sort_expose
-  label: 'Random sort expose settings'
-  mapping:
-    order:
-      type: string
-      label: 'Order'
-
-views.sort_expose.standard:
-  type: views_sort_expose
-  label: 'Standard sort expose settings'
-  mapping:
-    order:
-      type: string
-      label: 'Order'