diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml
index 79674b5..d98e615 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml
@@ -15,7 +15,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_funds_for:
     weight: 27
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.accommodation.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.accommodation.default.yml
index 479f61f..b85bfd3 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.accommodation.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.accommodation.default.yml
@@ -32,7 +32,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_outcome:
     weight: 26
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.asylum_support.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.asylum_support.default.yml
index 1a00b8a..0bd02c3 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.asylum_support.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.asylum_support.default.yml
@@ -32,7 +32,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_outcome:
     weight: 30
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.employability.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.employability.default.yml
index 98646e3..baa4174 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.employability.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.employability.default.yml
@@ -33,7 +33,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_gave_list_of_agencies:
     weight: 27
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.health.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.health.default.yml
index 8b7df7f..921e264 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.health.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.health.default.yml
@@ -32,7 +32,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_outcome:
     weight: 30
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.immigration.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.immigration.default.yml
index b192dcd..9a7b7b1 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.immigration.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.immigration.default.yml
@@ -33,7 +33,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_level:
     weight: 26
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml
index 607a84b..27ca859 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml
@@ -32,7 +32,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_outcome:
     weight: 30
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml
index 13eaac0..f689912 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml
@@ -18,7 +18,7 @@ content:
     label: above
     settings:
       thousand_separator: ''
-      decimal_separator: .
+      number_decimal_separator: .
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.accommodation.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.accommodation.default.yml
index 9db05f9..1b8308b 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.accommodation.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.accommodation.default.yml
@@ -36,7 +36,7 @@ content:
     label: above
     settings:
       thousand_separator: ''
-      decimal_separator: .
+      number_decimal_separator: .
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.asylum_support.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.asylum_support.default.yml
index d113aff..a5e7436 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.asylum_support.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.asylum_support.default.yml
@@ -36,7 +36,7 @@ content:
     label: above
     settings:
       thousand_separator: ''
-      decimal_separator: .
+      number_decimal_separator: .
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.employability.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.employability.default.yml
index 4a8271a..7f4ceee 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.employability.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.employability.default.yml
@@ -37,7 +37,7 @@ content:
     label: above
     settings:
       thousand_separator: ''
-      decimal_separator: .
+      number_decimal_separator: .
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.health.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.health.default.yml
index be108c8..eaf247b 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.health.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.health.default.yml
@@ -36,7 +36,7 @@ content:
     label: above
     settings:
       thousand_separator: ''
-      decimal_separator: .
+      number_decimal_separator: .
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.immigration.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.immigration.default.yml
index 82b7399..0ef3fb2 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.immigration.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.immigration.default.yml
@@ -37,7 +37,7 @@ content:
     label: above
     settings:
       thousand_separator: ''
-      decimal_separator: .
+      number_decimal_separator: .
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml
index b797f70..37239af 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml
@@ -36,7 +36,7 @@ content:
     label: above
     settings:
       thousand_separator: ''
-      decimal_separator: .
+      number_decimal_separator: .
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_activity.field_amount.yml b/modules/opencase_defaults/config/optional/field.storage.oc_activity.field_amount.yml
index ead7d4a..41de30a 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_activity.field_amount.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_activity.field_amount.yml
@@ -6,7 +6,7 @@ dependencies:
 id: oc_activity.field_amount
 field_name: field_amount
 entity_type: oc_activity
-type: number_decimal
+type: decimal
 settings:
   precision: 10
   scale: 2
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_or_equivalent_cost.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_or_equivalent_cost.yml
index 7739001..a947b3b 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_or_equivalent_cost.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_or_equivalent_cost.yml
@@ -6,7 +6,7 @@ dependencies:
 id: oc_case.field_fee_or_equivalent_cost
 field_name: field_fee_or_equivalent_cost
 entity_type: oc_case
-type: number_decimal
+type: decimal
 settings:
   precision: 10
   scale: 2