diff --git a/core/modules/field/config/schema/field.schema.yml b/core/modules/field/config/schema/field.schema.yml
index 4448d69..e95e5e2 100644
--- a/core/modules/field/config/schema/field.schema.yml
+++ b/core/modules/field/config/schema/field.schema.yml
@@ -37,7 +37,7 @@ field.field.*:
       label: 'Active'
     entity_types:
       type: sequence
-      label: 'Entity types'
+      label: 'Allowed entity types'
       sequence:
         - type: string
           label: 'Entity type'
@@ -50,6 +50,7 @@ field.field.*:
           label: 'Type'
         settings:
           type: field_storage.[%parent.type].settings
+          label: 'Settings'
         module:
           type: string
           label: 'Module'
@@ -70,14 +71,14 @@ field.field.*:
       label: 'Indexes'
       sequence:
         - type: sequence
-          label: 'Index'
+          label: 'Indexes'
           sequence:
             - type: string
-              label: 'Field'
+              label: 'Column'
 
 field.instance.*.*.*:
   type: mapping
-  label: 'Field instance settings'
+  label: 'Field instance'
   mapping:
     id:
       type: string
@@ -96,7 +97,7 @@ field.instance.*.*.*:
       label: 'Field UUID'
     entity_type:
       type: string
-      label: 'Entity type'
+      label: 'Allowed entity types'
     bundle:
       type: string
       label: 'Bundle'
@@ -118,7 +119,7 @@ field.instance.*.*.*:
       type: field.[%parent.field_type].instance_settings
     widget:
       type: mapping
-      label: 'Widget settings'
+      label: 'Widget'
       mapping:
         weight:
           type: integer
diff --git a/core/modules/text/config/schema/text.schema.yml b/core/modules/text/config/schema/text.schema.yml
index f748175..caf6696 100644
--- a/core/modules/text/config/schema/text.schema.yml
+++ b/core/modules/text/config/schema/text.schema.yml
@@ -8,69 +8,48 @@ text.settings:
       type: integer
       label: 'Default summary length'
 
+field.text.settings:
+  type: mapping
+  label: 'Text settings'
+  mapping:
+    max_length:
+      type: integer
+      label: 'Maximum length'
 
-field.text_with_summary.settings:
-  type: sequence
-  label: 'Default'
-  sequence:
-    - type: string
-
-field.text_with_summary.instance_settings:
+field.text.instance_settings:
   type: mapping
-  label: 'Text area with a summary'
+  label: 'Text settings'
   mapping:
     text_processing:
       type: string
       label: 'Text processing'
-    display_summary:
-      type: boolean
-      label: 'Summary input'
     user_register_form:
       type: boolean
       label: 'Display on user registration form.'
 
-field.text_with_summary.value:
+field.text.value:
   type: sequence
   label: 'Default value'
   sequence:
     - type: mapping
       label: 'Default'
       mapping:
-        summary:
-          type: string
-          label: 'Summary'
         value:
-          type: text
-          label: 'Body'
+          type: label
+          label: 'Value'
         format:
           type: string
           label: 'Text format'
 
-field_widget.text_textarea_with_summary.settings:
-  type: mapping
-  label: 'Text area widget settings'
-  mapping:
-    rows:
-      type: integer
-      label: 'Rows'
-    placeholder:
-      type: label
-      label: 'Placeholder'
-    summary_rows:
-      type: integer
-      label: 'Summary rows'
-
-field.text.settings:
-  type: mapping
-  label: 'Text settings'
-  mapping:
-    max_length:
-      type: integer
-      label: 'Maximum length'
+field.text_long.settings:
+  type: sequence
+  label: 'Settings'
+  sequence:
+    - type: string
 
-field.text.instance_settings:
+field.text_long.instance_settings:
   type: mapping
-  label: 'Text settings'
+  label: 'Long text settings'
   mapping:
     text_processing:
       type: string
@@ -79,7 +58,7 @@ field.text.instance_settings:
       type: boolean
       label: 'Display on user registration form.'
 
-field.text.value:
+field.text_long.value:
   type: sequence
   label: 'Default value'
   sequence:
@@ -87,47 +66,61 @@ field.text.value:
       label: 'Default'
       mapping:
         value:
-          type: label
+          type: text
           label: 'Value'
+        format:
+          type: string
+          label: 'Text format'
 
-field_widget.text_textfield.settings:
-  type: mapping
-  label: 'Text field widget settings'
-  mapping:
-    size:
-      type: integer
-      label: 'Size of textfield'
-    placeholder:
-      type: label
-      label: 'Placeholder'
-
-field.text_long.settings:
+field.text_with_summary.settings:
   type: sequence
-  label: 'Settings'
+  label: 'Default'
   sequence:
     - type: string
 
-field.text_long.instance_settings:
+field.text_with_summary.instance_settings:
   type: mapping
-  label: 'Long text settings'
+  label: 'Text area with a summary'
   mapping:
     text_processing:
-      type: string
+      type: boolean
       label: 'Text processing'
+    display_summary:
+      type: boolean
+      label: 'Summary input'
     user_register_form:
       type: boolean
       label: 'Display on user registration form.'
 
-field.text_long.value:
+field.text_with_summary.value:
   type: sequence
   label: 'Default value'
   sequence:
     - type: mapping
       label: 'Default'
       mapping:
+        summary:
+          type: string
+          label: 'Summary'
         value:
           type: text
-          label: 'Value'
+          label: 'Body'
+        format:
+          type: string
+          label: 'Text format'
+
+
+
+field_widget.text_textfield.settings:
+  type: mapping
+  label: 'Text field widget settings'
+  mapping:
+    size:
+      type: integer
+      label: 'Size of textfield'
+    placeholder:
+      type: label
+      label: 'Placeholder'
 
 field_widget.text_textarea.settings:
   type: mapping
@@ -139,3 +132,17 @@ field_widget.text_textarea.settings:
     placeholder:
       type: label
       label: 'Placeholder'
+
+field_widget.text_textarea_with_summary.settings:
+  type: mapping
+  label: 'Text area widget settings'
+  mapping:
+    rows:
+      type: integer
+      label: 'Rows'
+    placeholder:
+      type: label
+      label: 'Placeholder'
+    summary_rows:
+      type: integer
+      label: 'Summary rows'