diff --git a/TinyGsmClientM590.h b/TinyGsmClientM590.h
index 48afd51..78b5053 100644
--- a/TinyGsmClientM590.h
+++ b/TinyGsmClientM590.h
@@ -9,7 +9,7 @@
 #ifndef TinyGsmClientM590_h
 #define TinyGsmClientM590_h
 
-//#define GSM_DEBUG Serial
+//#define TINY_GSM_DEBUG Serial
 
 #if !defined(TINY_GSM_RX_BUFFER)
   #define TINY_GSM_RX_BUFFER 256
@@ -176,7 +176,7 @@ public:
     if (waitResponse() != 1) {
       return false;
     }
-#ifdef GSM_DEBUG
+#ifdef TINY_GSM_DEBUG
     sendAT(GF("+CMEE=2"));
     waitResponse();
 #endif
diff --git a/TinyGsmClientSIM800.h b/TinyGsmClientSIM800.h
index 904041a..9b0061e 100644
--- a/TinyGsmClientSIM800.h
+++ b/TinyGsmClientSIM800.h
@@ -9,8 +9,8 @@
 #ifndef TinyGsmClientSIM800_h
 #define TinyGsmClientSIM800_h
 
-//#define GSM_DEBUG Serial
-//#define GSM_USE_HEX
+//#define TINY_GSM_DEBUG Serial
+//#define TINY_GSM_USE_HEX
 
 #if !defined(TINY_GSM_RX_BUFFER)
   #define TINY_GSM_RX_BUFFER 64
@@ -537,7 +537,7 @@ private:
   }
 
   size_t modemRead(size_t size, uint8_t mux) {
-#ifdef GSM_USE_HEX
+#ifdef TINY_GSM_USE_HEX
     sendAT(GF("+CIPRXGET=3,"), mux, ',', size);
     if (waitResponse(GF("+CIPRXGET:")) != 1) {
       return 0;
@@ -554,7 +554,7 @@ private:
     sockets[mux]->sock_available = stream.readStringUntil('\n').toInt();
 
     for (size_t i=0; i<len; i++) {
-#ifdef GSM_USE_HEX
+#ifdef TINY_GSM_USE_HEX
       while (stream.available() < 2) {}
       char buf[4] = { 0, };
       buf[0] = stream.read();
diff --git a/TinyGsmCommon.h b/TinyGsmCommon.h
index a018d8e..8946ee0 100644
--- a/TinyGsmCommon.h
+++ b/TinyGsmCommon.h
@@ -38,17 +38,17 @@
   #define GF(x)  x
 #endif
 
-#ifdef GSM_DEBUG
+#ifdef TINY_GSM_DEBUG
 namespace {
   template<typename T>
   static void DBG(T last) {
-    GSM_DEBUG.println(last);
+    TINY_GSM_DEBUG.println(last);
   }
 
   template<typename T, typename... Args>
   static void DBG(T head, Args... tail) {
-    GSM_DEBUG.print(head);
-    GSM_DEBUG.print(' ');
+    TINY_GSM_DEBUG.print(head);
+    TINY_GSM_DEBUG.print(' ');
     DBG(tail...);
   }
 }
diff --git a/TinyWiFiClientESP8266.h b/TinyWiFiClientESP8266.h
index a308e84..4a10088 100644
--- a/TinyWiFiClientESP8266.h
+++ b/TinyWiFiClientESP8266.h
@@ -9,7 +9,7 @@
 #ifndef TinyWiFiClientESP8266_h
 #define TinyWiFiClientESP8266_h
 
-//#define GSM_DEBUG Serial
+//#define TINY_GSM_DEBUG Serial
 
 #if !defined(TINY_GSM_RX_BUFFER)
   #define TINY_GSM_RX_BUFFER 256