diff --git a/resources/definitions/mbot3d_grid2plus.def.json b/resources/definitions/mbot3d_grid2plus.def.json
index 60d349dc76..e3ceb9d789 100644
--- a/resources/definitions/mbot3d_grid2plus.def.json
+++ b/resources/definitions/mbot3d_grid2plus.def.json
@@ -27,12 +27,11 @@
         "machine_width": { "default_value": 235 },
         "machine_depth": { "default_value": 210 },
         "machine_height": { "default_value": 190 },
-        "material_print_temperature": { "default_value": 220 },        
         "machine_heated_bed": { "default_value": true },
         "machine_center_is_zero": { "default_value": true },
         "machine_gcode_flavor": { "default_value": "Makerbot" },        
         "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] },
-        "gantry_height": { "default_value": 10 },
+        "gantry_height": { "value": 10 },
         "machine_steps_per_mm_x": { "default_value": 88.888889 },
         "machine_steps_per_mm_y": { "default_value": 88.888889 },
         "machine_steps_per_mm_z": { "default_value": 400 },
diff --git a/resources/definitions/mbot3d_grid2plus_dual.def.json b/resources/definitions/mbot3d_grid2plus_dual.def.json
index 5487a73e57..24c6d827c6 100644
--- a/resources/definitions/mbot3d_grid2plus_dual.def.json
+++ b/resources/definitions/mbot3d_grid2plus_dual.def.json
@@ -32,7 +32,7 @@
         "machine_center_is_zero": { "default_value": true },
         "machine_gcode_flavor": { "default_value": "Makerbot" },
         "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] },
-        "gantry_height": { "default_value": 10 },
+        "gantry_height": { "value": 10 },
         "machine_steps_per_mm_x": { "default_value": 88.888889 },
         "machine_steps_per_mm_y": { "default_value": 88.888889 },
         "machine_steps_per_mm_z": { "default_value": 400 },
diff --git a/resources/extruders/mbot3d_grid2_extruder_0.def.json b/resources/extruders/mbot3d_grid2_extruder_0.def.json
index 53cf86109b..7bfd5ffa9e 100644
--- a/resources/extruders/mbot3d_grid2_extruder_0.def.json
+++ b/resources/extruders/mbot3d_grid2_extruder_0.def.json
@@ -1,10 +1,9 @@
 {
-    "id": "mbot3d_grid2_extruder_0",
     "version": 2,
     "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "mbot3d_grid2",
+        "machine": "mbot3d_grid2plus",
         "position": "0"
     },
 
diff --git a/resources/extruders/mbot3d_grid2_extruder_left.def.json b/resources/extruders/mbot3d_grid2_extruder_left.def.json
index faa4065673..e8368cd1bb 100644
--- a/resources/extruders/mbot3d_grid2_extruder_left.def.json
+++ b/resources/extruders/mbot3d_grid2_extruder_left.def.json
@@ -1,10 +1,9 @@
 {
-    "id": "mbot3d_grid2_extruder_left",
     "version": 2,
     "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "mbot3d_grid2_dual",
+        "machine": "mbot3d_grid2plus_dual",
         "position": "0"
     },
 
diff --git a/resources/extruders/mbot3d_grid2_extruder_right.def.json b/resources/extruders/mbot3d_grid2_extruder_right.def.json
index 9f0a66e8af..fed6cc7333 100644
--- a/resources/extruders/mbot3d_grid2_extruder_right.def.json
+++ b/resources/extruders/mbot3d_grid2_extruder_right.def.json
@@ -1,10 +1,9 @@
 {
-    "id": "mbot3d_grid2_extruder_right",
     "version": 2,
     "name": "Extruder 2",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "mbot3d_grid2_dual",
+        "machine": "mbot3d_grid2plus_dual",
         "position": "1"
     },
 
diff --git a/resources/extruders/mbot3d_grid4_extruder_0.def.json b/resources/extruders/mbot3d_grid4_extruder_0.def.json
index c7897e1d32..a75145fb74 100644
--- a/resources/extruders/mbot3d_grid4_extruder_0.def.json
+++ b/resources/extruders/mbot3d_grid4_extruder_0.def.json
@@ -1,5 +1,4 @@
 {
-    "id": "mbot3d_grid4_extruder_0",
     "version": 2,
     "name": "Extruder 1",
     "inherits": "fdmextruder",
diff --git a/resources/extruders/mbot3d_grid4_extruder_left.def.json b/resources/extruders/mbot3d_grid4_extruder_left.def.json
index 191e1a0f2c..fb568c6eb6 100644
--- a/resources/extruders/mbot3d_grid4_extruder_left.def.json
+++ b/resources/extruders/mbot3d_grid4_extruder_left.def.json
@@ -1,5 +1,4 @@
 {
-    "id": "mbot3d_grid4_extruder_left",
     "version": 2,
     "name": "Extruder 1",
     "inherits": "fdmextruder",
diff --git a/resources/extruders/mbot3d_grid4_extruder_right.def.json b/resources/extruders/mbot3d_grid4_extruder_right.def.json
index 23d00131db..7b36ff22e4 100644
--- a/resources/extruders/mbot3d_grid4_extruder_right.def.json
+++ b/resources/extruders/mbot3d_grid4_extruder_right.def.json
@@ -1,5 +1,4 @@
 {
-    "id": "mbot3d_grid4_extruder_right",
     "version": 2,
     "name": "Extruder 2",
     "inherits": "fdmextruder",