diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
index ee17c317..fca4d3f3 100755
--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -65,12 +65,12 @@ jobs:
          - MEGA_X_DGUS_BLT_11
          - MEGA_X_DGUS_TMC_BLT_10
          - MEGA_X_DGUS_TMC_BLT_11
-         - MEGA_P
-         - MEGA_P_TMC
-         - MEGA_P_BLT_10
-         - MEGA_P_BLT_11
-         - MEGA_P_TMC_BLT_10
-         - MEGA_P_TMC_BLT_11
+         - MEGA_P_DGUS
+         - MEGA_P_DGUS_TMC
+         - MEGA_P_DGUS_BLT_10
+         - MEGA_P_DGUS_BLT_11
+         - MEGA_P_DGUS_TMC_BLT_10
+         - MEGA_P_DGUS_TMC_BLT_11
          - CHIRON
          - CHIRON_TMC
          - CHIRON_DGUS
diff --git a/ini/i3_mega.ini b/ini/i3_mega.ini
index 7511b667..18814c0f 100755
--- a/ini/i3_mega.ini
+++ b/ini/i3_mega.ini
@@ -392,7 +392,7 @@ build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNU
 #
 #  i3 Mega P
 #
-[env:MEGA_P]
+[env:MEGA_P_DGUS]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -402,7 +402,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 -DKNUTWURST_4MAX
 
-[env:MEGA_P_TMC]
+[env:MEGA_P_DGUS_TMC]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -412,7 +412,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_P -DKNUTWURST_TMC -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 -DKNUTWURST_4MAX
 
-[env:MEGA_P_BLT_10]
+[env:MEGA_P_DGUS_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -422,7 +422,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 -DKNUTWURST_4MAX
 
-[env:MEGA_P_BLT_11]
+[env:MEGA_P_DGUS_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -432,7 +432,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 -DKNUTWURST_4MAX
 
-[env:MEGA_P_TMC_BLT_10]
+[env:MEGA_P_DGUS_TMC_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -442,7 +442,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 -DKNUTWURST_4MAX
 
-[env:MEGA_P_TMC_BLT_11]
+[env:MEGA_P_DGUS_TMC_BLT_11]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L