diff --git a/config/mcu_definitions/mmu/Fysetc_ERCF_ERB.cfg b/config/mcu_definitions/mmu/Fysetc_ERCF_ERB.cfg
index c19425156..e7f01e7d4 100644
--- a/config/mcu_definitions/mmu/Fysetc_ERCF_ERB.cfg
+++ b/config/mcu_definitions/mmu/Fysetc_ERCF_ERB.cfg
@@ -12,10 +12,11 @@ aliases:
     MCU_ENCODER=gpio22     ,
     MCU_RGB=gpio21         ,
 
-    MCU_UART0_TX=gpio0  , MCU_UART0_RX=gpio1  ,
-    MCU_SPI0_SCK=gpio2  , MCU_SPI0_MISO=gpio3 ,
-    MCU_SPI0_MOSI=gpio4 , MCU_SPI0_CS=gpio5   ,
-    MCU_I2C1_SDA=gpio6  , MCU_I2C1_SCL=gpio7  ,
-    MCU_ADC0=gpio26     , MCU_ADC1=gpio27     ,
-    MCU_ADC2=gpio28     , MCU_ADC3=gpio29     ,
-    GND=<GND>           , 5V=<5V>             ,
+    # EXTRA PINS header
+    MCU_0=gpio0   , MCU_1=gpio1   ,
+    MCU_2=gpio2   , MCU_3=gpio3   ,
+    MCU_4=gpio4   , MCU_5=gpio5   ,
+    MCU_6=gpio6   , MCU_7=gpio7   ,
+    MCU_26=gpio26 , MCU_27=gpio27 ,
+    MCU_28=gpio28 , MCU_29=gpio29 ,
+    GND=<GND>     , 5V=<5V>       ,
diff --git a/user_templates/mcu_defaults/mmu/Fysetc_ERCF_ERB.cfg b/user_templates/mcu_defaults/mmu/Fysetc_ERCF_ERB.cfg
index 7e92e2fed..592b77464 100644
--- a/user_templates/mcu_defaults/mmu/Fysetc_ERCF_ERB.cfg
+++ b/user_templates/mcu_defaults/mmu/Fysetc_ERCF_ERB.cfg
@@ -1,6 +1,6 @@
 
 #---------------------------------------------#
-#### Mellow Fly ERCF MCU definition ###########
+#### Fysetc ERCF ERB MCU definition ###########
 #---------------------------------------------#
 
 [mcu mmu]
@@ -9,7 +9,7 @@ serial: /dev/serial/by-id/change-me-to-the-correct-mcu-path
 # canbus_uuid: change-me-to-the-correct-canbus-id
 ##--------------------------------------------------------------------
 
-# If you want to override the wiring of the Mellow Fly ERCF board, keep in mind that this
+# If you want to override the wiring of the Fysetc ERCF ERB board, keep in mind that this
 # board is defined using the "mmu" name. So you should use "pin: mmu:PIN_NAME"
 # in your own overrides.cfg files.
 
@@ -17,21 +17,21 @@ serial: /dev/serial/by-id/change-me-to-the-correct-mcu-path
 [board_pins mmu_mcu]
 mcu: mmu
 aliases:
-    MMU_GEAR_STEP=MCU_GEAR_STEP    , MMU_GEAR_DIR=MCU_GEAR_DIR    , MMU_GEAR_ENABLE=MCU_GEAR_EN    , MMU_GEAR_UART=MCU_GEAR_UART    ,
-    MMU_GEAR_DIAG=MCU_GEAR_DIAG    ,
-    MMU_SEL_STEP=MCU_SELECTOR_STEP , MMU_SEL_DIR=MCU_SELECTOR_DIR , MMU_SEL_ENABLE=MCU_SELECTOR_EN , MMU_SEL_UART=MCU_SELECTOR_UART ,
-    MMU_SEL_DIAG=MCU_SELECTOR_DIAG ,
-
-    MMU_SEL_ENDSTOP=MCU_ENDSTOP    ,
-    MMU_SERVO=MCU_SERVO            ,
-    MMU_ENCODER=MCU_ENCODER        ,
-    MMU_GATE_SENSOR=MCU_EXTRA      ,
-
-    SPI_SCLK=MCU_SCK , SPI_MOSI=MCU_MOSI , SPI_MISO=MCU_MISO ,
-
-    MMU_PRE_GATE_0=MCU_IO26  , MMU_PRE_GATE_1=MCU_IO10  ,
-    MMU_PRE_GATE_2=MCU_IO27  , MMU_PRE_GATE_3=MCU_IO11  ,
-    MMU_PRE_GATE_4=MCU_IO28  , MMU_PRE_GATE_5=MCU_IO12  ,
-    MMU_PRE_GATE_6=MCU_IO29  , MMU_PRE_GATE_7=MCU_IO24  ,
-    MMU_PRE_GATE_8=MCU_IO25  , MMU_PRE_GATE_9=MCU_IO13  ,
+    MMU_GEAR_STEP=MCU_GEAR_MOTOR_STEP    , MMU_GEAR_DIR=MCU_GEAR_MOTOR_DIR    , MMU_GEAR_ENABLE=MCU_GEAR_MOTOR_EN    , MMU_GEAR_UART=MCU_GEAR_MOTOR_UART    ,
+    MMU_GEAR_DIAG=MCU_GEAR_MOTOR_DIAG    ,
+    MMU_SEL_STEP=MCU_SELECTOR_MOTOR_STEP , MMU_SEL_DIR=MCU_SELECTOR_MOTOR_DIR , MMU_SEL_ENABLE=MCU_SELECTOR_MOTOR_EN , MMU_SEL_UART=MCU_SELECTOR_MOTOR_UART ,
+    MMU_SEL_DIAG=MCU_SELECTOR_MOTOR_DIAG ,
+
+    MMU_SEL_ENDSTOP=MCU_ENDSTOP     ,
+    MMU_SERVO=MCU_SERVO             ,
+    MMU_ENCODER=MCU_ENCODER         ,
+    MMU_GATE_SENSOR=MCU_HALL_SENSOR ,
+    MMU_NEOPIXEL=MCU_RGB            ,
+
+    MMU_PRE_GATE_0=MCU_0   , MMU_PRE_GATE_1=MCU_1   ,
+    MMU_PRE_GATE_2=MCU_2   , MMU_PRE_GATE_3=MCU_3   ,
+    MMU_PRE_GATE_4=MCU_4   , MMU_PRE_GATE_5=MCU_5   ,
+    MMU_PRE_GATE_6=MMCU_6  , MMU_PRE_GATE_7=MCU_7   ,
+    MMU_PRE_GATE_8=MCU_26  , MMU_PRE_GATE_9=MCU_27  ,
+    MMU_PRE_GATE_10=MCU_28 , MMU_PRE_GATE_11=MCU_29 ,