diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h
index 904403c..d3434ef 100644
--- a/src/TinyGsmClientBG96.h
+++ b/src/TinyGsmClientBG96.h
@@ -102,9 +102,9 @@ TINY_GSM_CLIENT_CONNECT_OVERLOADS()
 
 TINY_GSM_CLIENT_WRITE()
 
-TINY_GSM_CLIENT_AVAILABLE_NO_BUFFER_CHECK()
+TINY_GSM_CLIENT_AVAILABLE_WITH_BUFFER_CHECK()
 
-TINY_GSM_CLIENT_READ_NO_BUFFER_CHECK()
+TINY_GSM_CLIENT_READ_WITH_BUFFER_CHECK()
 
 TINY_GSM_CLIENT_PEEK_FLUSH_CONNECTED()
 
@@ -115,7 +115,7 @@ TINY_GSM_CLIENT_PEEK_FLUSH_CONNECTED()
   String remoteIP() TINY_GSM_ATTR_NOT_IMPLEMENTED;
 
 private:
-  TinyGsmBG96*   at;
+  TinyGsmBG96*    at;
   uint8_t         mux;
   uint16_t        sock_available;
   bool            sock_connected;