diff --git a/environments.ini b/environments.ini
index fbd04c5..5e25ac8 100644
--- a/environments.ini
+++ b/environments.ini
@@ -794,7 +794,7 @@ build_flags =
 ; *** OpenMQTTGateway Config ***
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DvalueAsATopic=true'       ; MQTT topic includes model and device
-  '-DGateway_Name="OMG_heltec_rtl_433_ESP"'
+  '-DGateway_Name="OMG_heltec_rtl_433_ESP_OOK"'
 ; *** OpenMQTTGateway Modules ***
   '-DZgatewayRTL_433="rtl_433"'
   '-DZradioSX127x="SX127x"'
@@ -823,7 +823,7 @@ build_flags =
 ; *** OpenMQTTGateway Config ***
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DvalueAsATopic=true'       ; MQTT topic includes model and device
-  '-DGateway_Name="OMG_heltec_rtl_433_ESP"'
+  '-DGateway_Name="OMG_heltec_rtl_433_ESP_FSK"'
   '-DOOK_MODULATION=false' ; FSK modulation activated
   '-DRF_FREQUENCY=915'
   ;-DRF_FREQUENCY=868.300'
@@ -881,7 +881,7 @@ build_flags =
 ; *** OpenMQTTGateway Config ***
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DvalueAsATopic=true'    ; MQTT topic includes model and device
-  '-DGateway_Name="OMG_lilygo_rtl_433_ESP"'
+  '-DGateway_Name="OMG_lilygo_rtl_433_ESP_OOK"'
 ; *** OpenMQTTGateway Modules ***
   '-DZgatewayRTL_433="rtl_433"'
   '-DZradioSX127x="SX127x"'
@@ -910,7 +910,7 @@ build_flags =
 ; *** OpenMQTTGateway Config ***
   ;'-UZmqttDiscovery'          ; disables MQTT Discovery
   '-DvalueAsATopic=true'    ; MQTT topic includes model and device
-  '-DGateway_Name="OMG_lilygo_rtl_433_ESP"'
+  '-DGateway_Name="OMG_lilygo_rtl_433_ESP_FSK"'
   '-DOOK_MODULATION=false' ; FSK modulation activated
   '-DRF_FREQUENCY=915'
   ;-DRF_FREQUENCY=868.300'