diff --git a/Model_Library b/Model_Library
index fe0a9e7983c6dd0a727fec829f981425b99f1c55..6f798f19e4095635839390f04a72e87343657140 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit fe0a9e7983c6dd0a727fec829f981425b99f1c55
+Subproject commit 6f798f19e4095635839390f04a72e87343657140
diff --git a/input_files/convert_input_files_refactoring_part_2.py b/input_files/convert_input_files_refactoring_part_2.py
index 9222d52901c12bcb48fbc76ece9bebd01f4019a0..b503d4fec0d8e9c614609558026e67c67f7fcbac 100644
--- a/input_files/convert_input_files_refactoring_part_2.py
+++ b/input_files/convert_input_files_refactoring_part_2.py
@@ -42,6 +42,12 @@ def get_connection(matrix, components, comp_from, comp_to):
 
 changed_topologies = []
 invalid_topologies = []
+renamed_components = {'StandardElectricalConsumption': 'ElectricalConsumption',
+                      'StandardACGrid': 'ElectricalGrid',
+                      'StandardPVGenerator': 'PVGenerator',
+                      'StandardGasGrid': 'GasGrid',
+                      'StandardPEMElectrolyzer': 'PEMElectrolyzer',
+                      'StandardPEMFuelCell': 'PEMFuelCell'}
 for dirpath, dirnames, filenames in os.walk(".\\input_files"):
     topology_here = False
     matrix_files = []
@@ -64,6 +70,9 @@ for dirpath, dirnames, filenames in os.walk(".\\input_files"):
             file_contents = []
             for matrix_file, sector in matrix_files:
                 df = pd.read_csv(os.path.join(dirpath, matrix_file))
+                for i in df.index:
+                    if df['comp_type'][i] in renamed_components:
+                        df.loc[i, 'comp_type'] = renamed_components[df['comp_type'][i]]
                 file_contents.append((df, read_matrix(df), read_components(df), sector))
             all_components = pd.DataFrame(columns = ['comp_name', 'comp_type', 'model', 'min_size', 'max_size', 'current_size'])
             all_connections = pd.DataFrame(columns = ['sector', 'comp_from', 'comp_to'])
diff --git a/input_files/models/district_models/example_CA/components.csv b/input_files/models/district_models/example_CA/components.csv
index a37e648d2765651ae7d3ac9c3ff0b12904b32a4f..f2359fffa80bdeb4ff32a70b94d71a2cc4089acb 100644
--- a/input_files/models/district_models/example_CA/components.csv
+++ b/input_files/models/district_models/example_CA/components.csv
@@ -1,5 +1,5 @@
 comp_name,comp_type,model,min_size,max_size,current_size
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,0,6,6
-grd,StandardACGrid,GRD1,1000,1000,1000
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0
+grd,ElectricalGrid,GRD1,1000,1000,1000
+elec_cns,ElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/district_models/example_community/components.csv b/input_files/models/district_models/example_community/components.csv
index a0c503a3b1881a05608a9a14d5783641ce1ed540..2d1c6e8aad7c0468cde36deae28adc3ce0082161 100644
--- a/input_files/models/district_models/example_community/components.csv
+++ b/input_files/models/district_models/example_community/components.csv
@@ -1,6 +1,6 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,6,6,6
+pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
-grd,StandardACGrid,GRD1,1000,1000,1000
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0
+grd,ElectricalGrid,GRD1,1000,1000,1000
+elec_cns,ElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/district_models/jbr_test_ca/components.csv b/input_files/models/district_models/jbr_test_ca/components.csv
index a0c503a3b1881a05608a9a14d5783641ce1ed540..2d1c6e8aad7c0468cde36deae28adc3ce0082161 100644
--- a/input_files/models/district_models/jbr_test_ca/components.csv
+++ b/input_files/models/district_models/jbr_test_ca/components.csv
@@ -1,6 +1,6 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,6,6,6
+pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
-grd,StandardACGrid,GRD1,1000,1000,1000
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0
+grd,ElectricalGrid,GRD1,1000,1000,1000
+elec_cns,ElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/district_models/jbr_test_comm/components.csv b/input_files/models/district_models/jbr_test_comm/components.csv
index a0c503a3b1881a05608a9a14d5783641ce1ed540..2d1c6e8aad7c0468cde36deae28adc3ce0082161 100644
--- a/input_files/models/district_models/jbr_test_comm/components.csv
+++ b/input_files/models/district_models/jbr_test_comm/components.csv
@@ -1,6 +1,6 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,6,6,6
+pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
-grd,StandardACGrid,GRD1,1000,1000,1000
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0
+grd,ElectricalGrid,GRD1,1000,1000,1000
+elec_cns,ElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/components.csv b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
index 37add2845104da8ceab6a52c2bc2a15796a4a455..1c030fff8a6893b987f884da7aff2b85a2641957 100644
--- a/input_files/models/prosumer_models/SCN0_CAT1/components.csv
+++ b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
@@ -1,8 +1,8 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-grd,StandardACGrid,GRD1,100000,100000,0
-elec_cns,StandardElectricalConsumption,CNS1,100000,100000,0
+grd,ElectricalGrid,GRD1,100000,100000,0
+elec_cns,ElectricalConsumption,CNS1,100000,100000,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,100000,100000,0
+gas_grd,GasGrid,GAS1,100000,100000,0
 therm_cns,HeatConsumption,HeatCNS1,100000,100000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,100000,100000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
index 324121ea325cdace59b9e8266de983ee95d0713f..f095bd6247e3119826b07252a3075f600c8b3a5c 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
@@ -1,10 +1,10 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
index 833ddde47237ad413332ebac63e5539cc6d2982c..8c0f5b5cf11f45c2cb7a57714899a9e5834310df 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
@@ -1,12 +1,12 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv
index 4115b191e263d23cbd176c205598e8022b1af8ad..1df0ef85a0d70f66e1c0972dc24f962a64fc4e71 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv
@@ -1,13 +1,13 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
index 3c8eaceb6e068d4b05ca26c2ede7ad6017c44cc3..f034df24068c9c9623b2943d1a6bdd7dc4a0b899 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
@@ -1,11 +1,11 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
index 88894d4b126e2d2400ddba21edc55cd3f41f9fe9..6049ee2dee8b030b50b24d0fd15f4688bf04f4ea 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
@@ -1,10 +1,10 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
index e5d63dd84626f61af74381b1fa6634320adc3d29..c2a219964dec397d31a04b62ecadf6abac4bb884 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
@@ -1,12 +1,12 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv
index fd87492d6c54366df72b7299656332cdfd5f9b9c..8c18d7785181e264c54004663845edd7175e2b3c 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv
@@ -1,13 +1,13 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
index 8313995585b19d360c54545f8568cf47ddbd934a..aa67ccf8aa526986e8903f30111c8574ff16b36f 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
@@ -1,11 +1,11 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 heat_pump,HeatPump,EHP1,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/components.csv b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
index d29b5218d5100bb59edf66a35046095d29024a93..218cb0b16974eece8e1fb96e5f46999e285b2dda 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
@@ -1,8 +1,8 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
index 324121ea325cdace59b9e8266de983ee95d0713f..f095bd6247e3119826b07252a3075f600c8b3a5c 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
@@ -1,10 +1,10 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
index 833ddde47237ad413332ebac63e5539cc6d2982c..8c0f5b5cf11f45c2cb7a57714899a9e5834310df 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
@@ -1,12 +1,12 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv
index 4115b191e263d23cbd176c205598e8022b1af8ad..1df0ef85a0d70f66e1c0972dc24f962a64fc4e71 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv
@@ -1,13 +1,13 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
index 3c8eaceb6e068d4b05ca26c2ede7ad6017c44cc3..f034df24068c9c9623b2943d1a6bdd7dc4a0b899 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
@@ -1,11 +1,11 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
index 88894d4b126e2d2400ddba21edc55cd3f41f9fe9..6049ee2dee8b030b50b24d0fd15f4688bf04f4ea 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
@@ -1,10 +1,10 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
index e5d63dd84626f61af74381b1fa6634320adc3d29..c2a219964dec397d31a04b62ecadf6abac4bb884 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
@@ -1,12 +1,12 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv
index fd87492d6c54366df72b7299656332cdfd5f9b9c..8c18d7785181e264c54004663845edd7175e2b3c 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv
@@ -1,13 +1,13 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
index 8313995585b19d360c54545f8568cf47ddbd934a..aa67ccf8aa526986e8903f30111c8574ff16b36f 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
@@ -1,11 +1,11 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 heat_pump,HeatPump,EHP1,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
 gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/jbr_test/components.csv b/input_files/models/prosumer_models/jbr_test/components.csv
index a0c503a3b1881a05608a9a14d5783641ce1ed540..2d1c6e8aad7c0468cde36deae28adc3ce0082161 100644
--- a/input_files/models/prosumer_models/jbr_test/components.csv
+++ b/input_files/models/prosumer_models/jbr_test/components.csv
@@ -1,6 +1,6 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,6,6,6
+pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
-grd,StandardACGrid,GRD1,1000,1000,1000
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0
+grd,ElectricalGrid,GRD1,1000,1000,1000
+elec_cns,ElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/prosumer_models/mfh_quartal/components.csv b/input_files/models/prosumer_models/mfh_quartal/components.csv
index 652eeb73c572f9070bf39ae5f4cba6725f07b0d2..b30751744e790015fe95198df446b72f812f522f 100644
--- a/input_files/models/prosumer_models/mfh_quartal/components.csv
+++ b/input_files/models/prosumer_models/mfh_quartal/components.csv
@@ -1,15 +1,15 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-grd,StandardACGrid,GRD1,1000,1000,0
-pv,StandardPVGenerator,PV2,0,30,0
+grd,ElectricalGrid,GRD1,1000,1000,0
+pv,PVGenerator,PV2,0,30,0
 bat,LiionBattery,BAT1,1,1,0
 chp,CHP,CHP1,0,50,0
-ecns1,StandardElectricalConsumption,CNS1,1000,1000,0
-ecns2,StandardElectricalConsumption,CNS1,1000,1000,0
-ecns3,StandardElectricalConsumption,CNS1,1000,1000,0
-ecns4,StandardElectricalConsumption,CNS1,1000,1000,0
-ecns5,StandardElectricalConsumption,CNS1,1000,1000,0
-ecns6,StandardElectricalConsumption,CNS1,1000,1000,0
-gas_grd,StandardGasGrid,GAS1,1000,1000,0
+ecns1,ElectricalConsumption,CNS1,1000,1000,0
+ecns2,ElectricalConsumption,CNS1,1000,1000,0
+ecns3,ElectricalConsumption,CNS1,1000,1000,0
+ecns4,ElectricalConsumption,CNS1,1000,1000,0
+ecns5,ElectricalConsumption,CNS1,1000,1000,0
+ecns6,ElectricalConsumption,CNS1,1000,1000,0
+gas_grd,GasGrid,GAS1,1000,1000,0
 tcns1,HeatConsumption,HeatCNS1,1000,1000,0
 tcns2,HeatConsumption,HeatCNS1,1000,1000,0
 tcns3,HeatConsumption,HeatCNS1,1000,1000,0
diff --git a/input_files/models/prosumer_models/office_pv_heatpump/components.csv b/input_files/models/prosumer_models/office_pv_heatpump/components.csv
index ad450a1781ebbf8cb72f3f4111f50ca015c30f08..4d63c58da575a6941be33ad0f157f0b657ad4189 100644
--- a/input_files/models/prosumer_models/office_pv_heatpump/components.csv
+++ b/input_files/models/prosumer_models/office_pv_heatpump/components.csv
@@ -1,10 +1,10 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,0,30,0
+pv_roof,PVGenerator,PV2,0,30,0
 inv_pv_bat,Inverter,STP-7000TL-20,0,30,0
 battery,LiionBattery,BAT1,0,1000,0
 heat_pump,HeatPump,EHP1,2,50,0
-grd,StandardACGrid,GRD1,1000,1000,0
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0
+grd,ElectricalGrid,GRD1,1000,1000,0
+elec_cns,ElectricalConsumption,CNS1,1000,1000,0
 therm_cns,HeatConsumption,HeatCNS1,1000,1000,0
 dhw_dmd,HotWaterConsumption,HWCNS1,1000,1000,0
 water_tes,HotWaterStorage,TES1,10,93,0
diff --git a/input_files/models/prosumer_models/swimmingPool/components.csv b/input_files/models/prosumer_models/swimmingPool/components.csv
index c6eef40a6fd56d1ca2aa28672121dedc5377adae..7b5fde2aa2ca111a6bfca63b31a869203bbe6dae 100644
--- a/input_files/models/prosumer_models/swimmingPool/components.csv
+++ b/input_files/models/prosumer_models/swimmingPool/components.csv
@@ -1,13 +1,13 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0
+pv_roof1,PVGenerator,Vitovolt300,0,800,0
 inv_pv_bat,Inverter,STP-7000TL-20,0,800,0
 battery,LiionBattery,BAT1,0,800,0
-grd,StandardACGrid,GRD1,0,800,0
-elec_cns,StandardElectricalConsumption,CNS1,0,800,0
+grd,ElectricalGrid,GRD1,0,800,0
+elec_cns,ElectricalConsumption,CNS1,0,800,0
 bhkw,BHKW,VTB200,0,800,0
-pv_roof2,StandardPVGenerator,Vitovolt300,0,30,0
+pv_roof2,PVGenerator,Vitovolt300,0,30,0
 heat_pump,HeatPump,EHP1,0,800,0
-gas_grd,StandardGasGrid,GAS1,0,800,0
+gas_grd,GasGrid,GAS1,0,800,0
 gas_boiler,GasBoiler,BOI1,,,
 therm_cns,HeatConsumption,HeatCNS1,0,800,0
 water_tes,HotWaterStorage,TES1,0,800,0
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/components.csv b/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
index 291e8a1d9f704e3de9dfbb951f8c10609e9a91d4..58c753ea68ca38efaee52e060ee2d38370b145d9 100644
--- a/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
+++ b/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
@@ -1,12 +1,12 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0
+pv_roof1,PVGenerator,Vitovolt300,0,800,0
 inv_pv_bat,Inverter,STP-7000TL-20,0,800,0
 battery,LiionBattery,BAT1,0,800,0
-grd,StandardACGrid,GRD1,0,800,0
-elec_cns,StandardElectricalConsumption,CNS1,0,800,0
+grd,ElectricalGrid,GRD1,0,800,0
+elec_cns,ElectricalConsumption,CNS1,0,800,0
 bhkw,BHKW,VTB200,0,800,0
-pv_roof2,StandardPVGenerator,Vitovolt300,0,30,0
-gas_grd,StandardGasGrid,GAS1,0,800,0
+pv_roof2,PVGenerator,Vitovolt300,0,30,0
+gas_grd,GasGrid,GAS1,0,800,0
 gas_boild,GasBoiler,BOI1,,,
 therm_cns,HeatConsumption,HeatCNS1,0,800,0
 water_tes,HotWaterStorage,TES1,0,800,0
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/components.csv b/input_files/models/prosumer_models/swimmingPool_HP/components.csv
index 1d70f9b7d2c125c95bde3b78a87c9c039526969e..bb76935686dd24a8a7c7adadf263d9e326399a8f 100644
--- a/input_files/models/prosumer_models/swimmingPool_HP/components.csv
+++ b/input_files/models/prosumer_models/swimmingPool_HP/components.csv
@@ -1,13 +1,13 @@
 comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0
+pv_roof1,PVGenerator,Vitovolt300,0,800,0
 inv_pv_bat,Inverter,STP-7000TL-20,0,800,0
 battery,LiionBattery,BAT1,0,800,0
-grd,StandardACGrid,GRD1,0,800,0
-elec_cns,StandardElectricalConsumption,CNS1,0,800,0
+grd,ElectricalGrid,GRD1,0,800,0
+elec_cns,ElectricalConsumption,CNS1,0,800,0
 heat_pump,HeatPump,EHP1,0,800,0
-pv_roof2,StandardPVGenerator,Vitovolt300,0,800,0
+pv_roof2,PVGenerator,Vitovolt300,0,800,0
 gas_boild,GasBoiler,BOI1,,,
-gas_grd,StandardGasGrid,GAS1,0,800,0
+gas_grd,GasGrid,GAS1,0,800,0
 therm_cns,HeatConsumption,HeatCNS1,0,800,0
 water_tes,HotWaterStorage,TES1,0,800,0
 solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0