diff --git a/src/AsyncMQTT_ESP32.h b/src/AsyncMQTT_ESP32.h
index c6d46e5..7123ed4 100644
--- a/src/AsyncMQTT_ESP32.h
+++ b/src/AsyncMQTT_ESP32.h
@@ -1,21 +1,22 @@
 /****************************************************************************************************************************
   AsyncMQTT_ESP32.h
 
-  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500, LAN8720 or ENC28J60
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  2) async-mqtt-client (https://github.com/khoih-prog/AsyncMQTT_Generic)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
   Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
 
-  Version: 1.9.0
+  Version: 1.10.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
   1.8.0    K Hoang     17/12/2022 Initial coding to port to ESP32 boards using WiFi or LwIP W5500, LAN8720 or ENC28J60
   1.9.0    K Hoang     21/12/2022 Add support to ESP32S2/C3 boards using LwIP W5500 or ENC28J60 Ethernet
+  1.10.0   K Hoang     09/01/2023 Add support to ESP32 and ESP32S2/S3/C3 boards using LwIP W6100
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMQTT_ESP32.hpp b/src/AsyncMQTT_ESP32.hpp
index 41052f6..320efc9 100644
--- a/src/AsyncMQTT_ESP32.hpp
+++ b/src/AsyncMQTT_ESP32.hpp
@@ -1,21 +1,22 @@
 /****************************************************************************************************************************
   AsyncMQTT_ESP32.hpp
   
-  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500, LAN8720 or ENC28J60
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  2) async-mqtt-client (https://github.com/khoih-prog/AsyncMQTT_Generic)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
   Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
 
-  Version: 1.9.0
+  Version: 1.10.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
   1.8.0    K Hoang     17/12/2022 Initial coding to port to ESP32 boards using WiFi or LwIP W5500, LAN8720 or ENC28J60
   1.9.0    K Hoang     21/12/2022 Add support to ESP32S2/C3 boards using LwIP W5500 or ENC28J60 Ethernet
+  1.10.0   K Hoang     09/01/2023 Add support to ESP32 and ESP32S2/S3/C3 boards using LwIP W6100
  *****************************************************************************************************************************/
 
 #pragma once
@@ -34,15 +35,15 @@
 
 /////////////////////////////////////////////////////////
 
-#define ASYNC_MQTT_ESP32_SHORT_VERSION        "AsyncMQTT_ESP32 v1.9.0" 
+#define ASYNC_MQTT_ESP32_SHORT_VERSION        "AsyncMQTT_ESP32 v1.10.0" 
 
 /////////////////////////////////////////////////////////
 
 #define ASYNC_MQTT_ESP32_VERSION_MAJOR       1
-#define ASYNC_MQTT_ESP32_VERSION_MINOR       9
+#define ASYNC_MQTT_ESP32_VERSION_MINOR       10
 #define ASYNC_MQTT_ESP32_VERSION_PATCH       0
 
-#define ASYNC_MQTT_ESP32_VERSION_INT         1009000
+#define ASYNC_MQTT_ESP32_VERSION_INT         1010000
 
 /////////////////////////////////////////////////////////
 
diff --git a/src/AsyncMQTT_ESP32_Debug.h b/src/AsyncMQTT_ESP32_Debug.h
index 693742b..62df041 100644
--- a/src/AsyncMQTT_ESP32_Debug.h
+++ b/src/AsyncMQTT_ESP32_Debug.h
@@ -1,21 +1,22 @@
 /****************************************************************************************************************************
   AsyncMQTT_ESP32_Debug.h
 
-  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500, LAN8720 or ENC28J60
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  2) async-mqtt-client (https://github.com/khoih-prog/AsyncMQTT_Generic)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
   Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
 
-  Version: 1.9.0
+  Version: 1.10.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
   1.8.0    K Hoang     17/12/2022 Initial coding to port to ESP32 boards using WiFi or LwIP W5500, LAN8720 or ENC28J60
   1.9.0    K Hoang     21/12/2022 Add support to ESP32S2/C3 boards using LwIP W5500 or ENC28J60 Ethernet
+  1.10.0   K Hoang     09/01/2023 Add support to ESP32 and ESP32S2/S3/C3 boards using LwIP W6100
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMQTT_ESP32_Impl.h b/src/AsyncMQTT_ESP32_Impl.h
index ed94e99..480b602 100644
--- a/src/AsyncMQTT_ESP32_Impl.h
+++ b/src/AsyncMQTT_ESP32_Impl.h
@@ -1,21 +1,22 @@
 /****************************************************************************************************************************
   AsyncMQTT_ESP32_Impl.h
 
-  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500, LAN8720 or ENC28J60
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  2) async-mqtt-client (https://github.com/khoih-prog/AsyncMQTT_Generic)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
   Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
 
-  Version: 1.9.0
+  Version: 1.10.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
   1.8.0    K Hoang     17/12/2022 Initial coding to port to ESP32 boards using WiFi or LwIP W5500, LAN8720 or ENC28J60
   1.9.0    K Hoang     21/12/2022 Add support to ESP32S2/C3 boards using LwIP W5500 or ENC28J60 Ethernet
+  1.10.0   K Hoang     09/01/2023 Add support to ESP32 and ESP32S2/S3/C3 boards using LwIP W6100
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Callbacks.hpp b/src/AsyncMqttClient/Callbacks.hpp
index e6f63aa..2bb6147 100644
--- a/src/AsyncMqttClient/Callbacks.hpp
+++ b/src/AsyncMqttClient/Callbacks.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Callbacks.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/DisconnectReasons.hpp b/src/AsyncMqttClient/DisconnectReasons.hpp
index 3cf8368..edfb8bb 100644
--- a/src/AsyncMqttClient/DisconnectReasons.hpp
+++ b/src/AsyncMqttClient/DisconnectReasons.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   DisconnectReasons.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Errors.hpp b/src/AsyncMqttClient/Errors.hpp
index 94da62d..eef6279 100644
--- a/src/AsyncMqttClient/Errors.hpp
+++ b/src/AsyncMqttClient/Errors.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Errors.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Flags.hpp b/src/AsyncMqttClient/Flags.hpp
index 4ba7075..9a0caff 100644
--- a/src/AsyncMqttClient/Flags.hpp
+++ b/src/AsyncMqttClient/Flags.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Flags.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Helpers.hpp b/src/AsyncMqttClient/Helpers.hpp
index d46d386..85be23b 100644
--- a/src/AsyncMqttClient/Helpers.hpp
+++ b/src/AsyncMqttClient/Helpers.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Helpers.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/MessageProperties.hpp b/src/AsyncMqttClient/MessageProperties.hpp
index d36a5eb..0dbe071 100644
--- a/src/AsyncMqttClient/MessageProperties.hpp
+++ b/src/AsyncMqttClient/MessageProperties.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   MessageProperties.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/ConnAckPacket.cpp b/src/AsyncMqttClient/Packets/ConnAckPacket.cpp
index 8f463ce..da2c837 100644
--- a/src/AsyncMqttClient/Packets/ConnAckPacket.cpp
+++ b/src/AsyncMqttClient/Packets/ConnAckPacket.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   ConnAckPacket.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "ConnAckPacket.hpp"
diff --git a/src/AsyncMqttClient/Packets/ConnAckPacket.hpp b/src/AsyncMqttClient/Packets/ConnAckPacket.hpp
index dc22855..6516ddd 100644
--- a/src/AsyncMqttClient/Packets/ConnAckPacket.hpp
+++ b/src/AsyncMqttClient/Packets/ConnAckPacket.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   ConnAckPacket.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
  
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/Out/Connect.cpp b/src/AsyncMqttClient/Packets/Out/Connect.cpp
index d70a67d..cacf246 100644
--- a/src/AsyncMqttClient/Packets/Out/Connect.cpp
+++ b/src/AsyncMqttClient/Packets/Out/Connect.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Connect.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "Connect.hpp"
diff --git a/src/AsyncMqttClient/Packets/Out/Connect.hpp b/src/AsyncMqttClient/Packets/Out/Connect.hpp
index da2fa5c..1630cb7 100644
--- a/src/AsyncMqttClient/Packets/Out/Connect.hpp
+++ b/src/AsyncMqttClient/Packets/Out/Connect.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Connect.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/Out/Disconn.cpp b/src/AsyncMqttClient/Packets/Out/Disconn.cpp
index b0c2b7e..a02556f 100644
--- a/src/AsyncMqttClient/Packets/Out/Disconn.cpp
+++ b/src/AsyncMqttClient/Packets/Out/Disconn.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Disconn.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "Disconn.hpp"
diff --git a/src/AsyncMqttClient/Packets/Out/Disconn.hpp b/src/AsyncMqttClient/Packets/Out/Disconn.hpp
index 837a520..5a0d181 100644
--- a/src/AsyncMqttClient/Packets/Out/Disconn.hpp
+++ b/src/AsyncMqttClient/Packets/Out/Disconn.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Disconn.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/Out/OutPacket.cpp b/src/AsyncMqttClient/Packets/Out/OutPacket.cpp
index cbd004c..38f5dc2 100644
--- a/src/AsyncMqttClient/Packets/Out/OutPacket.cpp
+++ b/src/AsyncMqttClient/Packets/Out/OutPacket.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   OutPacket.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "OutPacket.hpp"
diff --git a/src/AsyncMqttClient/Packets/Out/OutPacket.hpp b/src/AsyncMqttClient/Packets/Out/OutPacket.hpp
index 42811f1..cdaaaf7 100644
--- a/src/AsyncMqttClient/Packets/Out/OutPacket.hpp
+++ b/src/AsyncMqttClient/Packets/Out/OutPacket.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   OutPacket.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/Out/PingReq.cpp b/src/AsyncMqttClient/Packets/Out/PingReq.cpp
index 7ef08d3..4959aef 100644
--- a/src/AsyncMqttClient/Packets/Out/PingReq.cpp
+++ b/src/AsyncMqttClient/Packets/Out/PingReq.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PingReq.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "PingReq.hpp"
diff --git a/src/AsyncMqttClient/Packets/Out/PingReq.hpp b/src/AsyncMqttClient/Packets/Out/PingReq.hpp
index cb1e30e..09e43ff 100644
--- a/src/AsyncMqttClient/Packets/Out/PingReq.hpp
+++ b/src/AsyncMqttClient/Packets/Out/PingReq.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PingReq.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/Out/PubAck.cpp b/src/AsyncMqttClient/Packets/Out/PubAck.cpp
index 8753d3c..94e5149 100644
--- a/src/AsyncMqttClient/Packets/Out/PubAck.cpp
+++ b/src/AsyncMqttClient/Packets/Out/PubAck.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PubAck.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "PubAck.hpp"
diff --git a/src/AsyncMqttClient/Packets/Out/PubAck.hpp b/src/AsyncMqttClient/Packets/Out/PubAck.hpp
index d491531..9adf0aa 100644
--- a/src/AsyncMqttClient/Packets/Out/PubAck.hpp
+++ b/src/AsyncMqttClient/Packets/Out/PubAck.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PubAck.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/Out/Publish.cpp b/src/AsyncMqttClient/Packets/Out/Publish.cpp
index 8753652..f86d648 100644
--- a/src/AsyncMqttClient/Packets/Out/Publish.cpp
+++ b/src/AsyncMqttClient/Packets/Out/Publish.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Publish.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "Publish.hpp"
diff --git a/src/AsyncMqttClient/Packets/Out/Publish.hpp b/src/AsyncMqttClient/Packets/Out/Publish.hpp
index b0f4b7d..2aa021c 100644
--- a/src/AsyncMqttClient/Packets/Out/Publish.hpp
+++ b/src/AsyncMqttClient/Packets/Out/Publish.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Publish.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/Out/Subscribe.cpp b/src/AsyncMqttClient/Packets/Out/Subscribe.cpp
index 8398731..2d614f4 100644
--- a/src/AsyncMqttClient/Packets/Out/Subscribe.cpp
+++ b/src/AsyncMqttClient/Packets/Out/Subscribe.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Subscribe.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "Subscribe.hpp"
diff --git a/src/AsyncMqttClient/Packets/Out/Subscribe.hpp b/src/AsyncMqttClient/Packets/Out/Subscribe.hpp
index 60ce0f3..b7e3a96 100644
--- a/src/AsyncMqttClient/Packets/Out/Subscribe.hpp
+++ b/src/AsyncMqttClient/Packets/Out/Subscribe.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Subscribe.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/Out/Unsubscribe.cpp b/src/AsyncMqttClient/Packets/Out/Unsubscribe.cpp
index dcbd790..e01aa1f 100644
--- a/src/AsyncMqttClient/Packets/Out/Unsubscribe.cpp
+++ b/src/AsyncMqttClient/Packets/Out/Unsubscribe.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Unsubscribe.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "Unsubscribe.hpp"
diff --git a/src/AsyncMqttClient/Packets/Out/Unsubscribe.hpp b/src/AsyncMqttClient/Packets/Out/Unsubscribe.hpp
index e37b9b5..78d3d0d 100644
--- a/src/AsyncMqttClient/Packets/Out/Unsubscribe.hpp
+++ b/src/AsyncMqttClient/Packets/Out/Unsubscribe.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Unsubscribe.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/Packet.hpp b/src/AsyncMqttClient/Packets/Packet.hpp
index a4e3d28..4323146 100644
--- a/src/AsyncMqttClient/Packets/Packet.hpp
+++ b/src/AsyncMqttClient/Packets/Packet.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Packet.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
  
 #ifndef PACKET_HPP
diff --git a/src/AsyncMqttClient/Packets/PingRespPacket.cpp b/src/AsyncMqttClient/Packets/PingRespPacket.cpp
index 6df7539..8f85b9b 100644
--- a/src/AsyncMqttClient/Packets/PingRespPacket.cpp
+++ b/src/AsyncMqttClient/Packets/PingRespPacket.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PingRespPacket.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "PingRespPacket.hpp"
diff --git a/src/AsyncMqttClient/Packets/PingRespPacket.hpp b/src/AsyncMqttClient/Packets/PingRespPacket.hpp
index 57b48cf..0c637c3 100644
--- a/src/AsyncMqttClient/Packets/PingRespPacket.hpp
+++ b/src/AsyncMqttClient/Packets/PingRespPacket.hpp
@@ -1,15 +1,14 @@
 /****************************************************************************************************************************
   PingRespPacket.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
  
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/PubAckPacket.cpp b/src/AsyncMqttClient/Packets/PubAckPacket.cpp
index 48c61c9..48456c0 100644
--- a/src/AsyncMqttClient/Packets/PubAckPacket.cpp
+++ b/src/AsyncMqttClient/Packets/PubAckPacket.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PubAckPacket.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "PubAckPacket.hpp"
diff --git a/src/AsyncMqttClient/Packets/PubAckPacket.hpp b/src/AsyncMqttClient/Packets/PubAckPacket.hpp
index 0650870..7b4791b 100644
--- a/src/AsyncMqttClient/Packets/PubAckPacket.hpp
+++ b/src/AsyncMqttClient/Packets/PubAckPacket.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PubAckPacket.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
  
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/PubCompPacket.cpp b/src/AsyncMqttClient/Packets/PubCompPacket.cpp
index 5dad9c5..5f8d195 100644
--- a/src/AsyncMqttClient/Packets/PubCompPacket.cpp
+++ b/src/AsyncMqttClient/Packets/PubCompPacket.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PubCompPacket.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "PubCompPacket.hpp"
diff --git a/src/AsyncMqttClient/Packets/PubCompPacket.hpp b/src/AsyncMqttClient/Packets/PubCompPacket.hpp
index 7908b8e..b3e7eaa 100644
--- a/src/AsyncMqttClient/Packets/PubCompPacket.hpp
+++ b/src/AsyncMqttClient/Packets/PubCompPacket.hpp
@@ -1,15 +1,14 @@
 /****************************************************************************************************************************
   PubCompPacket.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
  
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/PubRecPacket.cpp b/src/AsyncMqttClient/Packets/PubRecPacket.cpp
index 8a9d031..4c20c33 100644
--- a/src/AsyncMqttClient/Packets/PubRecPacket.cpp
+++ b/src/AsyncMqttClient/Packets/PubRecPacket.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PubRecPacket.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "PubRecPacket.hpp"
diff --git a/src/AsyncMqttClient/Packets/PubRecPacket.hpp b/src/AsyncMqttClient/Packets/PubRecPacket.hpp
index aad09f6..056bc1b 100644
--- a/src/AsyncMqttClient/Packets/PubRecPacket.hpp
+++ b/src/AsyncMqttClient/Packets/PubRecPacket.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PubRecPacket.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
  
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/PubRelPacket.cpp b/src/AsyncMqttClient/Packets/PubRelPacket.cpp
index fd0e075..eaaa13a 100644
--- a/src/AsyncMqttClient/Packets/PubRelPacket.cpp
+++ b/src/AsyncMqttClient/Packets/PubRelPacket.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PubRelPacket.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "PubRelPacket.hpp"
diff --git a/src/AsyncMqttClient/Packets/PubRelPacket.hpp b/src/AsyncMqttClient/Packets/PubRelPacket.hpp
index de984be..2ed1b2f 100644
--- a/src/AsyncMqttClient/Packets/PubRelPacket.hpp
+++ b/src/AsyncMqttClient/Packets/PubRelPacket.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PubRelPacket.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
  
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/PublishPacket.cpp b/src/AsyncMqttClient/Packets/PublishPacket.cpp
index 98f0eb9..b7f78e5 100644
--- a/src/AsyncMqttClient/Packets/PublishPacket.cpp
+++ b/src/AsyncMqttClient/Packets/PublishPacket.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PublishPacket.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "PublishPacket.hpp"
diff --git a/src/AsyncMqttClient/Packets/PublishPacket.hpp b/src/AsyncMqttClient/Packets/PublishPacket.hpp
index f399422..1d56189 100644
--- a/src/AsyncMqttClient/Packets/PublishPacket.hpp
+++ b/src/AsyncMqttClient/Packets/PublishPacket.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   PublishPacket.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
  
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/SubAckPacket.cpp b/src/AsyncMqttClient/Packets/SubAckPacket.cpp
index 0f74223..88e97b2 100644
--- a/src/AsyncMqttClient/Packets/SubAckPacket.cpp
+++ b/src/AsyncMqttClient/Packets/SubAckPacket.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   SubAckPacket.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "SubAckPacket.hpp"
diff --git a/src/AsyncMqttClient/Packets/SubAckPacket.hpp b/src/AsyncMqttClient/Packets/SubAckPacket.hpp
index 8a3c9d3..e1e73b5 100644
--- a/src/AsyncMqttClient/Packets/SubAckPacket.hpp
+++ b/src/AsyncMqttClient/Packets/SubAckPacket.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   SubAckPacket.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
  
 #pragma once
diff --git a/src/AsyncMqttClient/Packets/UnsubAckPacket.cpp b/src/AsyncMqttClient/Packets/UnsubAckPacket.cpp
index f6066c8..b9842ef 100644
--- a/src/AsyncMqttClient/Packets/UnsubAckPacket.cpp
+++ b/src/AsyncMqttClient/Packets/UnsubAckPacket.cpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   UnsubAckPacket.cpp
 
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
 
   Based on and modified from :
 
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
 
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #include "UnsubAckPacket.hpp"
diff --git a/src/AsyncMqttClient/Packets/UnsubAckPacket.hpp b/src/AsyncMqttClient/Packets/UnsubAckPacket.hpp
index 7006467..8397378 100644
--- a/src/AsyncMqttClient/Packets/UnsubAckPacket.hpp
+++ b/src/AsyncMqttClient/Packets/UnsubAckPacket.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   UnsubAckPacket.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
  
 #pragma once
diff --git a/src/AsyncMqttClient/ParsingInformation.hpp b/src/AsyncMqttClient/ParsingInformation.hpp
index cefc2cf..3e67bea 100644
--- a/src/AsyncMqttClient/ParsingInformation.hpp
+++ b/src/AsyncMqttClient/ParsingInformation.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   ParsingInformation.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/AsyncMqttClient/Storage.hpp b/src/AsyncMqttClient/Storage.hpp
index cf5b12b..bd9aa78 100644
--- a/src/AsyncMqttClient/Storage.hpp
+++ b/src/AsyncMqttClient/Storage.hpp
@@ -1,13 +1,14 @@
 /****************************************************************************************************************************
   Storage.hpp
   
-  AsyncMqttClient_Generic is a library for ESP32, ESP8266, Protenta_H7, STM32F7, etc. with current AsyncTCP support
-  
+  AsyncMQTT_ESP32 is a library for ESP32 boards using WiFi or LwIP W5500 / W6100 / ENC28J60 / LAN8720 Ethernet
+
   Based on and modified from :
-  
+
   1) async-mqtt-client (https://github.com/marvinroger/async-mqtt-client)
-  
-  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMqttClient_Generic
+  2) AsyncMQTT_Generic (https://github.com/khoih-prog/AsyncMQTT_Generic)
+
+  Built by Khoi Hoang https://github.com/khoih-prog/AsyncMQTT_ESP32
  *****************************************************************************************************************************/
 
 #pragma once