diff --git a/src/app.h b/src/app.h
index 36a77f9a..c60bb295 100644
--- a/src/app.h
+++ b/src/app.h
@@ -21,7 +21,7 @@
 #include "utils/scheduler.h"
 
 #include "hm/hmSystem.h"
-#include "hm/payload.h"
+#include "hm/hmPayload.h"
 #include "wifi/ahoywifi.h"
 #include "web/web.h"
 #include "web/RestApi.h"
@@ -37,7 +37,7 @@
 #define ACOS(x) (degrees(acos(x)))
 
 typedef HmSystem<MAX_NUM_INVERTERS> HmSystemType;
-typedef Payload<HmSystemType> PayloadType;
+typedef HmPayload<HmSystemType> PayloadType;
 typedef Web<HmSystemType> WebType;
 typedef RestApi<HmSystemType> RestApiType;
 typedef PubMqtt<HmSystemType> PubMqttType;
diff --git a/src/hm/payload.h b/src/hm/hmPayload.h
similarity index 99%
rename from src/hm/payload.h
rename to src/hm/hmPayload.h
index 72166390..2e599a6c 100644
--- a/src/hm/payload.h
+++ b/src/hm/hmPayload.h
@@ -32,9 +32,9 @@ typedef std::function<void(uint16_t alarmCode, uint32_t start, uint32_t end)> al
 
 
 template<class HMSYSTEM>
-class Payload {
+class HmPayload {
     public:
-        Payload() {}
+        HmPayload() {}
 
         void setup(IApp *app, HMSYSTEM *sys, statistics_t *stat, uint8_t maxRetransmits, uint32_t *timestamp) {
             mApp        = app;