diff --git a/omnikinverter/models.py b/omnikinverter/models.py
index 14a60b46..7e622442 100644
--- a/omnikinverter/models.py
+++ b/omnikinverter/models.py
@@ -13,9 +13,9 @@ class Inverter:
     serial_number: str | None
     model: str | None
     firmware: str | None
-    current_power: int | None
-    energy_today: float | None
-    energy_total: float | None
+    solar_current_power: int | None
+    solar_energy_today: float | None
+    solar_energy_total: float | None
 
     @staticmethod
     def from_js(data: dict[str, Any]) -> Inverter:
@@ -43,7 +43,7 @@ def get_values(position):
             serial_number=get_values(0),
             model=get_values(3),
             firmware=get_values(2),
-            current_power=get_values(5),
-            energy_today=get_values(6),
-            energy_total=get_values(7),
+            solar_current_power=get_values(5),
+            solar_energy_today=get_values(6),
+            solar_energy_total=get_values(7),
         )
diff --git a/test_output.py b/test_output.py
index 6b8318e7..c27fdbaa 100644
--- a/test_output.py
+++ b/test_output.py
@@ -17,9 +17,9 @@ async def main():
         print(f"Serial Number: {inverter.serial_number}")
         print(f"Model: {inverter.model}")
         print(f"Firmware: {inverter.firmware}")
-        print(f"Current Power: {inverter.current_power}")
-        print(f"Energy Production Today: {inverter.energy_today}")
-        print(f"Energy Production Total: {inverter.energy_total}")
+        print(f"Current Power: {inverter.solar_current_power}")
+        print(f"Energy Production Today: {inverter.solar_energy_today}")
+        print(f"Energy Production Total: {inverter.solar_energy_total}")
 
 
 if __name__ == "__main__":