diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml
index 1154ba3..ec43ecd 100644
--- a/core/config/schema/core.data_types.schema.yml
+++ b/core/config/schema/core.data_types.schema.yml
@@ -389,7 +389,7 @@ field_config_base:
       type: string
       label: 'Default value callback'
     settings:
-      type: field.[%parent.field_type].field_settings
+      type: field.field_settings.[%parent.field_type]
     third_party_settings:
       type: sequence
       label: 'Third party settings'
@@ -423,9 +423,19 @@ core.date_format.*:
       type: string
       label: 'Default language'
 
+# Generic field settings schemas.
+
+field.storage_settings.*:
+  type: sequence
+  label: 'Settings'
+
+field.field_settings.*:
+  type: sequence
+  label: 'Settings'
+
 # Schema for the configuration of the String field type.
 
-field.string.storage_settings:
+field.storage_settings.string:
   type: mapping
   label: 'String settings'
   mapping:
@@ -433,7 +443,7 @@ field.string.storage_settings:
       type: integer
       label: 'Maximum length'
 
-field.string.field_settings:
+field.field_settings.string:
   type: sequence
   label: 'String settings'
 
@@ -450,11 +460,11 @@ field.string.value:
 
 # Schema for the configuration of the  String (long) field type.
 
-field.string_long.storage_settings:
-  type: field.string.storage_settings
+field.storage_settings.string_long:
+  type: field.storage_settings.string
   label: 'String (long) settings'
 
-field.string_long.field_settings:
+field.field_settings.string_long:
   type: field.string.field_settings
   label: 'String (long) settings'
 
@@ -471,7 +481,7 @@ field.string_long.value:
 
 # Schema for the configuration of the URI field type.
 
-field.uri.storage_settings:
+field.storage_settings.uri:
   type: mapping
   label: 'URI settings'
   mapping:
@@ -479,7 +489,7 @@ field.uri.storage_settings:
       type: integer
       label: 'Maximum length'
 
-field.uri.field_settings:
+field.field_settings.uri:
   type: sequence
   label: 'URI settings'
 
@@ -496,11 +506,11 @@ field.uri.value:
 
 # Schema for the configuration of the Created field type.
 
-field.created.storage_settings:
+field.storage_settings.created:
   type: sequence
   label: 'Created timestamp settings'
 
-field.created.field_settings:
+field.field_settings.created:
   type: sequence
   label: 'Created timestamp settings'
 
@@ -517,11 +527,11 @@ field.created.value:
 
 # Schema for the configuration of the Changed field type.
 
-field.changed.storage_settings:
+field.storage_settings.changed:
   type: sequence
   label: 'Changed timestamp settings'
 
-field.changed.field_settings:
+field.field_settings.changed:
   type: sequence
   label: 'Changed timestamp settings'
 
@@ -538,7 +548,7 @@ field.changed.value:
 
 # Schema for the configuration of the Entity reference field type.
 
-field.entity_reference.storage_settings:
+field.storage_settings.entity_reference:
   type: mapping
   label: 'Entity reference settings'
   mapping:
@@ -546,7 +556,7 @@ field.entity_reference.storage_settings:
       type: string
       label: 'Type of item to reference'
 
-field.entity_reference.field_settings:
+field.field_settings.entity_reference:
   type: mapping
   label: 'Entity reference settings'
   mapping:
@@ -573,7 +583,7 @@ field.entity_reference.value:
 
 # Schema for the configuration of the Boolean field type.
 
-field.boolean.storage_settings:
+field.storage_settings.boolean:
   type: mapping
   label: 'Boolean settings'
   mapping:
@@ -584,7 +594,7 @@ field.boolean.storage_settings:
       type: string
       label: 'Off label'
 
-field.boolean.field_settings:
+field.field_settings.boolean:
   label: 'Boolean settings'
   type: sequence
 
@@ -601,13 +611,13 @@ field.boolean.value:
 
 # Schema for the configuration of the Email field type.
 
-field.email.storage_settings:
+field.storage_settings.email:
   type: sequence
   label: 'Email settings'
   sequence:
     - type: string
 
-field.email.field_settings:
+field.field_settings.email:
   type: sequence
   label: 'Email settings'
   sequence:
@@ -627,16 +637,16 @@ field.email.value:
 
 # Schema for the configuration of the Integer field type.
 
-field.integer.storage_settings:
+field.storage_settings.integer:
   type: sequence
   label: 'Integer settings'
   sequence:
     - type: string
       label: 'setting'
 
-field.integer.field_settings:
+field.field_settings.integer:
   type: mapping
-  label: 'Integer'
+  label: 'Integer settings'
   mapping:
     min:
       type: integer
@@ -664,7 +674,7 @@ field.integer.value:
 
 # Schema for the configuration of the Decimal field type.
 
-field.decimal.storage_settings:
+field.storage_settings.decimal:
   type: mapping
   label: 'Decimal settings'
   mapping:
@@ -675,9 +685,9 @@ field.decimal.storage_settings:
       type: integer
       label: 'Scale'
 
-field.decimal.field_settings:
+field.field_settings.decimal:
   type: mapping
-  label: 'Decimal'
+  label: 'Decimal settings'
   mapping:
     min:
       type: float
@@ -705,16 +715,16 @@ field.decimal.value:
 
 # Schema for the configuration of the Float field type.
 
-field.float.storage_settings:
+field.storage_settings.float:
   type: sequence
   label: 'Float settings'
   sequence:
     - type: string
       label: 'setting'
 
-field.float.field_settings:
+field.field_settings.float:
   type: mapping
-  label: 'Float'
+  label: 'Float settings '
   mapping:
     min:
       type: float
diff --git a/core/modules/comment/config/schema/comment.schema.yml b/core/modules/comment/config/schema/comment.schema.yml
index b5bcd86..0851a31 100644
--- a/core/modules/comment/config/schema/comment.schema.yml
+++ b/core/modules/comment/config/schema/comment.schema.yml
@@ -60,7 +60,7 @@ comment.type.*:
       type: text
       label: 'Description'
 
-field.comment.storage_settings:
+field.storage_settings.comment:
   type: sequence
   label: 'Settings'
   sequence:
@@ -93,7 +93,7 @@ field.comment.value:
           type: integer
           label: 'Count'
 
-field.comment.field_settings:
+field.field_settings.comment:
   type: mapping
   label: 'Comment settings'
   mapping:
diff --git a/core/modules/datetime/config/schema/datetime.schema.yml b/core/modules/datetime/config/schema/datetime.schema.yml
index 58e4cc6..95a6204 100644
--- a/core/modules/datetime/config/schema/datetime.schema.yml
+++ b/core/modules/datetime/config/schema/datetime.schema.yml
@@ -1,6 +1,6 @@
 # Schema for the configuration files of the Datetime module.
 
-field.datetime.storage_settings:
+field.storage_settings.datetime:
   type: mapping
   label: 'Datetime settings'
   mapping:
@@ -8,11 +8,9 @@ field.datetime.storage_settings:
       type: string
       label: 'Date type'
 
-field.datetime.field_settings:
+field.field_settings.datetime:
   type: sequence
-  label: 'Settings'
-  sequence:
-    - type: string
+  label: 'Datetime settings'
 
 field.datetime.value:
   type: sequence
diff --git a/core/modules/field/config/schema/field.schema.yml b/core/modules/field/config/schema/field.schema.yml
index 184dc2f..429c929 100644
--- a/core/modules/field/config/schema/field.schema.yml
+++ b/core/modules/field/config/schema/field.schema.yml
@@ -25,7 +25,7 @@ field.storage.*.*:
       type: string
       label: 'Type'
     settings:
-      type: field.[%parent.type].storage_settings
+      type: field.storage_settings.[%parent.type]
     module:
       type: string
       label: 'Module'
diff --git a/core/modules/file/config/schema/file.schema.yml b/core/modules/file/config/schema/file.schema.yml
index cd21f38..5200145 100644
--- a/core/modules/file/config/schema/file.schema.yml
+++ b/core/modules/file/config/schema/file.schema.yml
@@ -22,7 +22,7 @@ file.settings:
           type: path
           label: 'Directory'
 
-field.file.storage_settings:
+field.storage_settings.file:
   type: base_entity_reference_field_settings
   label: 'File settings'
   mapping:
@@ -59,7 +59,7 @@ base_file_field_field_settings:
       type: string
       label: 'Maximum upload size'
 
-field.file.field_settings:
+field.field_settings.file:
   type: base_file_field_field_settings
   label: 'File settings'
   mapping:
diff --git a/core/modules/image/config/schema/image.schema.yml b/core/modules/image/config/schema/image.schema.yml
index f0db0d5..e9e4862 100644
--- a/core/modules/image/config/schema/image.schema.yml
+++ b/core/modules/image/config/schema/image.schema.yml
@@ -77,15 +77,15 @@ image.settings:
       type: boolean
       label: 'Suppress the itok query string for image derivatives'
 
-field.image.storage_settings:
-  type: field.file.storage_settings
+field.storage_settings.image:
+  type: field.storage_settings.file
   label: 'Image settings'
   mapping:
     default_image:
       type: field_default_image
       label: 'Default value'
 
-field.image.field_settings:
+field.field_settings.image:
   type: base_file_field_field_settings
   label: 'Image settings'
   mapping:
diff --git a/core/modules/options/config/schema/options.schema.yml b/core/modules/options/config/schema/options.schema.yml
index 03cb81f..04475f1 100644
--- a/core/modules/options/config/schema/options.schema.yml
+++ b/core/modules/options/config/schema/options.schema.yml
@@ -1,6 +1,6 @@
 # Schema for the configuration files of the Options module.
 
-field.list_integer.storage_settings:
+field.storage_settings.list_integer:
   type: mapping
   label: 'List (integer) settings'
   mapping:
@@ -21,10 +21,9 @@ field.list_integer.storage_settings:
       type: string
       label: 'Allowed values function'
 
-field.list_integer.field_settings:
-  label: 'List (integer)'
-  type: mapping
-  mapping: {  }
+field.field_settings.list_integer:
+  label: 'List (integer) settings'
+  type: sequence
 
 field.list_integer.value:
   type: sequence
@@ -37,7 +36,7 @@ field.list_integer.value:
           type: integer
           label: 'Value'
 
-field.list_float.storage_settings:
+field.storage_settings.list_float:
   type: mapping
   label: 'List (float) settings'
   mapping:
@@ -58,10 +57,9 @@ field.list_float.storage_settings:
       type: string
       label: 'Allowed values function'
 
-field.list_float.field_settings:
-  label: 'List (float)'
-  type: mapping
-  mapping: {  }
+field.field_settings.list_float:
+  label: 'List (float) settings'
+  type: sequence
 
 field.list_float.value:
   type: sequence
@@ -74,7 +72,7 @@ field.list_float.value:
           type: string
           label: 'Value'
 
-field.list_string.storage_settings:
+field.storage_settings.list_string:
   type: mapping
   label: 'List (text) settings'
   mapping:
@@ -95,10 +93,9 @@ field.list_string.storage_settings:
       type: string
       label: 'Allowed values function'
 
-field.list_string.field_settings:
-  label: 'List (float)'
-  type: mapping
-  mapping: {  }
+field.field_settings.list_string:
+  label: 'List (text) settings'
+  type: sequence
 
 field.list_string.value:
   type: sequence
diff --git a/core/modules/taxonomy/config/schema/taxonomy.schema.yml b/core/modules/taxonomy/config/schema/taxonomy.schema.yml
index 579f673..bd36c68 100644
--- a/core/modules/taxonomy/config/schema/taxonomy.schema.yml
+++ b/core/modules/taxonomy/config/schema/taxonomy.schema.yml
@@ -39,7 +39,7 @@ taxonomy.vocabulary.*:
       sequence:
         - type: taxonomy.vocabulary.third_party.[%key]
 
-field.taxonomy_term_reference.storage_settings:
+field.storage_settings.taxonomy_term_reference:
   type: base_entity_reference_field_settings
   label: 'Taxonomy term reference settings'
   mapping:
@@ -60,7 +60,7 @@ field.taxonomy_term_reference.storage_settings:
               type: integer
               value: 'Parent'
 
-field.taxonomy_term_reference.field_settings:
+field.field_settings.taxonomy_term_reference:
   type: mapping
   label: 'Taxonomy term reference settings'
   mapping:
diff --git a/core/modules/text/config/schema/text.schema.yml b/core/modules/text/config/schema/text.schema.yml
index f472aec..60911c3 100644
--- a/core/modules/text/config/schema/text.schema.yml
+++ b/core/modules/text/config/schema/text.schema.yml
@@ -8,7 +8,7 @@ text.settings:
       type: integer
       label: 'Default summary length'
 
-field.text.storage_settings:
+field.storage_settings.text:
   type: mapping
   label: 'Text (formatted) settings'
   mapping:
@@ -16,11 +16,9 @@ field.text.storage_settings:
       type: integer
       label: 'Maximum length'
 
-field.text.field_settings:
-  type: mapping
+field.field_settings.text:
+  type: sequence
   label: 'Text (formatted) settings'
-  sequence:
-    - type: string
 
 field.text.value:
   type: sequence
@@ -36,15 +34,13 @@ field.text.value:
           type: string
           label: 'Text format'
 
-field.text_long.storage_settings:
+field.storage_settings.text_long:
   label: 'Text (formatted, long) settings'
-  type: mapping
-  mapping: {  }
+  type: sequence
 
-field.text_long.field_settings:
+field.field_settings.text_long:
   label: 'Text (formatted, long) settings'
-  type: mapping
-  mapping: {  }
+  type: sequence
 
 field.text_long.value:
   type: sequence
@@ -60,12 +56,11 @@ field.text_long.value:
           type: string
           label: 'Text format'
 
-field.text_with_summary.storage_settings:
+field.storage_settings.text_with_summary:
   label: 'Text (formatted, long, with summary) settings'
-  type: mapping
-  mapping: {  }
+  type: sequence
 
-field.text_with_summary.field_settings:
+field.field_settings.text_with_summary:
   type: mapping
   label: 'Text (formatted, long, with summary) settings'
   mapping: