diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json
index f1c80680c3..e379d978a9 100644
--- a/resources/definitions/ultimaker_original_dual.def.json
+++ b/resources/definitions/ultimaker_original_dual.def.json
@@ -17,8 +17,8 @@
         "preferred_quality": "*normal*",
         "machine_extruder_trains":
         {
-            "0": "ultimaker_original_dual_left",
-            "1": "ultimaker_original_dual_right"
+            "0": "ultimaker_original_dual_1st",
+            "1": "ultimaker_original_dual_2nd"
         },
         "first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"],
         "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"]
@@ -65,10 +65,10 @@
             "default_value": "RepRap (Marlin/Sprinter)"
         },
         "machine_start_gcode": {
-            "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..."
+            "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\nT1 ;Switch to the 2nd extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F200 E-{switch_extruder_retraction_amount}\nT0 ;Switch to the 1st extruder\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": {
-            "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\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 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
+            "default_value": "M104 T0 S0 ;1st extruder heater off\nM104 T1 S0 ;2nd extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\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 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
         },
         "machine_extruder_count": {
             "default_value": 2
diff --git a/resources/extruders/ultimaker_original_dual_left.def.json b/resources/extruders/ultimaker_original_dual_1st.def.json
similarity index 58%
rename from resources/extruders/ultimaker_original_dual_left.def.json
rename to resources/extruders/ultimaker_original_dual_1st.def.json
index 1bbb6f9035..058dbf3028 100644
--- a/resources/extruders/ultimaker_original_dual_left.def.json
+++ b/resources/extruders/ultimaker_original_dual_1st.def.json
@@ -1,7 +1,7 @@
 {
-    "id": "ultimaker_original_dual_left",
+    "id": "ultimaker_original_dual_1st",
     "version": 2,
-    "name": "Left Extruder",
+    "name": "1st Extruder",
     "inherits": "fdmextruder",
     "metadata": {
         "machine": "ultimaker_original_dual",
@@ -17,10 +17,10 @@
         "machine_nozzle_offset_y": { "default_value": 0.0 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
-        "machine_extruder_start_pos_x": { "default_value": 185 },
-        "machine_extruder_start_pos_y": { "default_value": 155 },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
         "machine_extruder_end_pos_abs": { "default_value": true },
-        "machine_extruder_end_pos_x": { "default_value": 185 },
-        "machine_extruder_end_pos_y": { "default_value": 155 }
+        "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }
     }
 }
diff --git a/resources/extruders/ultimaker_original_dual_right.def.json b/resources/extruders/ultimaker_original_dual_2nd.def.json
similarity index 58%
rename from resources/extruders/ultimaker_original_dual_right.def.json
rename to resources/extruders/ultimaker_original_dual_2nd.def.json
index 97d2217326..4b600d0281 100644
--- a/resources/extruders/ultimaker_original_dual_right.def.json
+++ b/resources/extruders/ultimaker_original_dual_2nd.def.json
@@ -1,7 +1,7 @@
 {
-    "id": "ultimaker_original_dual_right",
+    "id": "ultimaker_original_dual_2nd",
     "version": 2,
-    "name": "Right Extruder",
+    "name": "2nd Extruder",
     "inherits": "fdmextruder",
     "metadata": {
         "machine": "ultimaker_original_dual",
@@ -17,10 +17,10 @@
         "machine_nozzle_offset_y": { "default_value": 21.6 },
 
         "machine_extruder_start_pos_abs": { "default_value": true },
-        "machine_extruder_start_pos_x": { "default_value": 213 },
-        "machine_extruder_start_pos_y": { "default_value": 189 },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
         "machine_extruder_end_pos_abs": { "default_value": true },
-        "machine_extruder_end_pos_x": { "default_value": 213 },
-        "machine_extruder_end_pos_y": { "default_value": 189 }
+        "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }
     }
 }