diff --git a/machine.cfg b/machine.cfg
index 3c791aa..6f3da63 100644
--- a/machine.cfg
+++ b/machine.cfg
@@ -49,8 +49,8 @@ homing_retract_dist: 5
 homing_positive_dir: true
 
 [tmc2209 stepper_x]
-uart_pin: X_UART
-tx_pin: X_TX
+uart_pin: UART
+tx_pin: TX
 uart_address: 0
 interpolate: True
 run_current: 0.5
@@ -76,8 +76,8 @@ homing_retract_dist: 5
 homing_positive_dir: true
 
 [tmc2209 stepper_y]
-uart_pin: Y_UART
-tx_pin: Y_TX
+uart_pin: UART
+tx_pin: TX
 uart_address: 2
 interpolate: True
 run_current: 0.5
@@ -106,8 +106,8 @@ second_homing_speed: 3.0
 homing_retract_dist: 3.0
 
 [tmc2209 stepper_z]
-uart_pin: Z_UART
-tx_pin: Z_TX
+uart_pin: UART
+tx_pin: TX
 uart_address: 1
 interpolate: true
 run_current: 0.75    # TL-42BYGH23 1.0A 2.1N-cm 
@@ -152,8 +152,8 @@ pressure_advance_smooth_time: 0.040
 
 ##	E0 on MCU
 [tmc2209 extruder]
-uart_pin: E0_UART
-tx_pin: E0_TX
+uart_pin: UART
+tx_pin: TX
 uart_address: 3
 interpolate: True
 run_current: 0.3
diff --git a/pinouts.d/btt-skr-mini-e3-v2.0.cfg b/pinouts.d/btt-skr-mini-e3-v2.0.cfg
index 22d5643..360a9c9 100644
--- a/pinouts.d/btt-skr-mini-e3-v2.0.cfg
+++ b/pinouts.d/btt-skr-mini-e3-v2.0.cfg
@@ -26,11 +26,12 @@ aliases:
     E1_STOP=PA0,
 
     # Steppers
-     X_STEP=PB13, X_DIR=PB12,  X_ENABLE=PB14,  X_UART=PC11,  X_TX=PC10,
-     Y_STEP=PB10, Y_DIR=PB2,   Y_ENABLE=PB11,  Y_UART=PC11,  Y_TX=PC10,
-     Z_STEP=PB0,  Z_DIR=PC5,   Z_ENABLE=PB1,   Z_UART=PC11,  Z_TX=PC10,
-    E0_STEP=PB3, E0_DIR=PB4,  E0_ENABLE=PD2,  E0_UART=PC11, E0_TX=PC10,
-    
+     X_STEP=PB13, X_DIR=PB12,  X_ENABLE=PB14,
+     Y_STEP=PB10, Y_DIR=PB2,   Y_ENABLE=PB11,
+     Z_STEP=PB0,  Z_DIR=PC5,   Z_ENABLE=PB1,
+    E0_STEP=PB3, E0_DIR=PB4,  E0_ENABLE=PD2,
+       UART=PC11,    TX=PC10,
+
     TEMP_0=PA0,
     TEMP_BED=PC3,