diff --git a/hal/architecture/MyHwAVR.cpp b/hal/architecture/MyHwAVR.cpp
index b7158fe..f45556a 100644
--- a/hal/architecture/MyHwAVR.cpp
+++ b/hal/architecture/MyHwAVR.cpp
@@ -305,7 +305,7 @@ void hwDebugPrint(const char *fmt, ... )
 {
 #ifndef MY_DISABLED_SERIAL
 	char fmtBuffer[MY_SERIAL_OUTPUT_SIZE];
-#ifdef MY_GATEWAY_FEATURE
+#ifdef MY_GATEWAY_SERIAL
 	// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
 	snprintf_P(fmtBuffer, sizeof(fmtBuffer), PSTR("0;255;%d;0;%d;%lu "),
 	           C_INTERNAL, I_LOG_MESSAGE, hwMillis());
@@ -317,13 +317,11 @@ void hwDebugPrint(const char *fmt, ... )
 #endif
 	va_list args;
 	va_start (args, fmt );
-#ifdef MY_GATEWAY_FEATURE
-	// Truncate message if this is gateway node
 	vsnprintf_P(fmtBuffer, sizeof(fmtBuffer), fmt, args);
+#ifdef MY_GATEWAY_SERIAL
+	// Truncate message if this is gateway node
 	fmtBuffer[sizeof(fmtBuffer) - 2] = '\n';
 	fmtBuffer[sizeof(fmtBuffer) - 1] = '\0';
-#else
-	vsnprintf_P(fmtBuffer, sizeof(fmtBuffer), fmt, args);
 #endif
 	va_end (args);
 	MY_SERIALDEVICE.print(fmtBuffer);
diff --git a/hal/architecture/MyHwESP8266.cpp b/hal/architecture/MyHwESP8266.cpp
index 92ff089..d732716 100644
--- a/hal/architecture/MyHwESP8266.cpp
+++ b/hal/architecture/MyHwESP8266.cpp
@@ -151,7 +151,7 @@ void hwDebugPrint(const char *fmt, ... )
 {
 #ifndef MY_DISABLED_SERIAL
 	char fmtBuffer[MY_SERIAL_OUTPUT_SIZE];
-#ifdef MY_GATEWAY_FEATURE
+#ifdef MY_GATEWAY_SERIAL
 	// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
 	snprintf_P(fmtBuffer, sizeof(fmtBuffer), PSTR("0;255;%d;0;%d;%lu "), C_INTERNAL, I_LOG_MESSAGE,
 	           hwMillis());
@@ -163,13 +163,11 @@ void hwDebugPrint(const char *fmt, ... )
 #endif
 	va_list args;
 	va_start (args, fmt );
-#ifdef MY_GATEWAY_FEATURE
-	// Truncate message if this is gateway node
 	vsnprintf_P(fmtBuffer, sizeof(fmtBuffer), fmt, args);
+#ifdef MY_GATEWAY_SERIAL
+	// Truncate message if this is gateway node
 	fmtBuffer[sizeof(fmtBuffer) - 2] = '\n';
 	fmtBuffer[sizeof(fmtBuffer) - 1] = '\0';
-#else
-	vsnprintf_P(fmtBuffer, sizeof(fmtBuffer), fmt, args);
 #endif
 	va_end (args);
 	MY_SERIALDEVICE.print(fmtBuffer);
diff --git a/hal/architecture/MyHwNRF5.cpp b/hal/architecture/MyHwNRF5.cpp
index 3aa7b49..bfad538 100644
--- a/hal/architecture/MyHwNRF5.cpp
+++ b/hal/architecture/MyHwNRF5.cpp
@@ -474,7 +474,7 @@ void hwDebugPrint(const char *fmt, ...)
 {
 #ifndef MY_DISABLED_SERIAL
 	char fmtBuffer[MY_SERIAL_OUTPUT_SIZE];
-#ifdef MY_GATEWAY_FEATURE
+#ifdef MY_GATEWAY_SERIAL
 	// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
 	snprintf(fmtBuffer, sizeof(fmtBuffer), PSTR("0;255;%d;0;%d;%lu "),
 	         C_INTERNAL, I_LOG_MESSAGE, hwMillis());
@@ -486,13 +486,11 @@ void hwDebugPrint(const char *fmt, ...)
 #endif
 	va_list args;
 	va_start (args, fmt );
-#ifdef MY_GATEWAY_FEATURE
-	// Truncate message if this is gateway node
 	vsnprintf(fmtBuffer, sizeof(fmtBuffer), fmt, args);
+#ifdef MY_GATEWAY_SERIAL
+	// Truncate message if this is gateway node
 	fmtBuffer[sizeof(fmtBuffer) - 2] = '\n';
 	fmtBuffer[sizeof(fmtBuffer) - 1] = '\0';
-#else
-	vsnprintf(fmtBuffer, sizeof(fmtBuffer), fmt, args);
 #endif
 	va_end (args);
 	MY_SERIALDEVICE.print(fmtBuffer);
diff --git a/hal/architecture/MyHwSAMD.cpp b/hal/architecture/MyHwSAMD.cpp
index 0a022d8..87d3576 100644
--- a/hal/architecture/MyHwSAMD.cpp
+++ b/hal/architecture/MyHwSAMD.cpp
@@ -184,7 +184,7 @@ void hwDebugPrint(const char *fmt, ... )
 #ifndef MY_DISABLED_SERIAL
 	if (MY_SERIALDEVICE) {
 		char fmtBuffer[MY_SERIAL_OUTPUT_SIZE];
-#ifdef MY_GATEWAY_FEATURE
+#ifdef MY_GATEWAY_SERIAL
 		// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
 		snprintf(fmtBuffer, sizeof(fmtBuffer), PSTR("0;255;%d;0;%d;%lu "), C_INTERNAL, I_LOG_MESSAGE,
 		         hwMillis());
@@ -196,13 +196,11 @@ void hwDebugPrint(const char *fmt, ... )
 #endif
 		va_list args;
 		va_start (args, fmt );
-#ifdef MY_GATEWAY_FEATURE
-		// Truncate message if this is gateway node
 		vsnprintf(fmtBuffer, sizeof(fmtBuffer), fmt, args);
+#ifdef MY_GATEWAY_SERIAL
+		// Truncate message if this is gateway node
 		fmtBuffer[sizeof(fmtBuffer) - 2] = '\n';
 		fmtBuffer[sizeof(fmtBuffer) - 1] = '\0';
-#else
-		vsnprintf(fmtBuffer, sizeof(fmtBuffer), fmt, args);
 #endif
 		va_end (args);
 		MY_SERIALDEVICE.print(fmtBuffer);
diff --git a/hal/architecture/MyHwSTM32F1.cpp b/hal/architecture/MyHwSTM32F1.cpp
index 52e14e9..f67fbe1 100644
--- a/hal/architecture/MyHwSTM32F1.cpp
+++ b/hal/architecture/MyHwSTM32F1.cpp
@@ -171,7 +171,7 @@ void hwDebugPrint(const char *fmt, ...)
 {
 #ifndef MY_DISABLED_SERIAL
 	char fmtBuffer[MY_SERIAL_OUTPUT_SIZE];
-#ifdef MY_GATEWAY_FEATURE
+#ifdef MY_GATEWAY_SERIAL
 	// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
 	snprintf_P(fmtBuffer, sizeof(fmtBuffer), PSTR("0;255;%d;0;%d;%lu "), C_INTERNAL, I_LOG_MESSAGE,
 	           hwMillis());
@@ -183,13 +183,11 @@ void hwDebugPrint(const char *fmt, ...)
 #endif
 	va_list args;
 	va_start(args, fmt);
-#ifdef MY_GATEWAY_FEATURE
-	// Truncate message if this is gateway node
 	vsnprintf_P(fmtBuffer, sizeof(fmtBuffer), fmt, args);
+#ifdef MY_GATEWAY_SERIAL
+	// Truncate message if this is gateway node
 	fmtBuffer[sizeof(fmtBuffer) - 2] = '\n';
 	fmtBuffer[sizeof(fmtBuffer) - 1] = '\0';
-#else
-	vsnprintf_P(fmtBuffer, sizeof(fmtBuffer), fmt, args);
 #endif
 	va_end(args);
 	MY_SERIALDEVICE.print(fmtBuffer);
diff --git a/hal/architecture/MyHwTeensy3.cpp b/hal/architecture/MyHwTeensy3.cpp
index 9acdfff..b4f20bd 100644
--- a/hal/architecture/MyHwTeensy3.cpp
+++ b/hal/architecture/MyHwTeensy3.cpp
@@ -169,7 +169,7 @@ void hwDebugPrint(const char *fmt, ...)
 {
 #ifndef MY_DISABLED_SERIAL
 	char fmtBuffer[MY_SERIAL_OUTPUT_SIZE];
-#ifdef MY_GATEWAY_FEATURE
+#ifdef MY_GATEWAY_SERIAL
 	// prepend debug message to be handled correctly by controller (C_INTERNAL, I_LOG_MESSAGE)
 	snprintf_P(fmtBuffer, sizeof(fmtBuffer), PSTR("0;255;%d;0;%d;%lu "),
 	           C_INTERNAL, I_LOG_MESSAGE, hwMillis());
@@ -181,13 +181,11 @@ void hwDebugPrint(const char *fmt, ...)
 #endif
 	va_list args;
 	va_start(args, fmt);
-#ifdef MY_GATEWAY_FEATURE
-	// Truncate message if this is gateway node
 	vsnprintf_P(fmtBuffer, sizeof(fmtBuffer), fmt, args);
+#ifdef MY_GATEWAY_SERIAL
+	// Truncate message if this is gateway node
 	fmtBuffer[sizeof(fmtBuffer) - 2] = '\n';
 	fmtBuffer[sizeof(fmtBuffer) - 1] = '\0';
-#else
-	vsnprintf_P(fmtBuffer, sizeof(fmtBuffer), fmt, args);
 #endif
 	va_end(args);
 	MY_SERIALDEVICE.print(fmtBuffer);