diff --git a/Model_Library b/Model_Library
index 3519ec06eade34bf29da5f46877a3c7057e56edc..18fddbcb6b99b9af1559c918f403c75e8b71801e 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit 3519ec06eade34bf29da5f46877a3c7057e56edc
+Subproject commit 18fddbcb6b99b9af1559c918f403c75e8b71801e
diff --git a/input_files/convert_input_files_refactoring_part_2.py b/input_files/convert_input_files_refactoring_part_2.py
index e0cacbd8a6d9b1f56915ec011e7852e4e3ec5f06..04945a1d20285475747a395ed154ed701520de77 100644
--- a/input_files/convert_input_files_refactoring_part_2.py
+++ b/input_files/convert_input_files_refactoring_part_2.py
@@ -11,19 +11,19 @@ def read_matrix(df):
     for i in df.index:
         matrix_row = []
         for j in df.index:
-            matrix_row.append(df[df["comp_name"][j]][i])
+            matrix_row.append(df[df["name"][j]][i])
         matrix.append(matrix_row)
     return matrix
 
 def read_components(df):
     components = {}
     for i in df.index:
-        components[df["comp_name"][i]] = i
+        components[df["name"][i]] = i
     return components
 
 def compare_components(comp_1, comp_2):
     different = False
-    for column in ['comp_name', 'comp_type', 'model', 'min_size', 'max_size', 'current_size']:
+    for column in ['name', 'type', 'model', 'min_size', 'max_size', 'current_size']:
         if comp_1[column] != comp_2[column]:
             if not math.isnan(comp_1[column]) and not math.isnan(comp_2[column]):
                 different = True
@@ -79,26 +79,27 @@ 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))
+                df.rename(columns = {'comp_name': 'name', 'comp_type': 'type'}, inplace = True)
                 for i in df.index:
-                    if df['comp_type'][i] in renamed_components:
-                        df.loc[i, 'comp_type'] = renamed_components[df['comp_type'][i]]
-                    if df['comp_type'][i] in consumption_components:
+                    if df['type'][i] in renamed_components:
+                        df.loc[i, 'type'] = renamed_components[df['type'][i]]
+                    if df['type'][i] in consumption_components:
                         df.loc[i, 'model'] = ''
                         df.loc[i, 'min_size'] = ''
                         df.loc[i, 'max_size'] = ''
                         df.loc[i, 'current_size'] = ''
                 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'])
+            all_components = pd.DataFrame(columns = ['name', 'type', 'model', 'min_size', 'max_size', 'current_size'])
+            all_connections = pd.DataFrame(columns = ['sector', 'from', 'to'])
             for df, matrix, components, sector in file_contents:
                 for component in components:
-                    if component not in all_components.loc[:]['comp_name']:
-                        all_components.loc[component] = df.loc[components[component]][['comp_name', 'comp_type', 'model', 'min_size', 'max_size', 'current_size']]
+                    if component not in all_components.loc[:]['name']:
+                        all_components.loc[component] = df.loc[components[component]][['name', 'type', 'model', 'min_size', 'max_size', 'current_size']]
                     else:
-                        if compare_components(all_components.loc[component], df.loc[components[component]][['comp_name', 'comp_type', 'model', 'min_size', 'max_size', 'current_size']]):
+                        if compare_components(all_components.loc[component], df.loc[components[component]][['name', 'type', 'model', 'min_size', 'max_size', 'current_size']]):
                             raise KeyError
                     for connected_component in get_connected_components(matrix, components, component):
-                        all_connections = pd.concat([all_connections, pd.Series({'sector': sector, 'comp_from': component, 'comp_to': connected_component}).to_frame().T], ignore_index = True)
+                        all_connections = pd.concat([all_connections, pd.Series({'sector': sector, 'from': component, 'to': connected_component}).to_frame().T], ignore_index = True)
             config = read_config(os.path.join(dirpath, "config.csv"))
             changed_topologies.append(dirpath)
             new_config = dict()
@@ -117,65 +118,65 @@ for dirpath, dirnames, filenames in os.walk(".\\input_files"):
                         print(f"Config of topology {dirpath} has a variable electricity price, so be sure to add a price profile!")
                     else:
                         for i in all_components.index:
-                            if all_components['comp_type'][i] == 'ElectricalGrid':
-                                new_config[all_components['comp_name'][i] + '_price'] = value
+                            if all_components['type'][i] == 'ElectricalGrid':
+                                new_config[all_components['name'][i] + '_price'] = value
                 elif name == 'injection_price':
                     if config['injection_price_variable'] == 1:
                         print(f"Config of topology {dirpath} has a variable electricity injection price, so be sure to add a price profile!")
                     else:
                         for i in all_components.index:
-                            if all_components['comp_type'][i] == 'ElectricalGrid':
-                                new_config[all_components['comp_name'][i] + '_injection_price'] = value
+                            if all_components['type'][i] == 'ElectricalGrid':
+                                new_config[all_components['name'][i] + '_injection_price'] = value
                 elif name == 'gas_price':
                     if config['gas_price_variable'] == 1:
                         print(f"Config of topology {dirpath} has a variable gas price, so be sure to add a price profile!")
                     else:
                         for i in all_components.index:
-                            if all_components['comp_type'][i] == 'GasGrid':
-                                new_config[all_components['comp_name'][i] + '_price'] = value
+                            if all_components['type'][i] == 'GasGrid':
+                                new_config[all_components['name'][i] + '_price'] = value
                 elif name == 'injection_price_gas':
                     if config['injection_price_gas_variable'] == 1:
                         print(f"Config of topology {dirpath} has a variable gas injection price, so be sure to add a price profile!")
                     else:
                         for i in all_components.index:
-                            if all_components['comp_type'][i] == 'GasGrid':
-                                new_config[all_components['comp_name'][i] + '_injection_price'] = value
+                            if all_components['type'][i] == 'GasGrid':
+                                new_config[all_components['name'][i] + '_injection_price'] = value
                 elif name == 'heat_price':
                     if config['heat_price_variable'] == 1:
                         print(f"Config of topology {dirpath} has a variable heat price, so be sure to add a price profile!")
                     else:
                         for i in all_components.index:
-                            if all_components['comp_type'][i] == 'HeatGrid':
-                                new_config[all_components['comp_name'][i] + '_price'] = value
+                            if all_components['type'][i] == 'HeatGrid':
+                                new_config[all_components['name'][i] + '_price'] = value
                 elif name == 'injection_price_heat':
                     if config['injection_price_heat_variable'] == 1:
                         print(f"Config of topology {dirpath} has a variable heat injection price, so be sure to add a price profile!")
                     else:
                         for i in all_components.index:
-                            if all_components['comp_type'][i] == 'HeatGrid':
-                                new_config[all_components['comp_name'][i] + '_injection_price'] = value
+                            if all_components['type'][i] == 'HeatGrid':
+                                new_config[all_components['name'][i] + '_injection_price'] = value
                 elif name == 'cooling_price':
                     if config['cooling_price_variable'] == 1:
                         print(f"Config of topology {dirpath} has a variable cooling price, so be sure to add a price profile!")
                     else:
                         for i in all_components.index:
-                            if all_components['comp_type'][i] == 'CoolingGrid':
-                                new_config[all_components['comp_name'][i] + '_price'] = value
+                            if all_components['type'][i] == 'CoolingGrid':
+                                new_config[all_components['name'][i] + '_price'] = value
                 elif name == 'injection_price_cooling':
                     if config['injection_price_cooling_variable'] == 1:
                         print(f"Config of topology {dirpath} has a variable cooling injection price, so be sure to add a price profile!")
                     else:
                         for i in all_components.index:
-                            if all_components['comp_type'][i] == 'CoolingGrid':
-                                new_config[all_components['comp_name'][i] + '_injection_price'] = value
+                            if all_components['type'][i] == 'CoolingGrid':
+                                new_config[all_components['name'][i] + '_injection_price'] = value
                 elif name == 'elec_emission':
                     for i in all_components.index:
-                        if all_components['comp_type'][i] == 'ElectricalGrid':
-                            new_config[all_components['comp_name'][i] + '_emission'] = value
+                        if all_components['type'][i] == 'ElectricalGrid':
+                            new_config[all_components['name'][i] + '_emission'] = value
                 elif name == 'gas_emission':
                     for i in all_components.index:
-                        if all_components['comp_type'][i] == 'GasGrid':
-                            new_config[all_components['comp_name'][i] + '_emission'] = value
+                        if all_components['type'][i] == 'GasGrid':
+                            new_config[all_components['name'][i] + '_emission'] = value
                 else:
                     new_config[name] = value
             all_components.to_csv(os.path.join(dirpath, "temp.csv"), index = False)
diff --git a/input_files/models/district_models/example_CA/components.csv b/input_files/models/district_models/example_CA/components.csv
index 9fe473ac8975d9a77d5d36c613d744af62b3da64..671c3e165f474c7a6a0b3c75d656462152b921f7 100644
--- a/input_files/models/district_models/example_CA/components.csv
+++ b/input_files/models/district_models/example_CA/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,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,ElectricalGrid,GRD1,1000,1000,1000
diff --git a/input_files/models/district_models/example_CA/connections.csv b/input_files/models/district_models/example_CA/connections.csv
index d13d507156fffd8ce828d6c4b432daf9d8bb0a8b..792c8b1f4fc0c752ba922b7fa195867470bc8ccc 100644
--- a/input_files/models/district_models/example_CA/connections.csv
+++ b/input_files/models/district_models/example_CA/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,inv_pv_bat,battery
 electricity,inv_pv_bat,grd
 electricity,inv_pv_bat,elec_cns
diff --git a/input_files/models/district_models/example_community/components.csv b/input_files/models/district_models/example_community/components.csv
index 096d2a289da0f5201cf1256f2ad2f43566c65097..84edca4c2ecdb351206ef05ea7d706279c4a53d8 100644
--- a/input_files/models/district_models/example_community/components.csv
+++ b/input_files/models/district_models/example_community/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
diff --git a/input_files/models/district_models/example_community/connections.csv b/input_files/models/district_models/example_community/connections.csv
index e451eec732b897a226572bb91176416c0bdf9240..d63037e151876506cae26e672ae1687d659d48d7 100644
--- a/input_files/models/district_models/example_community/connections.csv
+++ b/input_files/models/district_models/example_community/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv_bat
 electricity,inv_pv_bat,battery
 electricity,inv_pv_bat,grd
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 096d2a289da0f5201cf1256f2ad2f43566c65097..84edca4c2ecdb351206ef05ea7d706279c4a53d8 100644
--- a/input_files/models/district_models/jbr_test_ca/components.csv
+++ b/input_files/models/district_models/jbr_test_ca/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
diff --git a/input_files/models/district_models/jbr_test_ca/connections.csv b/input_files/models/district_models/jbr_test_ca/connections.csv
index e451eec732b897a226572bb91176416c0bdf9240..d63037e151876506cae26e672ae1687d659d48d7 100644
--- a/input_files/models/district_models/jbr_test_ca/connections.csv
+++ b/input_files/models/district_models/jbr_test_ca/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv_bat
 electricity,inv_pv_bat,battery
 electricity,inv_pv_bat,grd
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 096d2a289da0f5201cf1256f2ad2f43566c65097..84edca4c2ecdb351206ef05ea7d706279c4a53d8 100644
--- a/input_files/models/district_models/jbr_test_comm/components.csv
+++ b/input_files/models/district_models/jbr_test_comm/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
diff --git a/input_files/models/district_models/jbr_test_comm/connections.csv b/input_files/models/district_models/jbr_test_comm/connections.csv
index e451eec732b897a226572bb91176416c0bdf9240..d63037e151876506cae26e672ae1687d659d48d7 100644
--- a/input_files/models/district_models/jbr_test_comm/connections.csv
+++ b/input_files/models/district_models/jbr_test_comm/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv_bat
 electricity,inv_pv_bat,battery
 electricity,inv_pv_bat,grd
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/components.csv b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
index 414d23a3d277087c6196cde35046409b17abee8d..2b280bcb25a46edf786631dc5ad0d0f27a1ed221 100644
--- a/input_files/models/prosumer_models/SCN0_CAT1/components.csv
+++ b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 grd,ElectricalGrid,GRD1,100000,100000,0
 elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/connections.csv b/input_files/models/prosumer_models/SCN0_CAT1/connections.csv
index 0e2d493c2bfd89dbc045e043548c77df8c6a63d5..3e485ceed89794793954afab46ff6a9be59a33d0 100644
--- a/input_files/models/prosumer_models/SCN0_CAT1/connections.csv
+++ b/input_files/models/prosumer_models/SCN0_CAT1/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,grd,elec_cns
 gas,gas_grd,gas_boi
 heat,water_tes,therm_cns
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 848c34e1cb5d554fa27c1c9842552e7e6324839d..c37533c1723118c5d8bc0c6ae39dbe06ac726d4c 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv
index 42d01f84dc19a15590e227b8ca095b52d8a648cf..43a54d1318fcc8dfb48282fae4993e1ce42f7223 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,grd
 electricity,inv_pv,elec_cns
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 35107aae587927960244b94d1e2d45506e6e2d73..ef3503325d4a75d8218bb330a660b0b73563054a 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,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv
index b61eb9ccb526277ca029c4ba1f255b2aef7f90c2..83a66459d5a385444a49b34fc3bf1ee37d6e49da 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,grd
 electricity,inv_pv,elec_cns
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 7899fb7b2ddc77b63dd651e211cc49146482c2ad..3de8e7db96b7c89824a844a63f793ab25e35fe2f 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,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv
index da42e7d5fa6f2320ff7b1e5c9325a74e73c82bf3..b6e01aecd8630699fab1263b1a14940b8aa2020b 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,heat_pump
 electricity,inv_pv,grd
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 aa296a9117273319e70db093cb960a1a4632098e..70b95184257b25fa364a7b32e41398b04b24d27c 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,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv
index 98920735b2ca5762af4fec9acc03b411d51b457e..97283663a5316bf86995a0f9777a4267917a7ba0 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,heat_pump
 electricity,inv_pv,grd
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 e7979a690de8f51d1b71537995727cccbeba443d..55511dd6cbea0126f7a91b9250752b8c75e23c2d 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 grd,ElectricalGrid,GRD1,10000,10000,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv
index 42d01f84dc19a15590e227b8ca095b52d8a648cf..43a54d1318fcc8dfb48282fae4993e1ce42f7223 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,grd
 electricity,inv_pv,elec_cns
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 31d8fe9d70f823fd4fa56651cb1ad3d9f1200695..86be551e1b3623c0a2e9ea62be1ca2cc4357482b 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,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv
index b0145baced1e37bcc71ae9f838733f6c08297e67..fb91ba92c0c99dc3f5a4644361616ba92e4540d2 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,grd
 electricity,inv_pv,elec_cns
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 5081af0d495be86e410ad75c6980180af2befa1f..68d9cb21b3845b7e7e4500faabcc55b8f4bb6552 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,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv
index da42e7d5fa6f2320ff7b1e5c9325a74e73c82bf3..b6e01aecd8630699fab1263b1a14940b8aa2020b 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,heat_pump
 electricity,inv_pv,grd
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 aabb7a8e8eccdbb8b307f3185a4a4085d1c705dd..c2bfab8aeef32ed6ca91c293ef5855875aa239f0 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,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 heat_pump,HeatPump,EHP1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv
index 98920735b2ca5762af4fec9acc03b411d51b457e..97283663a5316bf86995a0f9777a4267917a7ba0 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,heat_pump
 electricity,inv_pv,grd
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/components.csv b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
index 6afe7f36819a5386098737f54a4e8d31bb7569e4..652da783013e0aa307cdfb1c6792f1f8a00a5518 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1/connections.csv
index 0e2d493c2bfd89dbc045e043548c77df8c6a63d5..3e485ceed89794793954afab46ff6a9be59a33d0 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,grd,elec_cns
 gas,gas_grd,gas_boi
 heat,water_tes,therm_cns
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 848c34e1cb5d554fa27c1c9842552e7e6324839d..c37533c1723118c5d8bc0c6ae39dbe06ac726d4c 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv
index 42d01f84dc19a15590e227b8ca095b52d8a648cf..43a54d1318fcc8dfb48282fae4993e1ce42f7223 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,grd
 electricity,inv_pv,elec_cns
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 35107aae587927960244b94d1e2d45506e6e2d73..ef3503325d4a75d8218bb330a660b0b73563054a 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,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv
index b61eb9ccb526277ca029c4ba1f255b2aef7f90c2..83a66459d5a385444a49b34fc3bf1ee37d6e49da 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,grd
 electricity,inv_pv,elec_cns
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 7899fb7b2ddc77b63dd651e211cc49146482c2ad..3de8e7db96b7c89824a844a63f793ab25e35fe2f 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,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv
index 6d228b6aeb02e5f5d937ac35607f2a5ce570a895..1ce26af83ca14a8af80a8cdb01f1096fde610b47 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,heat_pump
 electricity,inv_pv,grd
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 aa296a9117273319e70db093cb960a1a4632098e..70b95184257b25fa364a7b32e41398b04b24d27c 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,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv
index 98920735b2ca5762af4fec9acc03b411d51b457e..97283663a5316bf86995a0f9777a4267917a7ba0 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,heat_pump
 electricity,inv_pv,grd
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 e7979a690de8f51d1b71537995727cccbeba443d..55511dd6cbea0126f7a91b9250752b8c75e23c2d 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 grd,ElectricalGrid,GRD1,10000,10000,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv
index 42d01f84dc19a15590e227b8ca095b52d8a648cf..43a54d1318fcc8dfb48282fae4993e1ce42f7223 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,grd
 electricity,inv_pv,elec_cns
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 31d8fe9d70f823fd4fa56651cb1ad3d9f1200695..86be551e1b3623c0a2e9ea62be1ca2cc4357482b 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,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv
index b61eb9ccb526277ca029c4ba1f255b2aef7f90c2..83a66459d5a385444a49b34fc3bf1ee37d6e49da 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,grd
 electricity,inv_pv,elec_cns
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 5081af0d495be86e410ad75c6980180af2befa1f..68d9cb21b3845b7e7e4500faabcc55b8f4bb6552 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,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv
index 6d228b6aeb02e5f5d937ac35607f2a5ce570a895..1ce26af83ca14a8af80a8cdb01f1096fde610b47 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,heat_pump
 electricity,inv_pv,grd
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 aabb7a8e8eccdbb8b307f3185a4a4085d1c705dd..c2bfab8aeef32ed6ca91c293ef5855875aa239f0 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,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 heat_pump,HeatPump,EHP1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv
index 98920735b2ca5762af4fec9acc03b411d51b457e..97283663a5316bf86995a0f9777a4267917a7ba0 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv
 electricity,inv_pv,heat_pump
 electricity,inv_pv,grd
diff --git a/input_files/models/prosumer_models/jbr_test/components.csv b/input_files/models/prosumer_models/jbr_test/components.csv
index 096d2a289da0f5201cf1256f2ad2f43566c65097..84edca4c2ecdb351206ef05ea7d706279c4a53d8 100644
--- a/input_files/models/prosumer_models/jbr_test/components.csv
+++ b/input_files/models/prosumer_models/jbr_test/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
diff --git a/input_files/models/prosumer_models/jbr_test/connections.csv b/input_files/models/prosumer_models/jbr_test/connections.csv
index e451eec732b897a226572bb91176416c0bdf9240..d63037e151876506cae26e672ae1687d659d48d7 100644
--- a/input_files/models/prosumer_models/jbr_test/connections.csv
+++ b/input_files/models/prosumer_models/jbr_test/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv_bat
 electricity,inv_pv_bat,battery
 electricity,inv_pv_bat,grd
diff --git a/input_files/models/prosumer_models/mfh_quartal/components.csv b/input_files/models/prosumer_models/mfh_quartal/components.csv
index 1697b9bb1bc82291dcfebfef1cd0369fcc91c04c..5b1f7270a6e56f01e3e92f2bbf9879758f735960 100644
--- a/input_files/models/prosumer_models/mfh_quartal/components.csv
+++ b/input_files/models/prosumer_models/mfh_quartal/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 grd,ElectricalGrid,GRD1,1000,1000,0
 pv,PVGenerator,PV2,0,30,0
 bat,LiionBattery,BAT1,1,1,0
diff --git a/input_files/models/prosumer_models/mfh_quartal/connections.csv b/input_files/models/prosumer_models/mfh_quartal/connections.csv
index ec97f639b9888b7b3b1cc6fa066b67f9cfa1e723..24fbbcbe2b387b1c2e48527a1eed199904fcc49b 100644
--- a/input_files/models/prosumer_models/mfh_quartal/connections.csv
+++ b/input_files/models/prosumer_models/mfh_quartal/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,grd,ecns1
 electricity,grd,ecns2
 electricity,grd,ecns3
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 8b68ad82cf0f0af43a36343574167da857ed0bda..c80d58e8f2145d143a588c36c485278088de7241 100644
--- a/input_files/models/prosumer_models/office_pv_heatpump/components.csv
+++ b/input_files/models/prosumer_models/office_pv_heatpump/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,0,30,0
 inv_pv_bat,Inverter,STP-7000TL-20,0,30,0
 battery,LiionBattery,BAT1,0,1000,0
diff --git a/input_files/models/prosumer_models/office_pv_heatpump/connections.csv b/input_files/models/prosumer_models/office_pv_heatpump/connections.csv
index 9fb0451f88f4548a01618c8add4d54e7415a68d2..f05079cf72987017e6ee9a485fcb1e014cc28e28 100644
--- a/input_files/models/prosumer_models/office_pv_heatpump/connections.csv
+++ b/input_files/models/prosumer_models/office_pv_heatpump/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
 electricity,pv_roof,inv_pv_bat
 electricity,inv_pv_bat,battery
 electricity,inv_pv_bat,heat_pump