diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json
index a81a40542b..ad0182a5f6 100644
--- a/resources/definitions/kupido.def.json
+++ b/resources/definitions/kupido.def.json
@@ -18,12 +18,12 @@
         "supports_usb_connection": false,
         "machine_extruder_trains":
         {
-            "0": "alya3dp_extruder_0"
+            "0": "kupido_extruder_0"
         }
     },
 
     "overrides": {
-        "machine_name": { "default_value": "ALYA 3DP" },
+        "machine_name": { "default_value": "KUPIDO" },
         "machine_heated_bed":          {   "default_value": true            },
         "machine_width":               {   "default_value": 195             },
         "machine_height":              {   "default_value": 190             },
diff --git a/resources/extruders/bibo2_dual_extruder_0.def.json b/resources/extruders/bibo2_dual_extruder_0.def.json
index b918d070be..91508ecc6d 100644
--- a/resources/extruders/bibo2_dual_extruder_0.def.json
+++ b/resources/extruders/bibo2_dual_extruder_0.def.json
@@ -1,45 +1,45 @@
 {
-	"version": 2,
-	"name": "Extruder 1",
-	"inherits": "fdmextruder",
-	"metadata": {
-		"machine": "BIBO2 dual",
-		"position": "0"
-	},
-	"overrides": {
-		"extruder_nr": {
-			"default_value": 0,
-			"maximum_value": "1"
-		},
-		"material_diameter": {
-			"default_value": 1.75
-		},
-		"machine_nozzle_size": {
-			"default_value": 0.4
-		},
-		"machine_nozzle_offset_x": {
-			"default_value": 0.0
-		},
-		"machine_nozzle_offset_y": {
-			"default_value": 0.0
-		},
-		"machine_extruder_start_pos_abs": {
-			"default_value": true
-		},
-		"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": {
-			"value": "prime_tower_position_x"
-		},
-		"machine_extruder_end_pos_y": {
-			"value": "prime_tower_position_y"
-		}
-	}
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "bibo2_dual",
+        "position": "0"
+    },
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_nozzle_offset_x": {
+            "default_value": 0.0
+        },
+        "machine_nozzle_offset_y": {
+            "default_value": 0.0
+        },
+        "machine_extruder_start_pos_abs": {
+            "default_value": true
+        },
+        "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": {
+            "value": "prime_tower_position_x"
+        },
+        "machine_extruder_end_pos_y": {
+            "value": "prime_tower_position_y"
+        }
+    }
 }
diff --git a/resources/extruders/bibo2_dual_extruder_1.def.json b/resources/extruders/bibo2_dual_extruder_1.def.json
index e0386188bb..129ad27273 100644
--- a/resources/extruders/bibo2_dual_extruder_1.def.json
+++ b/resources/extruders/bibo2_dual_extruder_1.def.json
@@ -1,45 +1,45 @@
 {
-	"version": 2,
-	"name": "Extruder 2",
-	"inherits": "fdmextruder",
-	"metadata": {
-		"machine": "BIBO2 dual",
-		"position": "1"
-	},
-	"overrides": {
-		"extruder_nr": {
-			"default_value": 1,
-			"maximum_value": "1"
-		},
-		"material_diameter": {
-			"default_value": 1.75
-		},
-		"machine_nozzle_size": {
-			"default_value": 0.4
-		},
-		"machine_nozzle_offset_x": {
-			"default_value": 0.0
-		},
-		"machine_nozzle_offset_y": {
-			"default_value": 0.0
-		},
-		"machine_extruder_start_pos_abs": {
-			"default_value": true
-		},
-		"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": {
-			"value": "prime_tower_position_x"
-		},
-		"machine_extruder_end_pos_y": {
-			"value": "prime_tower_position_y"
-		}
-	}
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "bibo2_dual",
+        "position": "1"
+    },
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_nozzle_offset_x": {
+            "default_value": 0.0
+        },
+        "machine_nozzle_offset_y": {
+            "default_value": 0.0
+        },
+        "machine_extruder_start_pos_abs": {
+            "default_value": true
+        },
+        "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": {
+            "value": "prime_tower_position_x"
+        },
+        "machine_extruder_end_pos_y": {
+            "value": "prime_tower_position_y"
+        }
+    }
 }
diff --git a/resources/extruders/cr-x_extruder_0.def.json b/resources/extruders/cr-x_extruder_0.def.json
index 4e73fd0e8e..d9b7b03021 100644
--- a/resources/extruders/cr-x_extruder_0.def.json
+++ b/resources/extruders/cr-x_extruder_0.def.json
@@ -3,7 +3,7 @@
     "name": "Left Extruder",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "Creality CR-X",
+        "machine": "creality_cr-x",
         "position": "0"
     },
 
diff --git a/resources/extruders/cr-x_extruder_1.def.json b/resources/extruders/cr-x_extruder_1.def.json
index ed6056dab9..8e763df64f 100644
--- a/resources/extruders/cr-x_extruder_1.def.json
+++ b/resources/extruders/cr-x_extruder_1.def.json
@@ -3,7 +3,7 @@
     "name": "Right Extruder",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "Creality CR-X",
+        "machine": "creality_cr-x",
         "position": "1"
     },
 
diff --git a/resources/extruders/creatable_d3_extruder_0.def.json b/resources/extruders/creatable_d3_extruder_0.def.json
index 6a805febd5..95883d0f69 100644
--- a/resources/extruders/creatable_d3_extruder_0.def.json
+++ b/resources/extruders/creatable_d3_extruder_0.def.json
@@ -3,7 +3,7 @@
     "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "Creatable_D3",
+        "machine": "creatable_d3",
         "position": "0"
     },
 
diff --git a/resources/extruders/hellbot_magna_i_extruder.def.json b/resources/extruders/hellbot_magna_i_extruder.def.json
index dc63081bd2..70117c2aed 100644
--- a/resources/extruders/hellbot_magna_i_extruder.def.json
+++ b/resources/extruders/hellbot_magna_i_extruder.def.json
@@ -3,7 +3,7 @@
     "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "hellbot_magna_i",
+        "machine": "hellbot_magna_I",
         "position": "0"
     },
 
diff --git a/resources/extruders/key3d_tyro_extruder_0.def.json b/resources/extruders/key3d_tyro_extruder_0.def.json
index 11619da332..f08ae351ab 100644
--- a/resources/extruders/key3d_tyro_extruder_0.def.json
+++ b/resources/extruders/key3d_tyro_extruder_0.def.json
@@ -3,7 +3,7 @@
     "name": "0.4mm Nozzle",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "Tyro",
+        "machine": "key3d_tyro",
         "position": "0"
     },