diff --git a/core/config/schema/core.entity.schema.yml b/core/config/schema/core.entity.schema.yml
index 0de5215..6acd1e6 100644
--- a/core/config/schema/core.entity.schema.yml
+++ b/core/config/schema/core.entity.schema.yml
@@ -68,7 +68,7 @@ core.entity_view_display.*.*.*:
       label: 'View or form mode machine name'
     content:
       type: sequence
-      label: 'Field display formatters'
+      label: 'Field formatters'
       sequence:
         - type: mapping
           label: 'Field formatter'
@@ -88,7 +88,7 @@ core.entity_view_display.*.*.*:
                type: string
                label: 'Label setting machine name'
             settings:
-              type: formatter.settings.[%parent.type]
+              type: field.formatter.settings.[%parent.type]
               label: 'Settings'
     hidden:
       type: sequence
@@ -124,14 +124,14 @@ core.entity_form_display.*.*.*:
       label: 'Enabled'
     content:
       type: sequence
-      label: 'Field display formatters'
+      label: 'Field widgets'
       sequence:
         - type: mapping
-          label: 'Field formatter'
+          label: 'Field widget'
           mapping:
             type:
               type: string
-              label: 'Format type machine name'
+              label: 'Widget type machine name'
             weight:
               type: integer
               label: 'Weight'
@@ -141,7 +141,7 @@ core.entity_form_display.*.*.*:
               sequence:
                 - type: entity_form_display.third_party.[%key]
             settings:
-              type: widget.settings.[%parent.type]
+              type: field.widget.settings.[%parent.type]
               label: 'Settings'
     hidden:
       type: sequence
@@ -156,14 +156,14 @@ core.entity_form_display.*.*.*:
         - type: entity_form_display.third_party.[%key]
 
 # Default schema for entity display field with undefined type.
-formatter.settings.*:
+field.formatter.settings.*:
   type: mapping
 
 # Default schema for entity form display field with undefined type.
-widget.settings.*:
+field.widget.settings.*:
   type: mapping
 
-widget.settings.string_textfield:
+field.widget.settings.string_textfield:
   type: mapping
   label: 'Text field display format settings'
   mapping:
@@ -174,7 +174,7 @@ widget.settings.string_textfield:
       type: label
       label: 'Placeholder'
 
-widget.settings.string_textarea:
+field.widget.settings.string_textarea:
   type: mapping
   label: 'Textarea display format settings'
   mapping:
@@ -185,7 +185,7 @@ widget.settings.string_textarea:
       type: label
       label: 'Placeholder'
 
-widget.settings.email_default:
+field.widget.settings.email_default:
   type: mapping
   label: 'Email field display format settings'
   mapping:
@@ -193,11 +193,11 @@ widget.settings.email_default:
       type: label
       label: 'Placeholder'
 
-widget.settings.datetime_timestamp:
+field.widget.settings.datetime_timestamp:
   type: mapping
   label: 'Datetime timestamp display format settings'
 
-widget.settings.boolean_checkbox:
+field.widget.settings.boolean_checkbox:
   type: mapping
   label: 'Boolean checkbox display format settings'
   mapping:
@@ -205,11 +205,11 @@ widget.settings.boolean_checkbox:
       type: boolean
       label: 'Display label'
 
-widget.settings.hidden:
+field.widget.settings.hidden:
   type: mapping
   label: '- Hidden - format settings'
 
-widget.settings.number:
+field.widget.settings.number:
   type: mapping
   label: 'Number default display format settings'
   mapping:
@@ -217,7 +217,7 @@ widget.settings.number:
       type: label
       label: 'Placeholder'
 
-widget.settings.checkbox:
+field.widget.settings.checkbox:
   type: mapping
   label: 'Single on/off checkbox format settings'
   mapping:
@@ -225,7 +225,7 @@ widget.settings.checkbox:
       type: boolean
       label: 'Use field label instead of the "On value" as label'
 
-formatter.settings.number_decimal:
+field.formatter.settings.number_decimal:
   type: mapping
   label: 'Number decimal display format settings'
   mapping:
@@ -242,7 +242,7 @@ formatter.settings.number_decimal:
       type: boolean
       label: 'Display prefix and suffix.'
 
-formatter.settings.number_integer:
+field.formatter.settings.number_integer:
   type: mapping
   label: 'Number interger display format settings'
   mapping:
@@ -253,14 +253,14 @@ formatter.settings.number_integer:
       type: boolean
       label: 'Display prefix and suffix.'
 
-formatter.settings.number_unformatted:
+field.formatter.settings.number_unformatted:
   type: mapping
   label: 'Number unformatted display format settings'
 
-formatter.settings.uri_link:
+field.formatter.settings.uri_link:
   type: mapping
   label: 'URI as link display format settings'
 
-formatter.settings.timestamp_ago:
+field.formatter.settings.timestamp_ago:
   type: mapping
   label: 'Timestamp ago display format settings'
diff --git a/core/modules/comment/config/schema/comment.schema.yml b/core/modules/comment/config/schema/comment.schema.yml
index eab4455..798b9ab 100644
--- a/core/modules/comment/config/schema/comment.schema.yml
+++ b/core/modules/comment/config/schema/comment.schema.yml
@@ -1,6 +1,6 @@
 # Schema for the configuration files of the Comment module.
 
-formatter.settings.comment_default:
+field.formatter.settings.comment_default:
   type: mapping
   label: 'Comment display format settings'
   mapping:
@@ -8,7 +8,7 @@ formatter.settings.comment_default:
       type: integer
       label: 'Pager ID'
 
-widget.settings.comment_default:
+field.widget.settings.comment_default:
   type: mapping
   label: 'Comment display format settings'
 
diff --git a/core/modules/datetime/config/schema/datetime.schema.yml b/core/modules/datetime/config/schema/datetime.schema.yml
index c8c5430..e8e64e0 100644
--- a/core/modules/datetime/config/schema/datetime.schema.yml
+++ b/core/modules/datetime/config/schema/datetime.schema.yml
@@ -26,7 +26,7 @@ field.datetime.value:
         - type: string
           label: 'Value'
 
-formatter.settings.datetime_default:
+field.formatter.settings.datetime_default:
   type: mapping
   label: 'Datetime default display format settings'
   mapping:
@@ -34,11 +34,11 @@ formatter.settings.datetime_default:
       type: string
       label: 'Date format'
 
-formatter.settings.datetime_plain:
+field.formatter.settings.datetime_plain:
   type: mapping
   label: 'Datetime plain display format settings'
 
-widget.settings.datetime_datelist:
+field.widget.settings.datetime_datelist:
   type: mapping
   label: 'Datetime select list display format settings'
   mapping:
@@ -52,6 +52,6 @@ widget.settings.datetime_datelist:
       type: string
       label: 'Time type'
 
-widget.settings.datetime_default:
+field.widget.settings.datetime_default:
   type: mapping
   label: 'Datetime default display format settings'
diff --git a/core/modules/entity_reference/config/schema/entity_reference.schema.yml b/core/modules/entity_reference/config/schema/entity_reference.schema.yml
index c509760..e71c487 100644
--- a/core/modules/entity_reference/config/schema/entity_reference.schema.yml
+++ b/core/modules/entity_reference/config/schema/entity_reference.schema.yml
@@ -37,7 +37,7 @@ entity_reference.default.handler_settings:
       type: boolean
       label: 'Create referenced entities if they don''t already exist'
 
-formatter.settings.entity_reference_entity_view:
+field.formatter.settings.entity_reference_entity_view:
   type: mapping
   label: 'Entity reference rendered entity display format settings'
   mapping:
@@ -48,11 +48,11 @@ formatter.settings.entity_reference_entity_view:
       type: boolean
       label: 'Show links'
 
-formatter.settings.entity_reference_entity_id:
+field.formatter.settings.entity_reference_entity_id:
   type: mapping
   label: 'Entity reference entity ID display format settings'
 
-formatter.settings.entity_reference_label:
+field.formatter.settings.entity_reference_label:
   type: mapping
   label: 'Entity reference label display format settings'
   mapping:
@@ -60,7 +60,7 @@ formatter.settings.entity_reference_label:
       type: boolean
       label: 'Link label to the referenced entity'
 
-widget.settings.entity_reference_autocomplete_tags:
+field.widget.settings.entity_reference_autocomplete_tags:
   type: mapping
   label: 'Entity reference autocomplete (Tags style) display format settings'
   mapping:
@@ -77,7 +77,7 @@ widget.settings.entity_reference_autocomplete_tags:
       type: label
       label: 'Placeholder'
 
-widget.settings.entity_reference_autocomplete:
+field.widget.settings.entity_reference_autocomplete:
   type: mapping
   label: 'Entity reference autocomplete display format settings'
   mapping:
diff --git a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
index 38a671c..6edc8f5 100644
--- a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
+++ b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
@@ -1,4 +1,4 @@
-formatter.settings.field_test_multiple:
+field.formatter.settings.field_test_multiple:
   type: mapping
   label: 'field_test display format settings'
   mapping:
@@ -9,7 +9,7 @@ formatter.settings.field_test_multiple:
       type: boolean
       label: 'Test altering'
 
-widget.settings.test_field_widget_multiple:
+field.widget.settings.test_field_widget_multiple:
   type: mapping
   label: 'field_test display format settings'
   mapping:
diff --git a/core/modules/file/config/schema/file.schema.yml b/core/modules/file/config/schema/file.schema.yml
index c45d2c7..910c1ed 100644
--- a/core/modules/file/config/schema/file.schema.yml
+++ b/core/modules/file/config/schema/file.schema.yml
@@ -67,23 +67,23 @@ field.file.field_settings:
       type: boolean
       label: 'Enable Description field'
 
-formatter.settings.file_default:
+field.formatter.settings.file_default:
   type: mapping
   label: 'Generic file format settings'
 
-formatter.settings.file_rss_enclosure:
+field.formatter.settings.file_rss_enclosure:
   type: mapping
   label: 'RSS enclosure format settings'
 
-formatter.settings.file_table:
+field.formatter.settings.file_table:
   type: mapping
   label: 'Table of files format settings'
 
-formatter.settings.file_url_plain:
+field.formatter.settings.file_url_plain:
   type: mapping
   label: 'URL to file format settings'
 
-widget.settings.file_generic:
+field.widget.settings.file_generic:
   type: mapping
   label: 'File format settings'
   mapping:
diff --git a/core/modules/image/config/schema/image.schema.yml b/core/modules/image/config/schema/image.schema.yml
index 32dc555..6dd3ec2 100644
--- a/core/modules/image/config/schema/image.schema.yml
+++ b/core/modules/image/config/schema/image.schema.yml
@@ -140,7 +140,7 @@ field.image.value:
           type: integer
           label: 'Height'
 
-formatter.settings.image:
+field.formatter.settings.image:
   type: mapping
   label: 'Image field display format settings'
   mapping:
@@ -151,7 +151,7 @@ formatter.settings.image:
       type: string
       label: 'Image style'
 
-widget.settings.image_image:
+field.widget.settings.image_image:
   type: mapping
   label: 'Image field display format settings'
   mapping:
diff --git a/core/modules/link/config/schema/link.schema.yml b/core/modules/link/config/schema/link.schema.yml
index ce29a06..2a33347 100644
--- a/core/modules/link/config/schema/link.schema.yml
+++ b/core/modules/link/config/schema/link.schema.yml
@@ -1,6 +1,6 @@
 # Schema for the configuration files of the Link module.
 
-formatter.settings.link:
+field.formatter.settings.link:
   type: mapping
   label: 'Link format settings'
   mapping:
@@ -20,7 +20,7 @@ formatter.settings.link:
       type: string
       label: 'Open link in new window'
 
-formatter.settings.link_separate:
+field.formatter.settings.link_separate:
   type: mapping
   label: 'Link format settings'
   mapping:
@@ -34,7 +34,7 @@ formatter.settings.link_separate:
       type: string
       label: 'Open link in new window'
 
-widget.settings.link_default:
+field.widget.settings.link_default:
   type: mapping
   label: 'Link format settings'
   mapping:
diff --git a/core/modules/options/config/schema/options.schema.yml b/core/modules/options/config/schema/options.schema.yml
index e20b9e6..266da56 100644
--- a/core/modules/options/config/schema/options.schema.yml
+++ b/core/modules/options/config/schema/options.schema.yml
@@ -111,18 +111,18 @@ field.list_string.value:
           type: string
           label: 'Value'
 
-formatter.settings.list_default:
+field.formatter.settings.list_default:
   type: mapping
   label: 'Options list default display settings'
 
-formatter.settings.list_key:
+field.formatter.settings.list_key:
   type: mapping
   label: 'Key format settings'
 
-widget.settings.options_buttons:
+field.widget.settings.options_buttons:
   type: mapping
   label: 'Check boxes/radio buttons format settings'
 
-widget.settings.options_select:
+field.widget.settings.options_select:
   type: mapping
   label: 'Select list format settings'
diff --git a/core/modules/path/config/schema/path.schema.yml b/core/modules/path/config/schema/path.schema.yml
index ad42dd0..849dbe3 100644
--- a/core/modules/path/config/schema/path.schema.yml
+++ b/core/modules/path/config/schema/path.schema.yml
@@ -1,5 +1,5 @@
 # Schema for the configuration files of the Path module.
 
-widget.settings.path:
+field.widget.settings.path:
   type: mapping
   label: 'Link format settings'
diff --git a/core/modules/responsive_image/config/schema/responsive_image.schema.yml b/core/modules/responsive_image/config/schema/responsive_image.schema.yml
index 6f4e79c..52fc946 100644
--- a/core/modules/responsive_image/config/schema/responsive_image.schema.yml
+++ b/core/modules/responsive_image/config/schema/responsive_image.schema.yml
@@ -42,7 +42,7 @@ responsive_image.mappings.*:
       type: config_dependencies
       label: 'Dependencies'
 
-formatter.settings.responsive_image:
+field.formatter.settings.responsive_image:
   type: mapping
   label: 'Responsive image list format settings'
   mapping:
diff --git a/core/modules/taxonomy/config/schema/taxonomy.schema.yml b/core/modules/taxonomy/config/schema/taxonomy.schema.yml
index 6ce2159..2e4d53c 100644
--- a/core/modules/taxonomy/config/schema/taxonomy.schema.yml
+++ b/core/modules/taxonomy/config/schema/taxonomy.schema.yml
@@ -79,23 +79,23 @@ field.taxonomy_term_reference.value:
           type: integer
           label: 'Term ID'
 
-formatter.settings.entity_reference_rss_category:
+field.formatter.settings.entity_reference_rss_category:
   type: mapping
   label: 'Taxonomy format settings'
 
-formatter.settings.taxonomy_term_reference_plain:
+field.formatter.settings.taxonomy_term_reference_plain:
   type: mapping
   label: 'Taxonomy format settings'
 
-formatter.settings.taxonomy_term_reference_rss_category:
+field.formatter.settings.taxonomy_term_reference_rss_category:
   type: mapping
   label: 'Taxonomy format settings'
 
-formatter.settings.taxonomy_term_reference_link:
+field.formatter.settings.taxonomy_term_reference_link:
   type: mapping
   label: 'Taxonomy format settings'
 
-widget.settings.taxonomy_autocomplete:
+field.widget.settings.taxonomy_autocomplete:
   type: mapping
   label: 'Autocomplete term widget (tagging) format settings'
   mapping:
diff --git a/core/modules/telephone/config/schema/telephone.schema.yml b/core/modules/telephone/config/schema/telephone.schema.yml
index 79582f5..dc8713a 100644
--- a/core/modules/telephone/config/schema/telephone.schema.yml
+++ b/core/modules/telephone/config/schema/telephone.schema.yml
@@ -1,6 +1,6 @@
 # Schema for the configuration files of the Telephone module.
 
-formatter.settings.telephone_link:
+field.formatter.settings.telephone_link:
   type: mapping
   label: 'Telephone link format settings'
   mapping:
@@ -8,7 +8,7 @@ formatter.settings.telephone_link:
       type: label
       label: 'Title to replace basic numeric telephone number display'
 
-widget.settings.telephone_default:
+field.widget.settings.telephone_default:
   type: mapping
   label: 'Telephone default format settings'
   mapping:
diff --git a/core/modules/text/config/schema/text.schema.yml b/core/modules/text/config/schema/text.schema.yml
index 7470706..c758264 100644
--- a/core/modules/text/config/schema/text.schema.yml
+++ b/core/modules/text/config/schema/text.schema.yml
@@ -90,11 +90,11 @@ field.text_with_summary.value:
           type: string
           label: 'Text format'
 
-formatter.settings.text_default:
+field.formatter.settings.text_default:
   type: mapping
   label: 'Formatted text default display format settings'
 
-formatter.settings.text_summary_or_trimmed:
+field.formatter.settings.text_summary_or_trimmed:
   type: mapping
   label: 'Summary or trimmed formatted text display format settings'
   mapping:
@@ -102,7 +102,7 @@ formatter.settings.text_summary_or_trimmed:
       type: integer
       label: 'Trim length'
 
-formatter.settings.text_trimmed:
+field.formatter.settings.text_trimmed:
   type: mapping
   label: 'Trimmed text display format settings'
   mapping:
@@ -110,7 +110,7 @@ formatter.settings.text_trimmed:
       type: integer
       label: 'Trim length'
 
-widget.settings.text_textarea:
+field.widget.settings.text_textarea:
   type: mapping
   label: 'Text area (multiple rows) display format settings'
   mapping:
@@ -121,7 +121,7 @@ widget.settings.text_textarea:
       type: label
       label: 'Placeholder'
 
-widget.settings.text_textarea_with_summary:
+field.widget.settings.text_textarea_with_summary:
   type: mapping
   label: 'Text area with a summary display format settings'
   mapping:
@@ -135,7 +135,7 @@ widget.settings.text_textarea_with_summary:
       type: label
       label: 'Placeholder'
 
-widget.settings.text_textfield:
+field.widget.settings.text_textfield:
   type: mapping
   label: 'Text field display format settings'
   mapping: