diff --git a/usermods/Battery/battery.h b/usermods/Battery/UMBattery.h
similarity index 99%
rename from usermods/Battery/battery.h
rename to usermods/Battery/UMBattery.h
index 2ddd84149..8a8ad891e 100644
--- a/usermods/Battery/battery.h
+++ b/usermods/Battery/UMBattery.h
@@ -7,7 +7,7 @@
  *  Battery base class
  *  all other battery classes should inherit from this
  */
-class Battery
+class UMBattery
 {
     private:
 
@@ -25,7 +25,7 @@ class Battery
         }
 
     public:
-        Battery()
+        UMBattery()
         {
             this->setVoltageMultiplier(USERMOD_BATTERY_VOLTAGE_MULTIPLIER);
             this->setCalibration(USERMOD_BATTERY_CALIBRATION);
diff --git a/usermods/Battery/battery_defaults.h b/usermods/Battery/battery_defaults.h
index ea01e8620..8b56c6014 100644
--- a/usermods/Battery/battery_defaults.h
+++ b/usermods/Battery/battery_defaults.h
@@ -131,5 +131,4 @@ typedef struct bconfig_t
   float voltageMultiplier;
 } batteryConfig;
 
-
 #endif
\ No newline at end of file
diff --git a/usermods/Battery/types/lion.h b/usermods/Battery/types/LionUMBattery.h
similarity index 86%
rename from usermods/Battery/types/lion.h
rename to usermods/Battery/types/LionUMBattery.h
index e77266164..801faee7c 100644
--- a/usermods/Battery/types/lion.h
+++ b/usermods/Battery/types/LionUMBattery.h
@@ -2,18 +2,18 @@
 #define UMBLion_h
 
 #include "../battery_defaults.h"
-#include "../battery.h"
+#include "../UMBattery.h"
 
 /**
- *  Lion Battery
+ *  LiOn Battery
  * 
  */
-class Lion : public Battery
+class LionUMBattery : public UMBattery
 {
     private:
 
     public:
-        Lion() : Battery()
+        LionUMBattery() : UMBattery()
         {
             this->setMinVoltage(USERMOD_BATTERY_LION_MIN_VOLTAGE);
             this->setMaxVoltage(USERMOD_BATTERY_LION_MAX_VOLTAGE);
diff --git a/usermods/Battery/types/lipo.h b/usermods/Battery/types/LipoUMBattery.h
similarity index 92%
rename from usermods/Battery/types/lipo.h
rename to usermods/Battery/types/LipoUMBattery.h
index d732cf4da..bb6a6ef94 100644
--- a/usermods/Battery/types/lipo.h
+++ b/usermods/Battery/types/LipoUMBattery.h
@@ -2,18 +2,18 @@
 #define UMBLipo_h
 
 #include "../battery_defaults.h"
-#include "../battery.h"
+#include "../UMBattery.h"
 
 /**
- *  Lipo Battery
+ *  LiPo Battery
  * 
  */
-class Lipo : public Battery
+class LipoUMBattery : public UMBattery
 {
     private:
 
     public:
-        Lipo() : Battery()
+        LipoUMBattery() : UMBattery()
         {
             this->setMinVoltage(USERMOD_BATTERY_LIPO_MIN_VOLTAGE);
             this->setMaxVoltage(USERMOD_BATTERY_LIPO_MAX_VOLTAGE);
diff --git a/usermods/Battery/types/unkown.h b/usermods/Battery/types/UnkownUMBattery.h
similarity index 87%
rename from usermods/Battery/types/unkown.h
rename to usermods/Battery/types/UnkownUMBattery.h
index 32a1bfe42..ede5ffd88 100644
--- a/usermods/Battery/types/unkown.h
+++ b/usermods/Battery/types/UnkownUMBattery.h
@@ -2,18 +2,18 @@
 #define UMBUnkown_h
 
 #include "../battery_defaults.h"
-#include "../battery.h"
+#include "../UMBattery.h"
 
 /**
- *  Lion Battery
+ *  Unkown / Default Battery
  * 
  */
-class Unkown : public Battery
+class UnkownUMBattery : public UMBattery
 {
     private:
 
     public:
-        Unkown() : Battery()
+        UnkownUMBattery() : UMBattery()
         {
             this->setMinVoltage(USERMOD_BATTERY_UNKOWN_MIN_VOLTAGE);
             this->setMaxVoltage(USERMOD_BATTERY_UNKOWN_MAX_VOLTAGE);
diff --git a/usermods/Battery/usermod_v2_Battery.h b/usermods/Battery/usermod_v2_Battery.h
index 7b6b038a6..c70babf53 100644
--- a/usermods/Battery/usermod_v2_Battery.h
+++ b/usermods/Battery/usermod_v2_Battery.h
@@ -2,10 +2,10 @@
 
 #include "wled.h"
 #include "battery_defaults.h"
-#include "battery.h"
-#include "types/unkown.h"
-#include "types/lion.h"
-#include "types/lipo.h"
+#include "UMBattery.h"
+#include "types/UnkownUMBattery.h"
+#include "types/LionUMBattery.h"
+#include "types/LiPoUMBattery.h"
 
 /*
  * Usermod by Maximilian Mewes
@@ -19,7 +19,7 @@ class UsermodBattery : public Usermod
     // battery pin can be defined in my_config.h
     int8_t batteryPin = USERMOD_BATTERY_MEASUREMENT_PIN;
     
-    Battery* bat = new Unkown();
+    UMBattery* bat = new UnkownUMBattery();
     batteryConfig cfg;
 
     // how often to read the battery voltage
@@ -142,9 +142,9 @@ class UsermodBattery : public Usermod
 
       // plug in the right battery type
       if(cfg.type == (batteryType)lipo) {
-        bat = new Lipo();
+        bat = new LipoUMBattery();
       } else if(cfg.type == (batteryType)lion) {
-        bat = new Lion();
+        bat = new LipoUMBattery();
       }
 
       // update the choosen battery type with configured values