diff --git a/platformio.ini b/platformio.ini
index 1f77f049da..93b53f38d8 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -198,6 +198,102 @@ default_envs =
     CR10V2_12MM_50W_ST
     CR10V2_12MM_PT
     CR10V2_12MM_50W_PT
+    CR10S
+    CR10S_50W
+    CR10S_ET
+    CR10S_50W_ET
+    CR10S_ST
+    CR10S_50W_ST
+    CR10S_PT
+    CR10S_50W_PT
+    CR10S_BLT
+    CR10S_BLT_50W
+    CR10S_BLT_ET
+    CR10S_BLT_50W_ET
+    CR10S_BLT_ST
+    CR10S_BLT_50W_ST
+    CR10S_BLT_PT
+    CR10S_BLT_50W_PT
+    CR10S_EZABL
+    CR10S_EZABL_50W
+    CR10S_EZABL_ET
+    CR10S_EZABL_50W_ET
+    CR10S_EZABL_ST
+    CR10S_EZABL_50W_ST
+    CR10S_EZABL_PT
+    CR10S_EZABL_50W_PT
+    CR10S_12MM
+    CR10S_12MM_50W
+    CR10S_12MM_ET
+    CR10S_12MM_50W_ET
+    CR10S_12MM_ST
+    CR10S_12MM_50W_ST
+    CR10S_12MM_PT
+    CR10S_12MM_50W_PT
+    CR10S4
+    CR10S4_50W
+    CR10S4_ET
+    CR10S4_50W_ET
+    CR10S4_ST
+    CR10S4_50W_ST
+    CR10S4_PT
+    CR10S4_50W_PT
+    CR10S4_BLT
+    CR10S4_BLT_50W
+    CR10S4_BLT_ET
+    CR10S4_BLT_50W_ET
+    CR10S4_BLT_ST
+    CR10S4_BLT_50W_ST
+    CR10S4_BLT_PT
+    CR10S4_BLT_50W_PT
+    CR10S4_EZABL
+    CR10S4_EZABL_50W
+    CR10S4_EZABL_ET
+    CR10S4_EZABL_50W_ET
+    CR10S4_EZABL_ST
+    CR10S4_EZABL_50W_ST
+    CR10S4_EZABL_PT
+    CR10S4_EZABL_50W_PT
+    CR10S4_12MM
+    CR10S4_12MM_50W
+    CR10S4_12MM_ET
+    CR10S4_12MM_50W_ET
+    CR10S4_12MM_ST
+    CR10S4_12MM_50W_ST
+    CR10S4_12MM_PT
+    CR10S4_12MM_50W_PT
+    CR10S5
+    CR10S5_50W
+    CR10S5_ET
+    CR10S5_50W_ET
+    CR10S5_ST
+    CR10S5_50W_ST
+    CR10S5_PT
+    CR10S5_50W_PT
+    CR10S5_BLT
+    CR10S5_BLT_50W
+    CR10S5_BLT_ET
+    CR10S5_BLT_50W_ET
+    CR10S5_BLT_ST
+    CR10S5_BLT_50W_ST
+    CR10S5_BLT_PT
+    CR10S5_BLT_50W_PT
+    CR10S5_EZABL
+    CR10S5_EZABL_50W
+    CR10S5_EZABL_ET
+    CR10S5_EZABL_50W_ET
+    CR10S5_EZABL_ST
+    CR10S5_EZABL_50W_ST
+    CR10S5_EZABL_PT
+    CR10S5_EZABL_50W_PT
+    CR10S5_12MM
+    CR10S5_12MM_50W
+    CR10S5_12MM_ET
+    CR10S5_12MM_50W_ET
+    CR10S5_12MM_ST
+    CR10S5_12MM_50W_ST
+    CR10S5_12MM_PT
+    CR10S5_12MM_50W_PT
     Ender3
     Ender3_50W
     Ender3_ET
@@ -2139,385 +2235,385 @@ build_flags = ${common.build_flags} -DMachineCR10S -DDDXExtruderKit -DABL_EZABL1
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit
 
 [env:CR10S4_50W]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DPID50W
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DPID50W
 
 [env:CR10S4_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DHotendE3D
 
 [env:CR10S4_50W_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DPID50W -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DPID50W -DHotendE3D
 
 [env:CR10S4_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DHotendMosquito
 
 [env:CR10S4_50W_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DPID50W -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DPID50W -DHotendMosquito
 
 [env:CR10S4_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DSlicePT1000
 
 [env:CR10S4_50W_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DPID50W -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DPID50W -DSlicePT1000
 
 [env:CR10S4_BLT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_BLTOUCH
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_BLTOUCH
 
 [env:CR10S4_BLT_50W]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W
 
 [env:CR10S4_BLT_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_BLTOUCH -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_BLTOUCH -DHotendE3D
 
 [env:CR10S4_BLT_50W_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W -DHotendE3D
 
 [env:CR10S4_BLT_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_BLTOUCH -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_BLTOUCH -DHotendMosquito
 
 [env:CR10S4_BLT_50W_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W -DHotendMosquito
 
 [env:CR10S4_BLT_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_BLTOUCH -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_BLTOUCH -DSlicePT1000
 
 [env:CR10S4_BLT_50W_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W -DSlicePT1000
 
 [env:CR10S4_EZABL]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL
 
 [env:CR10S4_EZABL_50W]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL -DPID50W
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL -DPID50W
 
 [env:CR10S4_EZABL_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL -DHotendE3D
 
 [env:CR10S4_EZABL_50W_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL -DPID50W -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL -DPID50W -DHotendE3D
 
 [env:CR10S4_EZABL_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL -DHotendMosquito
 
 [env:CR10S4_EZABL_50W_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL -DPID50W -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL -DPID50W -DHotendMosquito
 
 [env:CR10S4_EZABL_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL -DSlicePT1000
 
 [env:CR10S4_EZABL_50W_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL -DPID50W -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL -DPID50W -DSlicePT1000
 
 [env:CR10S4_12MM]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL12MM
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL12MM
 
 [env:CR10S4_12MM_50W]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W
 
 [env:CR10S4_12MM_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL12MM -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL12MM -DHotendE3D
 
 [env:CR10S4_12MM_50W_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W -DHotendE3D
 
 [env:CR10S4_12MM_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL12MM -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL12MM -DHotendMosquito
 
 [env:CR10S4_12MM_50W_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W -DHotendMosquito
 
 [env:CR10S4_12MM_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL12MM -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL12MM -DSlicePT1000
 
 [env:CR10S4_12MM_50W_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S4 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS4 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W -DSlicePT1000
 
 [env:CR10S5]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit
 
 [env:CR10S5_50W]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DPID50W
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DPID50W
 
 [env:CR10S5_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DHotendE3D
 
 [env:CR10S5_50W_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DPID50W -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DPID50W -DHotendE3D
 
 [env:CR10S5_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DHotendMosquito
 
 [env:CR10S5_50W_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DPID50W -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DPID50W -DHotendMosquito
 
 [env:CR10S5_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DSlicePT1000
 
 [env:CR10S5_50W_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DPID50W -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DPID50W -DSlicePT1000
 
 [env:CR10S5_BLT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_BLTOUCH
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_BLTOUCH
 
 [env:CR10S5_BLT_50W]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W
 
 [env:CR10S5_BLT_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_BLTOUCH -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_BLTOUCH -DHotendE3D
 
 [env:CR10S5_BLT_50W_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W -DHotendE3D
 
 [env:CR10S5_BLT_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_BLTOUCH -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_BLTOUCH -DHotendMosquito
 
 [env:CR10S5_BLT_50W_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W -DHotendMosquito
 
 [env:CR10S5_BLT_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_BLTOUCH -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_BLTOUCH -DSlicePT1000
 
 [env:CR10S5_BLT_50W_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_BLTOUCH -DPID50W -DSlicePT1000
 
 [env:CR10S5_EZABL]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL
 
 [env:CR10S5_EZABL_50W]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL -DPID50W
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL -DPID50W
 
 [env:CR10S5_EZABL_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL -DHotendE3D
 
 [env:CR10S5_EZABL_50W_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL -DPID50W -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL -DPID50W -DHotendE3D
 
 [env:CR10S5_EZABL_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL -DHotendMosquito
 
 [env:CR10S5_EZABL_50W_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL -DPID50W -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL -DPID50W -DHotendMosquito
 
 [env:CR10S5_EZABL_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL -DSlicePT1000
 
 [env:CR10S5_EZABL_50W_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL -DPID50W -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL -DPID50W -DSlicePT1000
 
 [env:CR10S5_12MM]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL12MM
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL12MM
 
 [env:CR10S5_12MM_50W]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W
 
 [env:CR10S5_12MM_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL12MM -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL12MM -DHotendE3D
 
 [env:CR10S5_12MM_50W_ET]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W -DHotendE3D
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W -DHotendE3D
 
 [env:CR10S5_12MM_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL12MM -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL12MM -DHotendMosquito
 
 [env:CR10S5_12MM_50W_ST]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W -DHotendMosquito
 
 [env:CR10S5_12MM_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL12MM -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL12MM -DSlicePT1000
 
 [env:CR10S5_12MM_50W_PT]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCR10S5 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W -DSlicePT1000
+build_flags = ${common.build_flags} -DMachineS5 -DDDXExtruderKit -DABL_EZABL12MM -DPID50W -DSlicePT1000
 
 [env:Ender3]
 platform      = atmelavr