diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc1d2e7..ea0462c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,8 +49,8 @@ file(GLOB SRCFILES
         networkDevices/NetworkDevice.h
         networkDevices/WifiDevice.cpp
         networkDevices/W5500Device.cpp
-        networkDevices/ClientSyncEthernet.cpp
-        networkDevices/espMqttClientEthernet.cpp
+        networkDevices/ClientSyncW5500.cpp
+        networkDevices/espMqttClientW5500.cpp
         NukiWrapper.cpp
         NukiOpenerWrapper.cpp
         MqttTopics.h
diff --git a/networkDevices/ClientSyncEthernet.cpp b/networkDevices/ClientSyncW5500.cpp
similarity index 76%
rename from networkDevices/ClientSyncEthernet.cpp
rename to networkDevices/ClientSyncW5500.cpp
index 513c8f8..b6f764c 100644
--- a/networkDevices/ClientSyncEthernet.cpp
+++ b/networkDevices/ClientSyncW5500.cpp
@@ -8,17 +8,17 @@ the LICENSE file.
 
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
 
-#include "ClientSyncEthernet.h"
+#include "ClientSyncW5500.h"
 #include <lwip/sockets.h>  // socket options
 
 namespace espMqttClientInternals {
 
-    ClientSyncEthernet::ClientSyncEthernet()
+    ClientSyncW5500::ClientSyncW5500()
             : client() {
         // empty
     }
 
-    bool ClientSyncEthernet::connect(IPAddress ip, uint16_t port) {
+    bool ClientSyncW5500::connect(IPAddress ip, uint16_t port) {
         bool ret = client.connect(ip, port);  // implicit conversion of return code int --> bool
         if (ret) {
 #if defined(ARDUINO_ARCH_ESP8266)
@@ -34,7 +34,7 @@ namespace espMqttClientInternals {
         return ret;
     }
 
-    bool ClientSyncEthernet::connect(const char* host, uint16_t port) {
+    bool ClientSyncW5500::connect(const char* host, uint16_t port) {
         bool ret = client.connect(host, port);  // implicit conversion of return code int --> bool
         if (ret) {
 #if defined(ARDUINO_ARCH_ESP8266)
@@ -50,27 +50,27 @@ namespace espMqttClientInternals {
         return ret;
     }
 
-    size_t ClientSyncEthernet::write(const uint8_t* buf, size_t size) {
+    size_t ClientSyncW5500::write(const uint8_t* buf, size_t size) {
         return client.write(buf, size);
     }
 
-    int ClientSyncEthernet::available() {
+    int ClientSyncW5500::available() {
         return client.available();
     }
 
-    int ClientSyncEthernet::read(uint8_t* buf, size_t size) {
+    int ClientSyncW5500::read(uint8_t* buf, size_t size) {
         return client.read(buf, size);
     }
 
-    void ClientSyncEthernet::stop() {
+    void ClientSyncW5500::stop() {
         client.stop();
     }
 
-    bool ClientSyncEthernet::connected() {
+    bool ClientSyncW5500::connected() {
         return client.connected();
     }
 
-    bool ClientSyncEthernet::disconnected() {
+    bool ClientSyncW5500::disconnected() {
         return !client.connected();
     }
 
diff --git a/networkDevices/ClientSyncEthernet.h b/networkDevices/ClientSyncW5500.h
similarity index 89%
rename from networkDevices/ClientSyncEthernet.h
rename to networkDevices/ClientSyncW5500.h
index 69df7ea..64f5b8d 100644
--- a/networkDevices/ClientSyncEthernet.h
+++ b/networkDevices/ClientSyncW5500.h
@@ -7,9 +7,9 @@
 
 namespace espMqttClientInternals {
 
-    class ClientSyncEthernet : public Transport {
+    class ClientSyncW5500 : public Transport {
     public:
-        ClientSyncEthernet();
+        ClientSyncW5500();
         bool connect(IPAddress ip, uint16_t port) override;
         bool connect(const char* host, uint16_t port) override;
         size_t write(const uint8_t* buf, size_t size) override;
diff --git a/networkDevices/W5500Device.h b/networkDevices/W5500Device.h
index a86fb06..7128af4 100644
--- a/networkDevices/W5500Device.h
+++ b/networkDevices/W5500Device.h
@@ -2,7 +2,7 @@
 
 #include "NetworkDevice.h"
 #include "espMqttClient.h"
-#include "espMqttClientEthernet.h"
+#include "espMqttClientW5500.h"
 #include <Ethernet.h>
 #include <Preferences.h>
 
@@ -61,7 +61,7 @@ private:
     void resetDevice();
     void initializeMacAddress(byte* mac);
 
-    espMqttClientEthernet _mqttClient;
+    espMqttClientW5500 _mqttClient;
     Preferences* _preferences = nullptr;
 
     int _maintainResult = 0;
diff --git a/networkDevices/espMqttClientEthernet.cpp b/networkDevices/espMqttClientEthernet.cpp
deleted file mode 100644
index 4e7c826..0000000
--- a/networkDevices/espMqttClientEthernet.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "espMqttClientEthernet.h"
-
-espMqttClientEthernet::espMqttClientEthernet(uint8_t priority, uint8_t core)
-: MqttClientSetup(true, priority, core),
-  _client()
-{
-    _transport = &_client;
-}
diff --git a/networkDevices/espMqttClientW5500.cpp b/networkDevices/espMqttClientW5500.cpp
new file mode 100644
index 0000000..445cb71
--- /dev/null
+++ b/networkDevices/espMqttClientW5500.cpp
@@ -0,0 +1,8 @@
+#include "espMqttClientW5500.h"
+
+espMqttClientW5500::espMqttClientW5500(uint8_t priority, uint8_t core)
+: MqttClientSetup(true, priority, core),
+  _client()
+{
+    _transport = &_client;
+}
diff --git a/networkDevices/espMqttClientEthernet.h b/networkDevices/espMqttClientW5500.h
similarity index 53%
rename from networkDevices/espMqttClientEthernet.h
rename to networkDevices/espMqttClientW5500.h
index d2d6b7e..f880ed7 100644
--- a/networkDevices/espMqttClientEthernet.h
+++ b/networkDevices/espMqttClientW5500.h
@@ -1,19 +1,19 @@
 #pragma once
 
 #include "MqttClientSetup.h"
-#include "ClientSyncEthernet.h"
+#include "ClientSyncW5500.h"
 
-class espMqttClientEthernet : public MqttClientSetup<espMqttClientEthernet> {
+class espMqttClientW5500 : public MqttClientSetup<espMqttClientW5500> {
 public:
 #if defined(ARDUINO_ARCH_ESP32)
-    explicit espMqttClientEthernet(uint8_t priority = 1, uint8_t core = 1);
+    explicit espMqttClientW5500(uint8_t priority = 1, uint8_t core = 1);
 #else
     espMqttClient();
 #endif
 
 protected:
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-    espMqttClientInternals::ClientSyncEthernet _client;
+    espMqttClientInternals::ClientSyncW5500 _client;
 #elif defined(__linux__)
     espMqttClientInternals::ClientPosix _client;
 #endif