diff --git a/hub/city_model_structure/energy_systems/generic_energy_system.py b/hub/city_model_structure/energy_systems/generic_energy_system.py
index fddd4368..83661fb8 100644
--- a/hub/city_model_structure/energy_systems/generic_energy_system.py
+++ b/hub/city_model_structure/energy_systems/generic_energy_system.py
@@ -59,15 +59,15 @@ class GenericEnergySystem:
     self._demand_types = value
 
   @property
-  def generation_system(self) -> List[GenericGenerationSystem]:
+  def generation_systems(self) -> List[GenericGenerationSystem]:
     """
     Get generation system
     :return: GenerationSystem
     """
     return self._generation_system
 
-  @generation_system.setter
-  def generation_system(self, value):
+  @generation_systems.setter
+  def generation_systems(self, value):
     """
     Set generation system
     :return: GenerationSystem
@@ -75,15 +75,15 @@ class GenericEnergySystem:
     self._generation_system = value
 
   @property
-  def distribution_system(self) -> Union[None, GenericDistributionSystem]:
+  def distribution_systems(self) -> Union[None, List[GenericDistributionSystem]]:
     """
     Get distribution system
     :return: DistributionSystem
     """
     return self._distribution_system
 
-  @distribution_system.setter
-  def distribution_system(self, value):
+  @distribution_systems.setter
+  def distribution_systems(self, value):
     """
     Set distribution system
     :param value: DistributionSystem
@@ -91,15 +91,15 @@ class GenericEnergySystem:
     self._distribution_system = value
 
   @property
-  def emission_system(self) -> Union[None, GenericEmissionSystem]:
+  def emission_systems(self) -> Union[None, List[GenericEmissionSystem]]:
     """
     Get emission system
     :return: EmissionSystem
     """
     return self._emission_system
 
-  @emission_system.setter
-  def emission_system(self, value):
+  @emission_systems.setter
+  def emission_systems(self, value):
     """
     Set emission system
     :param value: EmissionSystem
@@ -107,15 +107,15 @@ class GenericEnergySystem:
     self._emission_system = value
 
   @property
-  def energy_storage_system(self) -> Union[None, GenericStorageSystem]:
+  def energy_storage_systems(self) -> Union[None, List[GenericStorageSystem]]:
     """
     Get storage system
     :return: EnergyStorageSystem
     """
     return self._energy_storage_system
 
-  @energy_storage_system.setter
-  def energy_storage_system(self, value):
+  @energy_storage_systems.setter
+  def energy_storage_systems(self, value):
     """
     Set storage system
     :return: EnergyStorageSystem
diff --git a/hub/imports/energy_systems/montreal_custom_energy_system_parameters.py b/hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
index f0c35168..9960dab6 100644
--- a/hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
+++ b/hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
@@ -101,7 +101,7 @@ class MontrealCustomEnergySystemParameters:
       _generation_system.storage = archetype_generation_equipment.storage
       _generation_system.auxiliary_equipment = None
 
-      energy_system.generation_system = _generation_system
+      energy_system.generation_systems = _generation_system
 
       _distribution_system = GenericDistributionSystem()
       archetype_distribution_equipment = system.distribution_systems
@@ -113,7 +113,7 @@ class MontrealCustomEnergySystemParameters:
         archetype_distribution_equipment.distribution_consumption_variable_flow
       _distribution_system.heat_losses = archetype_distribution_equipment.heat_losses
 
-      energy_system.distribution_system = _distribution_system
+      energy_system.distribution_systems = _distribution_system
 
       building_systems.append(energy_system)
     if archetype.name not in _generic_energy_systems:
diff --git a/hub/imports/energy_systems/north_america_custom_energy_system_parameters.py b/hub/imports/energy_systems/north_america_custom_energy_system_parameters.py
index 3dbdc843..980a1517 100644
--- a/hub/imports/energy_systems/north_america_custom_energy_system_parameters.py
+++ b/hub/imports/energy_systems/north_america_custom_energy_system_parameters.py
@@ -126,7 +126,7 @@ class NorthAmericaCustomEnergySystemParameters:
           _thermal_storage_system.maximum_operating_temperature = archetype_storage_equipment.maximum_operating_temperature
           _thermal_storage_system.height = archetype_storage_equipment.height
           _thermal_storage_system.layers = archetype_storage_equipment.layers
-      energy_system.energy_storage_system = _thermal_storage_system
+      energy_system.energy_storage_systems = _thermal_storage_system
 
       building_systems.append(energy_system)
     if archetype.name not in _generic_energy_systems:
diff --git a/hub/imports/results_factory.py b/hub/imports/results_factory.py
index da33f3af..ed9ccc8b 100644
--- a/hub/imports/results_factory.py
+++ b/hub/imports/results_factory.py
@@ -10,7 +10,7 @@ from pathlib import Path
 from hub.helpers.utils import validate_import_export_type
 from hub.imports.results.insel_monthly_energry_balance import InselMonthlyEnergyBalance
 from hub.imports.results.simplified_radiosity_algorithm import SimplifiedRadiosityAlgorithm
-from hub.imports.results.energy_plus import EnergyPlusWorkflow
+from hub.imports.results.energy_plus import EnergyPlus
 
 class ResultFactory:
   """
@@ -50,7 +50,7 @@ class ResultFactory:
     """
     Enrich the city with energy plus results
     """
-    EnergyPlusWorkflow(self._city, self._base_path).enrich()
+    EnergyPlus(self._city, self._base_path).enrich()
 
   def enrich(self):
     """