diff --git a/include/MqttHassPublishing.h b/include/MqttHassPublishing.h
index e504474..ff40dc5 100644
--- a/include/MqttHassPublishing.h
+++ b/include/MqttHassPublishing.h
@@ -44,7 +44,7 @@ const byteAssign_fieldDeviceClass_t deviceFieldAssignment[] = {
     { FLD_PAC, DEVICE_CLS_PWR, STATE_CLS_MEASUREMENT },
     { FLD_F, DEVICE_CLS_FREQ, STATE_CLS_MEASUREMENT },
     { FLD_T, DEVICE_CLS_TEMP, STATE_CLS_MEASUREMENT },
-    { FLD_PCT, DEVICE_CLS_POWER_FACTOR, STATE_CLS_MEASUREMENT },
+    { FLD_PF, DEVICE_CLS_POWER_FACTOR, STATE_CLS_MEASUREMENT },
     { FLD_EFF, DEVICE_CLS_NONE, STATE_CLS_NONE },
     { FLD_IRR, DEVICE_CLS_NONE, STATE_CLS_NONE },
     { FLD_PRA, DEVICE_CLS_REACTIVE_POWER, STATE_CLS_MEASUREMENT }
diff --git a/include/MqttPublishing.h b/include/MqttPublishing.h
index efaddb7..5667b40 100644
--- a/include/MqttPublishing.h
+++ b/include/MqttPublishing.h
@@ -30,7 +30,7 @@ private:
         FLD_PAC,
         FLD_F,
         FLD_T,
-        FLD_PCT,
+        FLD_PF,
         FLD_EFF,
         FLD_IRR,
         FLD_PRA
diff --git a/lib/Hoymiles/src/inverters/HM_1CH.h b/lib/Hoymiles/src/inverters/HM_1CH.h
index 6f10745..8b4667d 100644
--- a/lib/Hoymiles/src/inverters/HM_1CH.h
+++ b/lib/Hoymiles/src/inverters/HM_1CH.h
@@ -24,9 +24,9 @@ private:
         { FLD_PAC, UNIT_W, CH0, 18, 2, 10, false },
         { FLD_PRA, UNIT_VA, CH0, 20, 2, 10, false },
         { FLD_F, UNIT_HZ, CH0, 16, 2, 100, false },
-        { FLD_PCT, UNIT_PCT, CH0, 24, 2, 10, false },
+        { FLD_PF, UNIT_NONE, CH0, 24, 2, 10, false },
         { FLD_T, UNIT_C, CH0, 26, 2, 10, true },
-        { FLD_EVT_LOG, UNIT_CNT, CH0, 28, 2, 1, false },
+        { FLD_EVT_LOG, UNIT_NONE, CH0, 28, 2, 1, false },
         { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC, false },
         { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC, false },
         { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC, false },
diff --git a/lib/Hoymiles/src/inverters/HM_2CH.h b/lib/Hoymiles/src/inverters/HM_2CH.h
index 71a5cfe..e86e9c0 100644
--- a/lib/Hoymiles/src/inverters/HM_2CH.h
+++ b/lib/Hoymiles/src/inverters/HM_2CH.h
@@ -31,9 +31,9 @@ private:
         { FLD_PAC, UNIT_W, CH0, 30, 2, 10, false },
         { FLD_PRA, UNIT_VA, CH0, 32, 2, 10, false },
         { FLD_F, UNIT_HZ, CH0, 28, 2, 100, false },
-        { FLD_PCT, UNIT_PCT, CH0, 36, 2, 10, false },
+        { FLD_PF, UNIT_NONE, CH0, 36, 2, 10, false },
         { FLD_T, UNIT_C, CH0, 38, 2, 10, true },
-        { FLD_EVT_LOG, UNIT_CNT, CH0, 40, 2, 1, false },
+        { FLD_EVT_LOG, UNIT_NONE, CH0, 40, 2, 1, false },
         { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC, false },
         { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC, false },
         { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC, false },
diff --git a/lib/Hoymiles/src/inverters/HM_4CH.h b/lib/Hoymiles/src/inverters/HM_4CH.h
index d824be6..4e508a9 100644
--- a/lib/Hoymiles/src/inverters/HM_4CH.h
+++ b/lib/Hoymiles/src/inverters/HM_4CH.h
@@ -45,9 +45,9 @@ private:
         { FLD_PAC, UNIT_W, CH0, 50, 2, 10, false },
         { FLD_PRA, UNIT_VA, CH0, 52, 2, 10, false },
         { FLD_F, UNIT_HZ, CH0, 48, 2, 100, false },
-        { FLD_PCT, UNIT_PCT, CH0, 56, 2, 10, false },
+        { FLD_PF, UNIT_NONE, CH0, 56, 2, 10, false },
         { FLD_T, UNIT_C, CH0, 58, 2, 10, true },
-        { FLD_EVT_LOG, UNIT_CNT, CH0, 60, 2, 1, false },
+        { FLD_EVT_LOG, UNIT_NONE, CH0, 60, 2, 1, false },
         { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC, false },
         { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC, false },
         { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC, false },
diff --git a/lib/Hoymiles/src/parser/StatisticsParser.h b/lib/Hoymiles/src/parser/StatisticsParser.h
index b3327fe..b82825c 100644
--- a/lib/Hoymiles/src/parser/StatisticsParser.h
+++ b/lib/Hoymiles/src/parser/StatisticsParser.h
@@ -16,7 +16,7 @@ enum {
     UNIT_C,
     UNIT_PCT,
     UNIT_VA,
-    UNIT_CNT
+    UNIT_NONE
 };
 const char* const units[] = { "V", "A", "W", "Wh", "kWh", "Hz", "°C", "%", "var", "" };
 
@@ -32,7 +32,7 @@ enum {
     FLD_PAC,
     FLD_F,
     FLD_T,
-    FLD_PCT,
+    FLD_PF,
     FLD_EFF,
     FLD_IRR,
     FLD_PRA,
diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp
index 41ce2b5..fe6a405 100644
--- a/src/WebApi_ws_live.cpp
+++ b/src/WebApi_ws_live.cpp
@@ -105,7 +105,7 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root)
             addField(root, i, inv, c, FLD_YT);
             addField(root, i, inv, c, FLD_F);
             addField(root, i, inv, c, FLD_T);
-            addField(root, i, inv, c, FLD_PCT);
+            addField(root, i, inv, c, FLD_PF);
             addField(root, i, inv, c, FLD_PRA);
             addField(root, i, inv, c, FLD_EFF);
             addField(root, i, inv, c, FLD_IRR);