diff --git a/firmware/config/boards/cypress/efifeatures.h b/firmware/config/boards/cypress/efifeatures.h
index 76f0fe7a17..ef07e08ad3 100644
--- a/firmware/config/boards/cypress/efifeatures.h
+++ b/firmware/config/boards/cypress/efifeatures.h
@@ -272,7 +272,7 @@
 #define TS_CAN_DEVICE_SHORT_PACKETS_IN_ONE_FRAME
 
 #undef TS_PRIMARY_UxART_PORT
-#undef TS_SECONDARY_PORT
+#undef TS_SECONDARY_UxART_PORT
 
 #define EFI_USB_SERIAL TRUE
 #define EFI_CONSOLE_USB_DEVICE SDU1
diff --git a/firmware/config/boards/kinetis/efifeatures.h b/firmware/config/boards/kinetis/efifeatures.h
index 3464e09ded..b49bb92198 100644
--- a/firmware/config/boards/kinetis/efifeatures.h
+++ b/firmware/config/boards/kinetis/efifeatures.h
@@ -260,7 +260,7 @@
 #define EFI_USE_UART_DMA FALSE
 
 #define TS_PRIMARY_UxART_PORT UARTD2
-#undef TS_SECONDARY_PORT
+#undef TS_SECONDARY_UxART_PORT
 
 #define EFI_CONSOLE_TX_BRAIN_PIN Gpio::A10
 #define EFI_CONSOLE_RX_BRAIN_PIN Gpio::A11
diff --git a/firmware/config/boards/prometheus/efifeatures.h b/firmware/config/boards/prometheus/efifeatures.h
index 625a3403f1..49b00cea79 100644
--- a/firmware/config/boards/prometheus/efifeatures.h
+++ b/firmware/config/boards/prometheus/efifeatures.h
@@ -40,7 +40,7 @@
 #undef EFI_UART_GPS
 #define EFI_UART_GPS FALSE
 
-#undef TS_SECONDARY_PORT
+#undef TS_SECONDARY_UxART_PORT
 
 #undef EFI_BLUETOOTH_SETUP
 #define EFI_BLUETOOTH_SETUP TRUE
diff --git a/firmware/config/boards/subaru_eg33/efifeatures.h b/firmware/config/boards/subaru_eg33/efifeatures.h
index 7b87dc6941..490c127f3a 100644
--- a/firmware/config/boards/subaru_eg33/efifeatures.h
+++ b/firmware/config/boards/subaru_eg33/efifeatures.h
@@ -25,7 +25,7 @@
 #define TS_PRIMARY_UxART_PORT		SD1
 
 // no secondary channel
-#undef TS_SECONDARY_PORT
+#undef TS_SECONDARY_UxART_PORT
 
 /* Knock detection */
 #undef EFI_HIP_9011
diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h
index b6e366304f..c7678fb293 100644
--- a/firmware/config/stm32f4ems/efifeatures.h
+++ b/firmware/config/stm32f4ems/efifeatures.h
@@ -398,7 +398,7 @@
 #define TS_PRIMARY_UxART_PORT UARTD3
 #endif
 
-#undef TS_SECONDARY_PORT
+#undef TS_SECONDARY_UxART_PORT
 
 #define AUX_SERIAL_DEVICE (&SD6)
 
diff --git a/firmware/console/binary/tunerstudio_io.h b/firmware/console/binary/tunerstudio_io.h
index 8f5fcd09b8..0fdfaf15cf 100644
--- a/firmware/console/binary/tunerstudio_io.h
+++ b/firmware/console/binary/tunerstudio_io.h
@@ -16,7 +16,7 @@
 	#define HAS_UxART_PRIMARY false
 #endif
 
-#if (!TS_NO_SECONDARY && defined(TS_SECONDARY_PORT))
+#if (!TS_NO_SECONDARY && defined(TS_SECONDARY_UxART_PORT))
 	#define HAS_UxART_SECONDARY true
 #else
 	#define HAS_UxART_SECONDARY false
diff --git a/firmware/console/binary/tunerstudio_io_serial_ports.cpp b/firmware/console/binary/tunerstudio_io_serial_ports.cpp
index 9241402921..cd1ff2aee0 100644
--- a/firmware/console/binary/tunerstudio_io_serial_ports.cpp
+++ b/firmware/console/binary/tunerstudio_io_serial_ports.cpp
@@ -59,16 +59,16 @@ class SerialTsChannel;
 #endif // HAS_UxART_PRIMARY
 
 #if HAS_UxART_SECONDARY
-#ifdef TS_SECONDARY_PORT
+#ifdef TS_SECONDARY_UxART_PORT
 	std::conditional_t<
-		std::is_same_v<decltype(TS_SECONDARY_PORT), UARTDriver>,
+		std::is_same_v<decltype(TS_SECONDARY_UxART_PORT), UARTDriver>,
 #if EFI_USE_UART_DMA
 		UartDmaTsChannel,
 #else // EFI_USE_UART_DMA
 		UartTsChannel,
 #endif // EFI_USE_UART_DMA
-		SerialTsChannel> secondaryChannel(TS_SECONDARY_PORT);
-#endif // TS_SECONDARY_PORT
+		SerialTsChannel> secondaryChannel(TS_SECONDARY_UxART_PORT);
+#endif // TS_SECONDARY_UxART_PORT
 
 
 	struct SecondaryChannelThread : public TunerstudioThread {
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index 40152de51c..6222df02bf 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -9,7 +9,7 @@
 
 // see SIM_SD1_PORT and SIM_SD2_PORT
 #define TS_PRIMARY_UxART_PORT SD1
-#define TS_SECONDARY_PORT SD2
+#define TS_SECONDARY_UxART_PORT SD2
 
 #define EFI_ENABLE_ASSERTS TRUE
 #define EFI_LAUNCH_CONTROL TRUE