diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json
index 5ab8d4f2e1..c2ccbdbc71 100644
--- a/resources/definitions/innovo_inventor.def.json
+++ b/resources/definitions/innovo_inventor.def.json
@@ -95,7 +95,7 @@
         },
         "speed_layer_0": {
             "default_value": 30.0,
-            "min_value": 0.1
+            "minimum_value": 0.1
         },
         "infill_overlap": {
             "default_value": 10.0
diff --git a/resources/definitions/m180.def.json b/resources/definitions/m180.def.json
index 36d8be6e1f..e339dbddee 100644
--- a/resources/definitions/m180.def.json
+++ b/resources/definitions/m180.def.json
@@ -25,7 +25,7 @@
         },
         "machine_nozzle_size": {
             "default_value": 0.4,
-            "min_value": "0.001"
+            "minimum_value": "0.001"
         },
         "machine_head_with_fans_polygon": {
             "default_value": [
@@ -49,8 +49,8 @@
         },
         "material_diameter": {
             "default_value": 1.75,
-            "min_value_warning": "1.5",
-            "max_value_warning": "2.0"
+            "minimum_value_warning": "1.5",
+            "maximum_value_warning": "2.0"
         }
     }
 }
\ No newline at end of file
diff --git a/resources/definitions/rigidbot.def.json b/resources/definitions/rigidbot.def.json
index 0de11f09b8..cf71508f3d 100644
--- a/resources/definitions/rigidbot.def.json
+++ b/resources/definitions/rigidbot.def.json
@@ -86,7 +86,7 @@
         },
         "speed_layer_0": {
             "default_value": 15,
-            "min_value": "0.1"
+            "minimum_value": "0.1"
         },
         "infill_overlap": {
             "default_value": 10
diff --git a/resources/definitions/rigidbot_big.def.json b/resources/definitions/rigidbot_big.def.json
index 045f86fafe..ef2c93015d 100644
--- a/resources/definitions/rigidbot_big.def.json
+++ b/resources/definitions/rigidbot_big.def.json
@@ -89,7 +89,7 @@
         },
         "speed_layer_0": {
             "default_value": 15,
-            "min_value": "0.1"
+            "minimum_value": "0.1"
         },
         "infill_overlap": {
             "default_value": 10
diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json
index c61f43c37c..ae35858730 100644
--- a/resources/definitions/ultimaker2.def.json
+++ b/resources/definitions/ultimaker2.def.json
@@ -14,26 +14,26 @@
     },
     "overrides": {
         "machine_start_gcode" : {
-            "default": ""
+            "default_value": ""
         },
         "machine_end_gcode" : {
-            "default": ""
+            "default_value": ""
         },
         "machine_width": {
-            "default": 223
+            "default_value": 223
         },
         "machine_depth": {
-            "default": 223
+            "default_value": 223
         },
         "machine_height": {
-            "default": 205
+            "default_value": 205
         },
         "machine_heated_bed": {
-            "default": true
+            "default_value": true
         },
         "machine_head_with_fans_polygon":
         {
-            "default": [
+            "default_value": [
                 [ -42, 12 ],
                 [ -42, -32 ],
                 [ 62, 12 ],
@@ -41,45 +41,45 @@
             ]
         },
         "machine_center_is_zero": {
-            "default": false
+            "default_value": false
         },
         "machine_nozzle_size": {
-            "default": 0.4,
-            "min_value": "0.001"
+            "default_value": 0.4,
+            "minimum_value": "0.001"
         },
         "machine_nozzle_heat_up_speed": {
-            "default": 2
+            "default_value": 2
         },
         "machine_nozzle_cool_down_speed": {
-            "default": 2
+            "default_value": 2
         },
         "gantry_height": {
-            "default": 55
+            "default_value": 55
         },
         "machine_use_extruder_offset_to_offset_coords": {
-            "default": true
+            "default_value": true
         },
         "machine_gcode_flavor": {
-            "default": "UltiGCode"
+            "default_value": "UltiGCode"
         },
         "machine_disallowed_areas": {
-            "default": [
+            "default_value": [
               [[-115,  112.5], [ -82,  112.5], [ -84,  102.5], [-115,  102.5]],
               [[ 115,  112.5], [ 115,  102.5], [ 110,  102.5], [ 108,  112.5]],
               [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]],
               [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]]
         ]},
         "machine_platform_offset": {
-            "default": [9, 0, 0]
+            "default_value": [9, 0, 0]
         },
         "machine_nozzle_tip_outer_diameter": {
-            "default": 1
+            "default_value": 1
         },
         "machine_nozzle_head_distance": {
-            "default": 3
+            "default_value": 3
         },
         "machine_nozzle_expansion_angle": {
-            "default": 45
+            "default_value": 45
         },
         "material_print_temperature": {
             "enabled": "False"