diff --git a/include/MqttPublishing.h b/include/MqttHandleInverter.h
similarity index 90%
rename from include/MqttPublishing.h
rename to include/MqttHandleInverter.h
index 5667b40c..46675636 100644
--- a/include/MqttPublishing.h
+++ b/include/MqttHandleInverter.h
@@ -6,7 +6,7 @@
 #include <Hoymiles.h>
 #include <memory>
 
-class MqttPublishingClass {
+class MqttHandleInverterClass {
 public:
     void init();
     void loop();
@@ -37,4 +37,4 @@ private:
     };
 };
 
-extern MqttPublishingClass MqttPublishing;
\ No newline at end of file
+extern MqttHandleInverterClass MqttHandleInverter;
\ No newline at end of file
diff --git a/src/MqttHandleHass.cpp b/src/MqttHandleHass.cpp
index 0e4ec354..18277885 100644
--- a/src/MqttHandleHass.cpp
+++ b/src/MqttHandleHass.cpp
@@ -3,7 +3,7 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "MqttHandleHass.h"
-#include "MqttPublishing.h"
+#include "MqttHandleInverter.h"
 #include "MqttSettings.h"
 #include "NetworkSettings.h"
 
@@ -99,7 +99,7 @@ void MqttHandleHassClass::publishField(std::shared_ptr<InverterAbstract> inv, ui
         + "/config";
 
     if (!clear) {
-        String stateTopic = MqttSettings.getPrefix() + MqttPublishing.getTopic(inv, channel, fieldType.fieldId);
+        String stateTopic = MqttSettings.getPrefix() + MqttHandleInverter.getTopic(inv, channel, fieldType.fieldId);
         const char* devCls = deviceClasses[fieldType.deviceClsId];
         const char* stateCls = stateClasses[fieldType.stateClsId];
 
diff --git a/src/MqttPublishing.cpp b/src/MqttHandleInverter.cpp
similarity index 92%
rename from src/MqttPublishing.cpp
rename to src/MqttHandleInverter.cpp
index 9bc73b05..c6a5a60f 100644
--- a/src/MqttPublishing.cpp
+++ b/src/MqttHandleInverter.cpp
@@ -2,18 +2,18 @@
 /*
  * Copyright (C) 2022 Thomas Basler and others
  */
-#include "MqttPublishing.h"
+#include "MqttHandleInverter.h"
 #include "MqttSettings.h"
 #include "NetworkSettings.h"
 #include <ctime>
 
-MqttPublishingClass MqttPublishing;
+MqttHandleInverterClass MqttHandleInverter;
 
-void MqttPublishingClass::init()
+void MqttHandleInverterClass::init()
 {
 }
 
-void MqttPublishingClass::loop()
+void MqttHandleInverterClass::loop()
 {
     if (!MqttSettings.getConnected() || !Hoymiles.getRadio()->isIdle()) {
         return;
@@ -102,7 +102,7 @@ void MqttPublishingClass::loop()
     }
 }
 
-void MqttPublishingClass::publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId)
+void MqttHandleInverterClass::publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId)
 {
     String topic = getTopic(inv, channel, fieldId);
     if (topic == "") {
@@ -112,7 +112,7 @@ void MqttPublishingClass::publishField(std::shared_ptr<InverterAbstract> inv, ui
     MqttSettings.publish(topic, String(inv->Statistics()->getChannelFieldValue(channel, fieldId)));
 }
 
-String MqttPublishingClass::getTopic(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId)
+String MqttHandleInverterClass::getTopic(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId)
 {
     if (!inv->Statistics()->hasChannelFieldValue(channel, fieldId)) {
         return String("");
diff --git a/src/main.cpp b/src/main.cpp
index 6abb9f3d..992d763e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,7 +5,7 @@
 #include "Configuration.h"
 #include "Hoymiles.h"
 #include "MqttHandleHass.h"
-#include "MqttPublishing.h"
+#include "MqttHandleInverter.h"
 #include "MqttSettings.h"
 #include "NetworkSettings.h"
 #include "NtpSettings.h"
@@ -68,7 +68,7 @@ void setup()
     // Initialize MqTT
     Serial.print(F("Initialize MqTT... "));
     MqttSettings.init();
-    MqttPublishing.init();
+    MqttHandleInverter.init();
     MqttHandleHass.init();
     Serial.println(F("done"));
 
@@ -133,7 +133,7 @@ void loop()
     yield();
     Hoymiles.loop();
     yield();
-    MqttPublishing.loop();
+    MqttHandleInverter.loop();
     yield();
     MqttHandleHass.loop();
     yield();