diff --git a/hub/catalog_factories/data_models/energy_systems/electrical_storage_system.py b/hub/catalog_factories/data_models/energy_systems/electrical_storage_system.py
index face6903..3cd5b31d 100644
--- a/hub/catalog_factories/data_models/energy_systems/electrical_storage_system.py
+++ b/hub/catalog_factories/data_models/energy_systems/electrical_storage_system.py
@@ -27,7 +27,7 @@ class ElectricalStorageSystem(EnergyStorageSystem):
   @property
   def rated_output_power(self):
     """
-    Get the rated output power of storage system in kW
+    Get the rated output power of storage system in Watts
     :return: float
     """
     return self._rated_output_power
@@ -43,7 +43,7 @@ class ElectricalStorageSystem(EnergyStorageSystem):
   @property
   def battery_voltage(self):
     """
-    Get the battery voltage in Volt
+    Get the battery voltage in Volts
     :return: float
     """
     return self._battery_voltage
@@ -74,10 +74,10 @@ class ElectricalStorageSystem(EnergyStorageSystem):
       'storage type': self.storage_type,
       'nominal capacity [J]': self.nominal_capacity,
       'losses-ratio [J/J]': self.losses_ratio,
-      'rated power [kW]': self.rated_output_power,
+      'rated power [W]': self.rated_output_power,
       'nominal efficiency': self.nominal_efficiency,
       'battery voltage [V]': self.battery_voltage,
-      'depth of discharge': self.depth_of_discharge,
+      'depth of discharge [%]': self.depth_of_discharge,
       'self discharge rate': self.self_discharge_rate
     }
     }