diff --git a/src/TinyGsmClient.h b/src/TinyGsmClient.h
index bbdc239..8c73bce 100644
--- a/src/TinyGsmClient.h
+++ b/src/TinyGsmClient.h
@@ -9,7 +9,7 @@
 #ifndef TinyGsmClient_h
 #define TinyGsmClient_h
 
-#if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_SIM868) || defined(TINY_GSM_MODEM_U201) || defined(TINY_GSM_MODEM_ESP8266)
+#if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_SIM868) || defined(TINY_GSM_MODEM_UBLOX) || defined(TINY_GSM_MODEM_ESP8266)
   #define TINY_GSM_MODEM_HAS_SSL
 #endif
 
@@ -31,6 +31,13 @@
   typedef TinyGsmSim808::GsmClient TinyGsmClient;
   typedef TinyGsmSim808::GsmClientSecure TinyGsmClientSecure;
 
+#elif defined(TINY_GSM_MODEM_UBLOX)
+  #define TINY_GSM_MODEM_HAS_GPRS
+  #include <TinyGsmClientUBLOX.h>
+  typedef TinyGsmU201 TinyGsm;
+  typedef TinyGsmU201::GsmClient TinyGsmClient;
+  typedef TinyGsmU201::GsmClientSecure TinyGsmClientSecure;
+
 #elif defined(TINY_GSM_MODEM_BG96)
   #define TINY_GSM_MODEM_HAS_GPRS
   #include <TinyGsmClientBG96.h>
@@ -47,13 +54,6 @@
   #include <TinyGsmClientM590.h>
   typedef TinyGsm::GsmClient TinyGsmClient;
 
-#elif defined(TINY_GSM_MODEM_UBLOX) || defined(TINY_GSM_MODEM_U201)
-  #define TINY_GSM_MODEM_HAS_GPRS
-  #include <TinyGsmClientU201.h>
-  typedef TinyGsmU201 TinyGsm;
-  typedef TinyGsmU201::GsmClient TinyGsmClient;
-  typedef TinyGsmU201::GsmClientSecure TinyGsmClientSecure;
-
 #elif defined(TINY_GSM_MODEM_ESP8266)
   #define TINY_GSM_MODEM_HAS_WIFI
   #include <TinyGsmClientESP8266.h>
diff --git a/src/TinyGsmClientU201.h b/src/TinyGsmClientUBLOX.h
similarity index 100%
rename from src/TinyGsmClientU201.h
rename to src/TinyGsmClientUBLOX.h