diff --git a/src/TinyGsmClientA6.h b/src/TinyGsmClientA6.h
index 11a08f8..6add7f8 100644
--- a/src/TinyGsmClientA6.h
+++ b/src/TinyGsmClientA6.h
@@ -39,7 +39,7 @@ enum RegStatus {
 };
 
 
-class TinyGsmA6 : public TinyGsmMasterModem
+class TinyGsmA6 : public TinyGsmModem
 {
 
 public:
@@ -182,7 +182,7 @@ public:
 #else
   TinyGsmA6(Stream& stream)
 #endif
-    : TinyGsmMasterModem(stream), stream(stream)
+    : TinyGsmModem(stream), stream(stream)
   {
     memset(sockets, 0, sizeof(sockets));
   }
diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h
index 2550cd0..fda73e5 100644
--- a/src/TinyGsmClientBG96.h
+++ b/src/TinyGsmClientBG96.h
@@ -40,7 +40,7 @@ enum RegStatus {
 };
 
 
-class TinyGsmBG96 : public TinyGsmMasterModem
+class TinyGsmBG96 : public TinyGsmModem
 {
 
 public:
@@ -206,7 +206,7 @@ public:
 #else
   TinyGsmBG96(Stream& stream)
 #endif
-    : TinyGsmMasterModem(stream), stream(stream)
+    : TinyGsmModem(stream), stream(stream)
   {
     memset(sockets, 0, sizeof(sockets));
   }
diff --git a/src/TinyGsmClientESP8266.h b/src/TinyGsmClientESP8266.h
index 2cf8b19..c9375d8 100644
--- a/src/TinyGsmClientESP8266.h
+++ b/src/TinyGsmClientESP8266.h
@@ -39,7 +39,7 @@ enum RegStatus {
 
 
 
-class TinyGsmESP8266 : public TinyGsmMasterModem
+class TinyGsmESP8266 : public TinyGsmModem
 {
 
 public:
@@ -198,7 +198,7 @@ public:
 #else
   TinyGsmESP8266(Stream& stream)
 #endif
-    : TinyGsmMasterModem(stream), stream(stream)
+    : TinyGsmModem(stream), stream(stream)
   {
     memset(sockets, 0, sizeof(sockets));
   }
diff --git a/src/TinyGsmClientM590.h b/src/TinyGsmClientM590.h
index c6cffd0..ff35681 100644
--- a/src/TinyGsmClientM590.h
+++ b/src/TinyGsmClientM590.h
@@ -39,7 +39,7 @@ enum RegStatus {
 };
 
 
-class TinyGsmM590 : public TinyGsmMasterModem
+class TinyGsmM590 : public TinyGsmModem
 {
 
 public:
@@ -179,7 +179,7 @@ public:
 #else
   TinyGsmM590(Stream& stream)
 #endif
-    : TinyGsmMasterModem(stream), stream(stream)
+    : TinyGsmModem(stream), stream(stream)
   {
     memset(sockets, 0, sizeof(sockets));
   }
diff --git a/src/TinyGsmClientM95.h b/src/TinyGsmClientM95.h
index 37ff4dc..1b84ff7 100644
--- a/src/TinyGsmClientM95.h
+++ b/src/TinyGsmClientM95.h
@@ -40,7 +40,7 @@ enum RegStatus {
 };
 
 
-class TinyGsmM95 : public TinyGsmMasterModem
+class TinyGsmM95 : public TinyGsmModem
 {
 
 public:
@@ -186,7 +186,7 @@ public:
 #else
   TinyGsmM95(Stream& stream)
 #endif
-    : TinyGsmMasterModem(stream), stream(stream)
+    : TinyGsmModem(stream), stream(stream)
   {
     memset(sockets, 0, sizeof(sockets));
   }
diff --git a/src/TinyGsmClientMC60.h b/src/TinyGsmClientMC60.h
index 4324f31..a6a93e7 100644
--- a/src/TinyGsmClientMC60.h
+++ b/src/TinyGsmClientMC60.h
@@ -44,7 +44,7 @@ enum RegStatus {
 };
 
 
-class TinyGsmMC60 : public TinyGsmMasterModem
+class TinyGsmMC60 : public TinyGsmModem
 {
 
 public:
@@ -213,7 +213,7 @@ public:
 #else
   TinyGsmMC60(Stream& stream)
 #endif
-    : TinyGsmMasterModem(stream), stream(stream)
+    : TinyGsmModem(stream), stream(stream)
   {
     memset(sockets, 0, sizeof(sockets));
   }
diff --git a/src/TinyGsmClientSIM800.h b/src/TinyGsmClientSIM800.h
index 5071504..d1dc1ed 100644
--- a/src/TinyGsmClientSIM800.h
+++ b/src/TinyGsmClientSIM800.h
@@ -46,7 +46,7 @@ enum RegStatus {
 //============================================================================//
 
 
-class TinyGsmSim800 : public TinyGsmMasterModem
+class TinyGsmSim800 : public TinyGsmModem
 {
 
 //============================================================================//
@@ -228,7 +228,7 @@ public:
 #else
   TinyGsmSim800(Stream& stream)
 #endif
-    : TinyGsmMasterModem(stream), stream(stream)
+    : TinyGsmModem(stream), stream(stream)
   {
     memset(sockets, 0, sizeof(sockets));
   }
diff --git a/src/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h
index 98e0b13..a89bcff 100644
--- a/src/TinyGsmClientUBLOX.h
+++ b/src/TinyGsmClientUBLOX.h
@@ -40,7 +40,7 @@ enum RegStatus {
 };
 
 
-class TinyGsmUBLOX : public TinyGsmMasterModem
+class TinyGsmUBLOX : public TinyGsmModem
 {
 
 public:
@@ -205,7 +205,7 @@ public:
 #else
   TinyGsmUBLOX(Stream& stream)
 #endif
-    : TinyGsmMasterModem(stream), stream(stream)
+    : TinyGsmModem(stream), stream(stream)
   {
     memset(sockets, 0, sizeof(sockets));
   }
diff --git a/src/TinyGsmClientXBee.h b/src/TinyGsmClientXBee.h
index d99ba8d..01d4576 100644
--- a/src/TinyGsmClientXBee.h
+++ b/src/TinyGsmClientXBee.h
@@ -45,7 +45,7 @@ enum XBeeType {
 };
 
 
-class TinyGsmXBee : public TinyGsmMasterModem
+class TinyGsmXBee : public TinyGsmModem
 {
 
 public:
@@ -211,7 +211,7 @@ public:
 #else
   TinyGsmXBee(Stream& stream)
 #endif
-    : TinyGsmMasterModem(stream), stream(stream)
+    : TinyGsmModem(stream), stream(stream)
   {}
 
   /*
diff --git a/src/TinyGsmCommon.h b/src/TinyGsmCommon.h
index 241d79d..6c0943b 100644
--- a/src/TinyGsmCommon.h
+++ b/src/TinyGsmCommon.h
@@ -197,23 +197,23 @@ String TinyGsmDecodeHex16bit(String &instr) {
 
 
 
-class TinyGsmMasterModem
+class TinyGsmModem
 {
 
 public:
 
 class GsmClient : public Client
 {
-  friend class TinyGsmMasterModem;
+  friend class TinyGsmModem;
 };
 
 
 public:
 
 #ifdef GSM_DEFAULT_STREAM
-  TinyGsmMasterModem(Stream& stream = GSM_DEFAULT_STREAM)
+  TinyGsmModem(Stream& stream = GSM_DEFAULT_STREAM)
 #else
-  TinyGsmMasterModem(Stream& stream)
+  TinyGsmModem(Stream& stream)
 #endif
     : stream(stream)
   {}
diff --git a/tools/test_build/test_build.ino b/tools/test_build/test_build.ino
index 34d2ae9..0086c2a 100644
--- a/tools/test_build/test_build.ino
+++ b/tools/test_build/test_build.ino
@@ -3,12 +3,7 @@
  *  DO NOT USE THIS - this is just a compilation test!
  *
  **************************************************************/
-// #define TINY_GSM_MODEM_SIM800  // Select for a SIM800, SIM900, or variant thereof
-// #define TINY_GSM_MODEM_A6  // Select for a AI-Thinker A6 or A7 chip
-// #define TINY_GSM_MODEM_M590  // Select for a Neoway M590
-// #define TINY_GSM_MODEM_UBLOX  // Select for most u-blox cellular modems
-// #define TINY_GSM_MODEM_ESP8266  // Select for an ESP8266 using the DEFAULT AT COMMAND FIRMWARE
-// #define TINY_GSM_MODEM_XBEE  // Select for Digi brand WiFi or Cellular XBee's
+#define TINY_GSM_MODEM_SIM800
 
 #include <TinyGsmClient.h>