diff --git a/FDRS_Gateway/fdrs_functions.h b/FDRS_Gateway/fdrs_functions.h
index 7663539..b62d5c3 100644
--- a/FDRS_Gateway/fdrs_functions.h
+++ b/FDRS_Gateway/fdrs_functions.h
@@ -16,7 +16,7 @@
 #define UART_IF Serial
 #endif
 
-#ifdef GLOBALS
+#ifdef FDRS_GLOBALS
 #define FDRS_WIFI_SSID GLOBAL_SSID
 #define FDRS_WIFI_PASS GLOBAL_PASS
 #define FDRS_MQTT_ADDR GLOBAL_MQTT_ADDR
diff --git a/examples/Universal_Sensor_beta/fdrs_sensor.h b/examples/Universal_Sensor_beta/fdrs_sensor.h
index 036400c..51f1d96 100644
--- a/examples/Universal_Sensor_beta/fdrs_sensor.h
+++ b/examples/Universal_Sensor_beta/fdrs_sensor.h
@@ -36,7 +36,7 @@
 #include "LoRa.h"
 #endif
 
-#ifdef GLOBALS
+#ifdef FDRS_GLOBALS
 #define FDRS_BAND GLOBAL_BAND
 #define FDRS_SF GLOBAL_SF
 #else
diff --git a/fdrs_functions.h b/fdrs_functions.h
index 7663539..b62d5c3 100644
--- a/fdrs_functions.h
+++ b/fdrs_functions.h
@@ -16,7 +16,7 @@
 #define UART_IF Serial
 #endif
 
-#ifdef GLOBALS
+#ifdef FDRS_GLOBALS
 #define FDRS_WIFI_SSID GLOBAL_SSID
 #define FDRS_WIFI_PASS GLOBAL_PASS
 #define FDRS_MQTT_ADDR GLOBAL_MQTT_ADDR
diff --git a/fdrs_globals.h b/fdrs_globals.h
index 9a2aeb5..a87b7a2 100644
--- a/fdrs_globals.h
+++ b/fdrs_globals.h
@@ -1,6 +1,5 @@
-// ToDo: refactor the global GLOBALS to FDRS_GLOBALS as GLOBALS is ... well, too global ;)
-#ifndef GLOBALS
-#define GLOBALS
+#ifndef FDRS_GLOBALS
+#define FDRS_GLOBALS
 #define GLOBAL_SSID "Your SSID"
 #define GLOBAL_PASS "Password"
 #define GLOBAL_MQTT_ADDR "192.168.0.8"
@@ -12,4 +11,4 @@
 #define GLOBAL_BAND 915E6 //LoRa Frequency Band
 #define GLOBAL_SF 7  //LoRa Spreading Factor
 
-#endif GLOBALS
+#endif FDRS_GLOBALS
diff --git a/fdrs_sensor.h b/fdrs_sensor.h
index 777aad6..1cbebe1 100644
--- a/fdrs_sensor.h
+++ b/fdrs_sensor.h
@@ -17,7 +17,7 @@
 #include <LoRa.h>
 #endif
 
-#ifdef GLOBALS
+#ifdef FDRS_GLOBALS
 #define FDRS_BAND GLOBAL_BAND
 #define FDRS_SF GLOBAL_SF
 #else