diff --git a/resources/definitions/z-bolt_classic.def.json b/resources/definitions/z-bolt_classic.def.json
index 09818df836..d294de473a 100644
--- a/resources/definitions/z-bolt_classic.def.json
+++ b/resources/definitions/z-bolt_classic.def.json
@@ -10,7 +10,7 @@
         "platform": "z-bolt_classic_platform.stl",
         "machine_extruder_trains":
         {
-            "0": "z-bolt_classic_extruder_0"
+            "0": "z-bolt_extruder_0"
         }
     },
 
@@ -53,7 +53,7 @@
             "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
         },
         "machine_end_gcode": {
-            "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'"
+            "default_value": "'M104 S0 ;extruder heater off' + ('\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning'"
         }
     }
 }
\ No newline at end of file
diff --git a/resources/definitions/z-bolt_plus.def.json b/resources/definitions/z-bolt_plus.def.json
index 4fb989742f..57331df4c6 100644
--- a/resources/definitions/z-bolt_plus.def.json
+++ b/resources/definitions/z-bolt_plus.def.json
@@ -10,7 +10,7 @@
         "platform": "z-bolt_plus_platform.stl",
         "machine_extruder_trains":
         {
-            "0": "z-bolt_plus_extruder_0"
+            "0": "z-bolt_extruder_0"
         }
     },
 
@@ -53,7 +53,7 @@
             "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
         },
         "machine_end_gcode": {
-            "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'"
+            "default_value": "'M104 S0 ;extruder heater off' + ('\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning'"
         }
     }
 }
\ No newline at end of file
diff --git a/resources/extruders/z-bolt_classic_extruder_0.def.json b/resources/extruders/z-bolt_classic_extruder_0.def.json
deleted file mode 100644
index c3d4a8c08c..0000000000
--- a/resources/extruders/z-bolt_classic_extruder_0.def.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "id": "z-bolt_classic_extruder_0",
-    "version": 2,
-    "name": "Extruder 1",
-    "inherits": "fdmextruder",
-    "metadata": {
-        "machine": "z-bolt_classic",
-        "position": 0
-    },
-
-    "overrides": {
-        "extruder_nr": { "default_value": 0 },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 1.75 }
-    }
-}
diff --git a/resources/extruders/z-bolt_extruder_0.def.json b/resources/extruders/z-bolt_extruder_0.def.json
new file mode 100644
index 0000000000..aa9b0f1db2
Binary files /dev/null and b/resources/extruders/z-bolt_extruder_0.def.json differ
diff --git a/resources/extruders/z-bolt_plus_extruder_0.def.json b/resources/extruders/z-bolt_plus_extruder_0.def.json
deleted file mode 100644
index 78aa32b105..0000000000
--- a/resources/extruders/z-bolt_plus_extruder_0.def.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "id": "z-bolt_plus_extruder_0",
-    "version": 2,
-    "name": "Extruder 1",
-    "inherits": "fdmextruder",
-    "metadata": {
-        "machine": "z-bolt_plus",
-        "position": 0
-    },
-
-    "overrides": {
-        "extruder_nr": { "default_value": 0 },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 1.75 }
-    }
-}