diff --git a/src/ws_adapters.h b/src/ws_adapters.h
index 0bed7385..0c5dfc68 100644
--- a/src/ws_adapters.h
+++ b/src/ws_adapters.h
@@ -21,25 +21,25 @@
     defined(ADAFRUIT_PYPORTAL_M4_TITANO) || defined(USE_AIRLIFT)
 #include "network_interfaces/Wippersnapper_AIRLIFT.h"
 /** Nina-FW (adafruit fork) networking class */
-typedef Wippersnapper_AIRLIFT ws_adapter_wifi;
+typedef Wippersnapper_AIRLIFT Wippersnapper_WiFi;
 #elif defined(ARDUINO_ARCH_ESP8266)
 #include "network_interfaces/Wippersnapper_ESP8266.h"
 /** ESP8266's networking class */
-typedef Wippersnapper_ESP8266 ws_adapter_wifi;
+typedef Wippersnapper_ESP8266 Wippersnapper_WiFi;
 #elif defined(ARDUINO_ARCH_ESP32)
 #include "network_interfaces/Wippersnapper_ESP32.h"
 /** ESP32's networking class */
-typedef Wippersnapper_ESP32 ws_adapter_wifi;
+typedef Wippersnapper_ESP32 Wippersnapper_WiFi;
 #elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include "network_interfaces/ws_networking_pico.h"
-typedef ws_networking_pico ws_adapter_wifi;
+typedef ws_networking_pico Wippersnapper_WiFi;
 #elif defined(RASPBERRY_PI_PICO) || defined(RASPBERRY_PI_PICO_2)
 #include "network_interfaces/ws_nonet_pico.h"
-typedef ws_nonet_pico ws_adapter_wifi;
+typedef ws_nonet_pico Wippersnapper_WiFi;
 #elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRWIFI1010)
 /** Nina-FW (arduino) networking class */
 #include "network_interfaces/Wippersnapper_WIFININA.h"
-typedef Wippersnapper_WIFININA ws_adapter_wifi;
+typedef Wippersnapper_WIFININA Wippersnapper_WiFi;
 #else
 #warning "Must define network interface in config.h!"
 #endif
diff --git a/src/ws_manager.cpp b/src/ws_manager.cpp
index cf1c2d4f..0351cfa7 100644
--- a/src/ws_manager.cpp
+++ b/src/ws_manager.cpp
@@ -72,7 +72,7 @@ void Wippersnapper_Manager::checkAPIVersion(int pinNum) {
     ws_instance_v2 = new Wippersnapper_WiFiV2();
     _api_version = 2;
   } else { // API version 1 if D12 is low
-    ws_instance = new ws_adapter_wifi();
+    ws_instance = new Wippersnapper_WiFi();
     _api_version = 1;
   }
 }
diff --git a/src/ws_manager.h b/src/ws_manager.h
index 8ee7dbf6..59000cbd 100644
--- a/src/ws_manager.h
+++ b/src/ws_manager.h
@@ -2,7 +2,7 @@
 #define WIPPERSNAPPER_MANAGER_H
 
 #include "network_interfaces/ws_nonet_pico.h"
-typedef ws_nonet_pico ws_adapter_wifi;
+typedef ws_nonet_pico Wippersnapper_WiFi;
 #include "network_interfaces/ws_nonet_pico_v2.h"
 typedef ws_nonet_pico_v2 Wippersnapper_WiFiV2;
 
@@ -27,7 +27,7 @@ public:
   void run();
 
 protected:
-  ws_adapter_wifi *ws_instance;      ///< Instance of Wippersnapper API v1
+  Wippersnapper_WiFi *ws_instance;      ///< Instance of Wippersnapper API v1
   Wippersnapper_WiFiV2 *ws_instance_v2; ///< Instance of Wippersnapper API v2
 private:
   int _api_version;