diff --git a/core/modules/views/config/schema/views.access.schema.yml b/core/modules/views/config/schema/views.access.schema.yml
index bdc07a4..baed2b8 100644
--- a/core/modules/views/config/schema/views.access.schema.yml
+++ b/core/modules/views/config/schema/views.access.schema.yml
@@ -1,12 +1,11 @@
-views.access.*:
-  type: mapping
+# Schema for the views access plugins.
 
 views.access.none:
-  type: 'views.access.%'
+  type: string
   label: 'None'
 
 views.access.perm:
-  type: 'views.access.%'
+  type: mapping
   label: 'Permission'
   mapping:
     perm:
@@ -14,5 +13,8 @@ views.access.perm:
       label: 'Permission'
 
 views.access.role:
-  type: 'views.access.%'
+  type: sequence
   label: 'Role'
+  sequence:
+    - type: string
+      label: 'Role'
diff --git a/core/modules/views/config/schema/views.area.schema.yml b/core/modules/views/config/schema/views.area.schema.yml
index fd450e0..71fcbe0 100644
--- a/core/modules/views/config/schema/views.area.schema.yml
+++ b/core/modules/views/config/schema/views.area.schema.yml
@@ -1,17 +1,8 @@
-# Views area plugin: Drupal\views\Plugin\views\area\AreaPluginBase
-views.area.base:
-  type: 'views.handler.base'
-  mapping:
-    label:
-      type: label
-      label: 'A string to identify the area instance in the admin UI.'
-    empty:
-      type: boolean
-      label: 'Should the area be displayed on empty results.'
+# Schema for the views area plugins.
 
-# Views area plugin: Drupal\views\Plugin\views\area\Text
 views.area.text:
-  type: 'views.area.base'
+  type: views_area
+  label: ''
   mapping:
     content:
       type: text
@@ -23,9 +14,9 @@ views.area.text:
       type: boolean
       label: 'Should replacement tokens be used from the first row'
 
-# Views area plugin: Drupal\views\Plugin\views\area\TextCustom
 views.area.text_custom:
-  type: 'views.area.base'
+  type: views_area
+  label: ''
   mapping:
     content:
       type: text
@@ -34,26 +25,26 @@ views.area.text_custom:
       type: boolean
       label: 'Should replacement tokens be used from the first row'
 
-# Views area plugin: Drupal\views\Plugin\views\area\Result
 views.area.result:
-  type: 'views.area.base'
+  type: views_area
+  label: ''
   mapping:
     content:
       type: text
       label: 'The shown text of the result summary area'
 
 
-# Views area plugin: Drupal\views\Plugin\views\area\Title
 views.area.title:
-  type: 'views.area.base'
+  type: views_area
+  label: 'Title'
   mapping:
     title:
       type: label
       label: 'The title which will be overriden for the page'
 
-# Views area plugin: Drupal\views\Plugin\views\area\View
 views.area.view:
-  type: 'views.area.base'
+  type: views_area
+  label: 'View'
   mapping:
     view_to_insert:
       type: string
diff --git a/core/modules/views/config/schema/views.argument.schema.yml b/core/modules/views/config/schema/views.argument.schema.yml
index d7bffa5..99c5aea 100644
--- a/core/modules/views/config/schema/views.argument.schema.yml
+++ b/core/modules/views/config/schema/views.argument.schema.yml
@@ -1,99 +1,57 @@
-# Views argument plugin: Drupal\views\Plugin\views\argument\ArgumentPluginBase
-views.argument.*:
-  type: views.handler.base
-  mapping:
-    default_action:
-      type: string
-    exception:
-      type: mapping
-      mapping:
-        value:
-          type: string
-        title_enabled:
-          type: boolean
-        title:
-          type: label
-    title_enable:
-      type: boolean
-    title:
-      type: label
-    breadcrumb_enable:
-      type: boolean
-    breadcrumb:
-      type: label
-    default_argument_type:
-      type: string
-    default_argument_options:
-      type: 'views.argument_default.[%parent.default_argument_type]'
-    default_argument_skip_url:
-      type: boolean
-    summary_options:
-      type: 'views.style.[%parent.summary.format]'
-    summary:
-      type: mapping
-      mapping:
-        sort_order:
-          type: string
-        number_of_records:
-          type: integer
-        format:
-          type: string
-    specify_validation:
-      type: boolean
-    validate:
-      type: mapping
-      mapping:
-        type:
-          type: string
-        fail:
-          type: string
-    validate_options:
-      type: 'views.style.[%parent.validate.type]'
+# Schema for the views argument plugins.
 
-# Views argument plugin: Drupal\views\Plugin\views\argument\ManyToOne
 views.argument.many_to_one:
-  type: 'views.argument.base'
+  type: views_argument
   mapping:
     break_phrase:
       type: boolean
+      label: ''
     add_table:
       type: boolean
+      label: ''
     require_value:
       type: boolean
+      label: ''
 
-# Views argument plugin: Drupal\views\Plugin\views\argument\Null
 views.argument.null:
-  type: 'views.argument.base'
+  type: views_argument
   mapping:
     must_not_be:
       type: boolean
 
-# Views argument plugin: Drupal\views\Plugin\views\argument\Numeric
 views.argument.numeric:
-  type: 'views.argument.base'
+  type: views_argument
   mapping:
     break_phrase:
       type: boolean
     not:
       type: boolean
 
-# Views argument plugin: Drupal\views\Plugin\views\argument\String
 views.argument.string:
-  type: 'views.argument.base'
+  type: views_argument
+  label: ''
   mapping:
     glossary:
       type: boolean
+      label: ''
     limit:
       type: integer
+      label: ''
     case:
       type: string
+      label: ''
     path_case:
       type: string
+      label: ''
     transform_dash:
       type: boolean
+      label: ''
     break_phrase:
       type: boolean
+      label: ''
     add_table:
       type: boolean
+      label: ''
     require_value:
       type: boolean
+      label: ''
diff --git a/core/modules/views/config/schema/views.argument_default.schema.yml b/core/modules/views/config/schema/views.argument_default.schema.yml
index 8801199..ab2dc79 100644
--- a/core/modules/views/config/schema/views.argument_default.schema.yml
+++ b/core/modules/views/config/schema/views.argument_default.schema.yml
@@ -1,27 +1,28 @@
-# Views argument_default plugin: Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase
-views.argument_default.base:
-  type: mapping
-  mapping:
+# Schema for the views default arguments.
 
-# Views argument_default plugin: Drupal\views\Plugin\views\argument_default\Fixed
 views.argument_default.fixed:
-  type: views.argument_default.base
+  type: mapping
+  label: ''
   mapping:
     argument:
       type: string
+      label: ''
 
-# Views argument_default plugin: Drupal\views\Plugin\views\argument_default\Php
 views.argument_default.php:
-  type: views.argument_default.base
+  type: mapping
+  label: ''
   mapping:
     code:
       type: string
+      label: ''
 
-# Views argument_default plugin: Drupal\views\Plugin\views\argument_default\Raw
 views.argument_default.raw:
-  type: views.argument_default.base
+  type: mapping
+  label: ''
   mapping:
     index:
       type: string
+      label: ''
     use_alias:
       type: boolean
+      label: ''
diff --git a/core/modules/views/config/schema/views.argument_validator.schema.yml b/core/modules/views/config/schema/views.argument_validator.schema.yml
index 4fee333..865ff7b 100644
--- a/core/modules/views/config/schema/views.argument_validator.schema.yml
+++ b/core/modules/views/config/schema/views.argument_validator.schema.yml
@@ -1,11 +1,9 @@
-# Views argument_validator plugin: Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase
-views.argument_validator.base:
-  type: mapping
-  mapping:
+# Schema for the views argument validators.
 
-# Views argument_validator plugin: Drupal\views\Plugin\views\argument_validator\Php
 views.argument_validator.php:
-  type: views.argument_validator.base
+  type: mapping
+  label: ''
   mapping:
     code:
       type: text
+      label: ''
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 2a9d9b2..971712b 100644
--- a/core/modules/views/config/schema/views.data_types.schema.yml
+++ b/core/modules/views/config/schema/views.data_types.schema.yml
@@ -1,5 +1,5 @@
+# Basic data types for views.
 
-# Basic view display.
 views_display:
   type: mapping
   label: 'Display options'
@@ -143,3 +143,481 @@ views_sort:
     exposed:
       type: boolean
       label: 'Expose this sort to visitors, to allow them to change it'
+
+views_area:
+  type: views_handler
+  label: 'Area'
+  mapping:
+    label:
+      type: label
+      label: 'A string to identify the area instance in the admin UI.'
+    empty:
+      type: boolean
+      label: 'Should the area be displayed on empty results.'
+
+views_handler:
+  type: mapping
+  mapping:
+    id:
+      type: boolean
+      label: 'A unique ID per handler type'
+    table:
+      type: string
+      label: 'The views_data table for this handler'
+    field:
+      type: string
+      label: 'The views_data field for this handler'
+    relationship:
+      type: string
+      label: 'The ID of the relationship instance used by this handler'
+    group_type:
+      type: string
+      label: 'A sql aggregation type'
+    admin_label:
+      type: label
+      label: 'A string to identify the handler instance in the admin UI.'
+
+views_argument:
+  type: views_handler
+  label: 'Argument'
+  mapping:
+    default_action:
+      type: string
+      label: 'Default action'
+    exception:
+      type: mapping
+      label: 'Argument'
+      mapping:
+        value:
+          type: string
+          label: 'Value'
+        title_enabled:
+          type: boolean
+          label: ''
+        title:
+          type: label
+          label: 'Title'
+    title_enable:
+      type: boolean
+      label: ''
+    title:
+      type: label
+      label: 'Title'
+    breadcrumb_enable:
+      type: boolean
+      label: ''
+    breadcrumb:
+      type: label
+      label: ''
+    default_argument_type:
+      type: string
+      label: ''
+    default_argument_options:
+      type: views.argument_default.[%parent.default_argument_type]
+      label: 'Default argument options'
+    default_argument_skip_url:
+      type: boolean
+      label: ''
+    summary_options:
+      type: views.style.[%parent.summary.format]
+      label: 'Summary options'
+    summary:
+      type: mapping
+      label: 'Summary'
+      mapping:
+        sort_order:
+          type: string
+          label: 'Sort'
+        number_of_records:
+          type: integer
+          label: ''
+        format:
+          type: string
+          label: 'Format'
+    specify_validation:
+      type: boolean
+      label: ''
+    validate:
+      type: mapping
+      label: 'Validation'
+      mapping:
+        type:
+          type: string
+          label: 'Type'
+        fail:
+          type: string
+          label: 'Fail'
+    validate_options:
+      type: views.style.[%parent.validate.type]
+      label: 'Validate options'
+
+views_exposed_form:
+  type: mapping
+  mapping:
+    submit_button:
+      type: string
+      label: 'Submit button text'
+    reset_button:
+      type: boolean
+      label: 'Include reset button'
+    reset_button_label:
+      type: string
+      label: 'Reset button label'
+    exposed_sorts_label:
+      type: string
+      label: 'Exposed sorts label'
+    expose_sort_order:
+      type: boolean
+      label: 'Expose sort order'
+    sort_asc_label:
+      type: string
+      label: 'Ascending'
+    sort_desc_label:
+      type: string
+      label: 'Descending'
+
+views_field:
+  type: views_handler
+  mapping:
+    label:
+      type: label
+      label: 'Create a label'
+    exclude:
+      type: boolean
+      label: 'Exclude from display'
+    alter:
+      type: mapping
+      label: 'Rewrite results'
+      mapping:
+        contains:
+          type: mapping
+          label: ''
+          mapping:
+            alter_text:
+              type: boolean
+              label: 'Override the output of this field with custom text'
+            text:
+              type: text
+              label: 'Text'
+            make_link:
+              type: boolean
+              label: 'Output this field as a custom link'
+            path:
+              type: string
+              label: 'Link path'
+            absolute:
+              type: boolean
+              label: 'Use absolute path'
+            external:
+              type: boolean
+              label: 'External server URL'
+            replace_spaces:
+              type: boolean
+              label: 'Replace spaces with dashes'
+            path_case:
+              type: string
+              label: 'Transform the case'
+            trim_whitespace:
+              type: boolean
+              label: 'Remove whitespace'
+            alt:
+              type: string
+              label: 'Title text'
+            rel:
+              type: string
+              label: 'Rel Text'
+            link_class:
+              type: string
+              label: 'Link class'
+            prefix:
+              type: string
+              label: 'Prefix text'
+            suffix:
+              type: string
+              label: 'Suffix text'
+            target:
+              type: string
+              label: 'Target'
+            nl2br:
+              type: boolean
+              label: 'Convert newlines to HTML <br> tags'
+            max_length:
+              type: string
+              label: 'Maximum number of characters'
+            word_boundary:
+              type: boolean
+              label: 'Trim only on a word boundary'
+            ellipsis:
+              type: boolean
+              label: 'Add "..." at the end of trimmed text'
+            more_link:
+              type: boolean
+              label: 'Add a read-more link if output is trimmed.'
+            more_link_text:
+              type: string
+              label: 'More link label'
+            more_link_path:
+              type: string
+              label: 'More link path'
+            strip_tags:
+              type: boolean
+              label: 'Strip HTML tags'
+            trim:
+              type: boolean
+              label: 'Trim this field to a maximum number of characters'
+            preserve_tags:
+              type: string
+              label: 'Preserve certain tags'
+            html:
+              type: boolean
+              label: 'Field can contain HTML'
+    element_type:
+      type: string
+      label: 'HTML element'
+    element_class:
+      type: string
+      label: 'CSS class'
+    element_label_type:
+      type: string
+      label: 'Label HTML element'
+    element_label_class:
+      type: string
+      label: 'CSS class'
+    element_label_colon:
+      type: boolean
+      label: ''
+    element_wrapper_type:
+      type: string
+      label: 'Wrapper HTML element'
+    element_wrapper_class:
+      type: string
+      label: 'CSS class'
+    element_default_classes:
+      type: boolean
+      label: 'Add default classes'
+    empty:
+      type: string
+      label: 'No results text'
+    hide_empty:
+      type: boolean
+      label: 'Hide if empty'
+    empty_zero:
+      type: boolean
+      label: 'Count the number 0 as empty'
+    hide_alter_empty:
+      type: boolean
+      label: 'Hide rewriting if empty'
+
+views_pager:
+  type: mapping
+  label: 'Pager'
+  mapping:
+    offset:
+      type: integer
+      label: 'Offset'
+
+views_pager_sql:
+  type: views_pager
+  label: 'SQL pager'
+  mapping:
+    items_per_page:
+      type: integer
+      label: 'Items per page'
+    total_pages:
+      type: integer
+      label: 'Number of pages'
+    id:
+      type: integer
+      label: 'Pager ID'
+    tags:
+      type: mapping
+      label: 'Pager link labels'
+      mapping:
+        next:
+          type: string
+          label: 'Next page link text'
+        previous:
+          type: string
+          label: 'Previous page link text'
+    expose:
+      type: mapping
+      label: 'Exposed options'
+      mapping:
+        items_per_page_label:
+          type: boolean
+          label: 'Items per page label'
+        items_per_page_options:
+          type: string
+          label: 'Exposed items per page options'
+        items_per_page_options_all:
+          type: boolean
+          label: 'Include all items option'
+        items_per_page_options_all_label:
+          type: string
+          label: 'All items label'
+        offset:
+          type: boolean
+          label: 'Expose Offset'
+        offset_label:
+          type: string
+          label: 'Offset label'
+
+views_sort:
+  type: mapping
+  mapping:
+    field:
+      type: string
+      label: 'Field name'
+    id:
+      type: string
+      label: 'Field ID'
+    order:
+      type: string
+      label: 'Order'
+    table:
+      type: string
+      label: 'Table name'
+    plugin_id:
+      type: string
+      label: 'Plugin ID'
+
+views_style:
+  type: mapping
+  mapping:
+    grouping:
+      type: sequence
+      label: 'Grouping field number %i'
+      sequence:
+        - type: mapping
+          label: 'Field'
+          mapping:
+            field:
+              type: string
+              label: 'Field'
+            rendered:
+              type: boolean
+              label: 'Use rendered output to group rows'
+            rendered_strip:
+              type: boolean
+              label: 'Remove tags from rendered output'
+    row_class:
+      type: string
+      label: 'Row class'
+    default_row_class:
+      type: boolean
+      label: 'Add views row classes'
+    row_class_special:
+      type: boolean
+      label: 'Add striping (odd/even), first/last row classes'
+    uses_fields:
+      type: boolean
+      label: 'Force using fields'
+
+views_filter:
+  type: views_handler
+  mapping:
+    operator:
+      type: string
+      label: 'Operator'
+    value:
+      type: string
+      label: 'Value'
+    group:
+      type: string
+      label: 'Group'
+    exposed:
+      type: boolean
+      label: 'Expose this filter to visitors, to allow them to change it'
+    expose:
+      type: mapping
+      label: 'Expose'
+      mapping:
+        operator_id:
+          type: string
+          label: 'Operator identifier'
+        label:
+          type: label
+          label: 'Label'
+        description:
+          type: label
+          label: 'Description'
+        use_operator:
+          type: boolean
+          label: 'Expose operator'
+        operator:
+          type: string
+          label: 'Operator'
+        identifier:
+          type: string
+          label: 'Filter identifier'
+        required:
+          type: boolean
+          label: 'Required'
+        remember:
+          type: boolean
+          label: 'Remember the last selection'
+        multiple:
+          type: boolean
+          label: ''
+        remember_roles:
+          type: sequence
+          label: 'User roles'
+          sequence:
+            - type: string
+              label: 'Role'
+    is_grouped:
+      type: boolean
+      label: 'Grouped filters'
+    group_info:
+      type: mapping
+      label: 'Group'
+      mapping:
+        label:
+          type: label
+          label: 'Label'
+        description:
+          type: label
+          label: 'Description'
+        identifier:
+          type: string
+          label: ''
+        optional:
+          type: boolean
+          label: ''
+        widget:
+          type: string
+          label: 'Widget type'
+        multiple:
+          type: boolean
+          label: 'Allow multiple selections'
+        remember:
+          type: integer
+          label: 'Remember'
+        default_group:
+          type: string
+          label: 'Default'
+        default_group_multiple:
+          type: sequence
+          label: 'Defaults'
+          sequence:
+            - type: integer
+              label: 'Default'
+        group_items:
+          type: views.filter.group_items.[plugin_id]
+          label: 'Group items'
+    plugin_id:
+      type: string
+      label: 'Plugin ID'
+    filter_groups:
+      type: mapping
+      label: 'Groups'
+      mapping:
+        operator:
+          type: string
+          label: 'Operator'
+        groups:
+          type: sequence
+          label: 'Groups'
+          sequence:
+            - type: string
+              label: 'Operator'
diff --git a/core/modules/views/config/schema/views.exposed_form.schema.yml b/core/modules/views/config/schema/views.exposed_form.schema.yml
index 3e005a4..c2877fe 100644
--- a/core/modules/views/config/schema/views.exposed_form.schema.yml
+++ b/core/modules/views/config/schema/views.exposed_form.schema.yml
@@ -1,38 +1,11 @@
-# Views exposed form plugin: Drupal\views\Plugin\views\exposed_form\ExposedFormPluginBase
-views.exposed_form.*:
-  type: mapping
-  mapping:
-    submit_button:
-      type: string
-      label: 'Submit button text'
-    reset_button:
-      type: boolean
-      label: 'Include reset button'
-    reset_button_label:
-      type: string
-      label: 'Reset button label'
-    exposed_sorts_label:
-      type: string
-      label: 'Exposed sorts label'
-    expose_sort_order:
-      type: boolean
-      label: 'Expose sort order'
-    sort_asc_label:
-      type: string
-      label: 'Ascending'
-    sort_desc_label:
-      type: string
-      label: 'Descending'
-
+# Schema for the views exposed form.
 
-# Views exposed form plugin: Drupal\views\Plugin\views\exposed_form\Basic
 views.exposed_form.basic:
-  type: 'views.exposed_form.%'
+  type: views_exposed_form
   label: 'Basic'
 
-# Views exposed form plugin: Drupal\views\Plugin\views\exposed_form\InputRequired
 views.exposed_form.input_required:
-  type: 'views.exposed_form.%'
+  type: views_exposed_form
   label: 'Input required'
   mapping:
     text_input_required:
diff --git a/core/modules/views/config/schema/views.field.schema.yml b/core/modules/views/config/schema/views.field.schema.yml
index 2fc5444..3865484 100644
--- a/core/modules/views/config/schema/views.field.schema.yml
+++ b/core/modules/views/config/schema/views.field.schema.yml
@@ -1,224 +1,164 @@
-# Views field plugin: Drupal\views\Plugin\views\field\FieldPluginBase
-views.field.base:
-  type: 'views.handler.base'
-  mapping:
-    label:
-      type: string
-    exclude:
-      type: boolean
-    alter:
-      type: mapping
-      mapping:
-        contains:
-          type: mapping
-          mapping:
-            alter_text:
-              type: boolean
-            text:
-              type: string
-            make_link:
-              type: boolean
-            path:
-              type: string
-            absolute:
-              type: boolean
-            external:
-              type: boolean
-            replace_spaces:
-              type: boolean
-            path_case:
-              type: string
-            trim_whitespace:
-              type: boolean
-            alt:
-              type: string
-            rel:
-              type: string
-            link_class:
-              type: string
-            prefix:
-              type: string
-            suffix:
-              type: string
-            target:
-              type: string
-            nl2br:
-              type: boolean
-            max_length:
-              type: string
-            word_boundary:
-              type: boolean
-            ellipsis:
-              type: boolean
-            more_link:
-              type: boolean
-            more_link_text:
-              type: string
-            more_link_path:
-              type: string
-            strip_tags:
-              type: boolean
-            trim:
-              type: boolean
-            preserve_tags:
-              type: string
-            html:
-              type: boolean
-    element_type:
-      type: string
-    element_class:
-      type: string
-    element_label_type:
-      type: string
-    element_label_class:
-      type: string
-    element_label_colon:
-      type: boolean
-    element_wrapper_type:
-      type: string
-    element_wrapper_class:
-      type: string
-    element_default_classes:
-      type: boolean
-    empty:
-      type: string
-    hide_empty:
-      type: boolean
-    empty_zero:
-      type: boolean
-    hide_alter_empty:
-      type: boolean
+# Schema for the views field plugins.
 
-# Views field plugin: Drupal\views\Plugin\views\field\Boolean
 views.field.boolean:
-  type: 'views.field.base'
+  type: views_field
+  label: 'Boolean'
   mapping:
     type:
       type: string
+      label: 'Type'
     type_custom_true:
       type: string
+      label: ''
     type_custom_false:
       type: string
+      label: ''
     not:
       type: string
+      label: ''
 
-# Views field plugin: Drupal\views\Plugin\views\field\Broken
 views.field.broken:
-  type: 'views.field.base'
-  mapping:
+  type: views_field
+  label: ''
 
-# Views field plugin: Drupal\views\Plugin\views\field\Counter
 views.field.counter:
-  type: 'views.field.base'
+  type: views_field
+  label: 'Counter'
   mapping:
     counter_start:
       type: integer
+      label: ''
 
-# Views field plugin: Drupal\views\Plugin\views\field\Custom
 views.field.custom:
-  type: 'views.field.base'
+  type: views_field
+  label: 'Custom'
   mapping:
     alter:
       type: mapping
+      label: ''
       mapping:
         contains:
           type: mapping
+          label: ''
           mapping:
             alter_text:
               type: boolean
+              label: ''
     hide_alter_empty:
       type: boolean
+      label: ''
 
-# Views field plugin: Drupal\views\Plugin\views\field\Date
 views.field.date:
-  type: 'views.field.base'
+  type: views_field
+  label: ''
   mapping:
     date_format:
       type: string
+      label: ''
     custom_date_format:
       type: string
+      label: ''
     timezone:
       type: string
+      label: ''
 
-# Views field plugin: Drupal\views\Plugin\views\field\FileSize
 views.field.file_size:
-  type: 'views.field.base'
+  type: views_field
+  label: ''
   mapping:
     file_size_display:
       type: string
+      label: ''
 
-# Views field plugin: Drupal\views\Plugin\views\field\Links
 views.field.links:
-  type: 'views.field.base'
+  type: views_field
+  label: ''
   mapping:
     fields:
       type: string
+      label: ''
     destination:
       type: boolean
+      label: ''
 
-# Views field plugin: Drupal\views\Plugin\views\field\MachineName
 views.field.machine_name:
-  type: 'views.field.base'
+  type: views_field
+  label: 'Machine name'
   mapping:
     machine_name:
       type: boolean
+      label: ''
 
-# Views field plugin: Drupal\views\Plugin\views\field\Numeric
 views.field.numeric:
-  type: 'views.field.base'
+  type: views_field
+  label: 'Numeric'
   mapping:
     set_precision:
       type: boolean
+      label: ''
     precision:
       type: integer
+      label: ''
     decimal:
       type: string
+      label: ''
     separator:
       type: string
+      label: ''
     format_plural:
       type: boolean
+      label: ''
     format_plural_singular:
       type: string
+      label: ''
     format_plural_plural:
       type: string
+      label: ''
     prefix:
       type: string
+      label: ''
     suffix:
       type: string
+      label: ''
 
-# Views field plugin: Drupal\views\Plugin\views\field\PrerenderList
 views.field.prerender_list:
-  type: 'views.field.base'
+  type: views_field
+  label: ''
   mapping:
     type:
       type: string
+      label: ''
     separator:
       type: string
+      label: ''
 
-# Views field plugin: Drupal\views\Plugin\views\field\Serialized
 views.field.serialized:
-  type: 'views.field.base'
+  type: views_field
+  label: 'Serialized'
   mapping:
     format:
       type: string
+      label: ''
     key:
       type: string
+      label: ''
 
-# Views field plugin: Drupal\views\Plugin\views\field\Standard
 views.field.standart:
-  type: 'views.field.base'
-  mapping:
+  type: views_field
+  label: 'Standart'
 
-# Views field plugin: Drupal\views\Plugin\views\field\TimeInterval
 views.field.time_interval:
-  type: 'views.field.base'
+  type: views_field
+  label: 'Time interval'
   mapping:
     granularity:
       type: integer
+      label: ''
 
-# Views field plugin: Drupal\views\Plugin\views\field\Url
 views.field.url:
-  type: 'views.field.base'
+  type: views_field
+  label: 'URL'
   mapping:
     display_as_link:
       type: boolean
+      label: ''
diff --git a/core/modules/views/config/schema/views.filter.schema.yml b/core/modules/views/config/schema/views.filter.schema.yml
index b239609..adac3d4 100644
--- a/core/modules/views/config/schema/views.filter.schema.yml
+++ b/core/modules/views/config/schema/views.filter.schema.yml
@@ -1,172 +1,142 @@
-# Views filter plugin: Drupal\views\Plugin\views\filter\FilterPluginBase
-views.filter.base:
-  type: 'views.handler.base'
-  mapping:
-    operator:
-      type: string
-    value:
-      type: string
-    group:
-      type: string
-    exposed:
-      type: boolean
-    expose:
-      type: mapping
-      mapping:
-        contains:
-          type: mapping
-          mapping:
-            operator_id:
-              type: string
-            label:
-              type: string
-            description:
-              type: string
-            use_operator:
-              type: boolean
-            operator:
-              type: string
-            identifier:
-              type: string
-            required:
-              type: boolean
-            remember:
-              type: boolean
-            multiple:
-              type: boolean
-            remember_roles:
-              type: string
-    is_grouped:
-      type: boolean
-    group_info:
-      type: mapping
-      mapping:
-        contains:
-          type: mapping
-          mapping:
-            label:
-              type: string
-            description:
-              type: string
-            identifier:
-              type: string
-            optional:
-              type: boolean
-            widget:
-              type: string
-            multiple:
-              type: boolean
-            remember:
-              type: integer
-            default_group:
-              type: string
-            default_group_multiple:
-              type: string
-            group_items:
-              type: string
+# Schema for the views filter plugins.
 
-# Views filter plugin: Drupal\views\Plugin\views\filter\BooleanOperator
-views.filter.boolean_operator:
-  type: views.filter.base
+views_filter_boolean:
+  type: views_filter
   mapping:
     value:
       type: boolean
 
-# Views filter plugin: Drupal\views\Plugin\views\filter\BooleanOperatorString
-views.filter.boolean_operator_string:
-  type: views.filter.boolean_operator
+views_filter_boolean_string:
+  type: views_filter_boolean
 
-# Views filter plugin: Drupal\views\Plugin\views\filter\Broken
 views.filter.broken:
-  type: views.filter.base
+  type: views_filter
+  label: 'Broken'
 
-# Views filter plugin: Drupal\views\Plugin\views\filter\Bundle
 views.filter.bundle:
   type: views.filter.in_operator
+  label: 'Broken'
 
-# Views filter plugin: Drupal\views\Plugin\views\filter\Combine
 views.filter.combine:
   type: views.filter.string
+  label: 'Combine'
   mapping:
     fields:
       type: sequence
-      seqence:
+      label: ''
+      sequence:
         - type: views.field
+          label: ''
 
-# Views filter plugin: Drupal\views\Plugin\views\filter\Date
 views.filter.date:
   type: views.filter.numeric
+  label: 'Date'
   mapping:
     fields:
       type: sequence
-      seqence:
+      label: ''
+      sequence:
         - type: views.field
+          label: ''
 
-# Views filter plugin: Drupal\views\Plugin\views\filter\InOperator
 views.filter.in_operator:
-  type: views.filter.base
+  type: views_filter
+  label: ''
   mapping:
     operator:
       type: string
+      label: ''
     value:
       type: sequence
+      label: ''
       sequence:
         - type: string
+          label: ''
     expose:
       type: mapping
+      label: ''
       mapping:
         contains:
           type: mapping
+          label: ''
           mapping:
             reduce:
               type: boolean
+              label: ''
 
-# Views filter plugin: Drupal\views\Plugin\views\filter\String
 views.filter.string:
-  type: views.filter.base
+  type: views_filter
+  label: 'String'
   mapping:
     expose:
       type: mapping
+      label: ''
       mapping:
         contains:
           type: mapping
+          label: ''
           mapping:
             required:
               type: boolean
+              label: ''
 
-# Views filter plugin: Drupal\views\Plugin\views\filter\Numeric
 views.filter.numeric:
-  type: views.filter.base
+  type: views_filter
+  label: 'Numeric'
   mapping:
     value:
       type: mapping
+      label: ''
       mapping:
         contains:
           type: mapping
+          label: ''
           mapping:
             min:
               type: string
+              label: ''
             max:
               type: string
+              label: ''
             value:
               type: string
+              label: ''
 
-# Views filter plugin: Drupal\views\Plugin\views\filter\Equality
 views.filter.equality:
-  type: views.filter.base
+  type: views_filter
+  label: 'Broken'
 
-# Views filter plugin: Drupal\views\Plugin\views\filter\GroupByNumeric
 views.filter.equality:
   type: views.filter.numeric
+  label: 'Broken'
 
-# Views filter plugin: Drupal\views\Plugin\views\filter\ManyToOne
 views.filter.many_to_one:
   type: views.filter.in_operator
+  label: 'Many to one'
   mapping:
     operator:
       type: string
+      label: ''
     value:
       type: sequence
+      label: ''
       sequence:
         - type: string
+          label: ''
 
+views.filter.group_items.string:
+  type: sequence
+  label: 'Group items'
+  sequence:
+    - type: mapping
+      label: 'Group item'
+      mapping:
+        title:
+          type: label
+          label: 'Label'
+        operator:
+          type: string
+          label: 'Operator'
+        value:
+          type: label
+          label: 'Value'
diff --git a/core/modules/views/config/schema/views.handler.schema.yml b/core/modules/views/config/schema/views.handler.schema.yml
index 256a227..da77e8d 100644
--- a/core/modules/views/config/schema/views.handler.schema.yml
+++ b/core/modules/views/config/schema/views.handler.schema.yml
@@ -1,22 +1 @@
-# Views handler: Drupal\views\Plugin\views\HandlerBase
-views.handler.base:
-  type: mapping
-  mapping:
-    id:
-      type: boolean
-      label: 'A unique ID per handler type'
-    table:
-      type: string
-      label: 'The views_data table for this handler'
-    field:
-      type: string
-      label: 'The views_data field for this handler'
-    relationship:
-      type: string
-      label: 'The ID of the relationship instance used by this handler'
-    group_type:
-      type: string
-      label: 'A sql aggregation type'
-    admin_label:
-      type: label
-      label: 'A string to identify the handler instance in the admin UI.'
+# Schema for the views handler plugins.
diff --git a/core/modules/views/config/schema/views.pager.schema.yml b/core/modules/views/config/schema/views.pager.schema.yml
index b888eef..b90f794 100644
--- a/core/modules/views/config/schema/views.pager.schema.yml
+++ b/core/modules/views/config/schema/views.pager.schema.yml
@@ -1,86 +1,32 @@
-# Views pager plugin: Drupal\views\Plugin\views\pager\PagerPluginBase
-views.pager.*:
-  type: mapping
-  mapping:
-    offset:
-      type: integer
-      label: 'Offset'
+# Schema for the views pager plugins.
 
-# Views pager plugin: Drupal\views\Plugin\views\pager\PagerPluginBase
-views.pager.sql_base:
-  type: 'views.pager.%'
-  mapping:
-    items_per_page:
-      type: integer
-      label: 'Items per page'
-    total_pages:
-      type: integer
-      label: 'Number of pages'
-    id:
-      type: integer
-      label: 'Pager ID'
-    tags:
-      type: mapping
-      label: 'Pager link labels'
-      mapping:
-        next:
-          type: string
-          label: 'Next page link text'
-        previous:
-          type: string
-          label: 'Previous page link text'
-    expose:
-      type: mapping
-      label: 'Exposed options'
-      mapping:
-        items_per_page_label:
-          type: boolean
-          label: 'Items per page label'
-        items_per_page_options:
-          type: string
-          label: 'Exposed items per page options'
-        items_per_page_options_all:
-          type: boolean
-          label: 'Include all items option'
-        items_per_page_options_all_label:
-          type: string
-          label: 'All items label'
-        offset:
-          type: boolean
-          label: 'Expose Offset'
-        offset_label:
-          type: string
-          label: 'Offset label'
-
-# Views pager plugin:  Drupal\views\Plugin\views\pager\None
 views.pager.none:
-  type: 'views.pager.%'
+  type: views_pager
   label: 'Display all items'
 
-# Views pager plugin:  Drupal\views\Plugin\views\pager\Some
 views.pager.some:
-  type: 'views.pager.%'
+  type: views_pager
   label: 'Display a specified number of items'
   mapping:
     items_per_page:
       type: integer
       label: 'Items per page'
 
-# Views pager plugin:  Drupal\views\Plugin\views\pager\Mini
 views.pager.mini:
-  type: 'views.pager.sql_base'
+  type: views_pager_sql
   label: 'Paged output, mini pager'
 
-# Views pager plugin:  Drupal\views\Plugin\views\pager\Full
 views.pager.full:
-  type: 'views.pager.sql_base'
+  type: views_pager_sql
   label: 'Paged output, full pager'
   mapping:
     tags:
+      type: mapping
+      label: 'Tags'
       mapping:
         first:
-          type: string
+          type: label
           label: 'First page link text'
         last:
-          type: string
+          type: label
           label: 'Last page link text'
diff --git a/core/modules/views/config/schema/views.sort.schema.yml b/core/modules/views/config/schema/views.sort.schema.yml
index d99256d..3724062 100644
--- a/core/modules/views/config/schema/views.sort.schema.yml
+++ b/core/modules/views/config/schema/views.sort.schema.yml
@@ -1,26 +1,9 @@
+# Schema for the views sort plugins.
+
 views.sort.boolean:
-  type: views.sort.%
+  type: views_sort
   label: 'Boolean sort'
 
-  views.sort.date:
-  type: views.sort.base
+views.sort.date:
+  type: views_sort
   label: 'Date sort'
-
-views.sort.*:
-  type: mapping
-  mapping:
-    field:
-      type: string
-      label: 'Field name'
-    id:
-      type: string
-      label: 'Field ID'
-    order:
-      type: string
-      label: 'Order'
-    table:
-      type: string
-      label: 'Table name'
-    plugin_id:
-      type: string
-      label: 'Plugin ID'
diff --git a/core/modules/views/config/schema/views.style.schema.yml b/core/modules/views/config/schema/views.style.schema.yml
index de66140..11a63fb 100644
--- a/core/modules/views/config/schema/views.style.schema.yml
+++ b/core/modules/views/config/schema/views.style.schema.yml
@@ -1,41 +1,11 @@
-views.style.*:
-  type: mapping
-  mapping:
-    grouping:
-      type: sequence
-      label: 'Grouping field number %i'
-      sequence:
-        - type: mapping
-          label: 'Field'
-          mapping:
-            field:
-              type: string
-              label: 'Field'
-            rendered:
-              type: boolean
-              label: 'Use rendered output to group rows'
-            rendered_strip:
-              type: boolean
-              label: 'Remove tags from rendered output'
-    row_class:
-      type: string
-      label: 'Row class'
-    default_row_class:
-      type: boolean
-      label: 'Add views row classes'
-    row_class_special:
-      type: boolean
-      label: 'Add striping (odd/even), first/last row classes'
-    uses_fields:
-      type: boolean
-      label: 'Force using fields'
+# Schema for the views style plugins.
 
 views.style.default:
-  type: 'views.style.%'
+  type: views_style
   label: 'Unformatted list'
 
 views.style.html_list:
-  type: 'views.style.%'
+  type: views_style
   label: 'HTML List'
   mapping:
     type:
@@ -49,7 +19,7 @@ views.style.html_list:
       label: 'List class'
 
 views.style.grid:
-  type: 'views.style.%'
+  type: views_style
   label: 'Grid'
   mapping:
     columns:
@@ -66,7 +36,7 @@ views.style.grid:
       label: 'Table summary'
 
 views.style.table:
-  type: 'views.style.%'
+  type: views_style
   label: 'Table'
   mapping:
     columns: