diff --git a/Model_Library b/Model_Library
index 1d0e19b23f9d69ae0bef98e48522d01cfbf7e797..48f086f2afb9551faec04671060b6e4ec47f041f 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit 1d0e19b23f9d69ae0bef98e48522d01cfbf7e797
+Subproject commit 48f086f2afb9551faec04671060b6e4ec47f041f
diff --git a/runme.py b/runme.py
index 7f76e0a2ed8ae837b273b5eb9a7c77e19873a2ac..17df4d2364f9bf9e54a6b4ad63ec21b53f3b88d5 100644
--- a/runme.py
+++ b/runme.py
@@ -6,9 +6,9 @@ from enum import Enum
 
 class SimulationScope(Enum):
     PROSUMER = 1
-    COMMUNITY = 2
+    DISTRICT = 2
 
-simulation_scope = SimulationScope.COMMUNITY
+simulation_scope = SimulationScope.DISTRICT
 t_start = pd.Timestamp("2019-05-10 00:00:00") # start time of simulation
 t_horizon = 240 # number of time steps to be simulated
 t_step = 1 # length of a time step in hours
@@ -58,21 +58,21 @@ prosumers = prosumer_main.prosumers
 if simulation_scope == SimulationScope.PROSUMER:
     exit()
 
-community_assets_dict = {'ca_bat': {'config_path': 'input_files/models/district_models/example_CA/config.csv',
-                                    'topology_path': 'input_files/models/district_models/example_CA',
-                                    'profiles': {'elec_cns': 'demand_electric_3'}}}
+district_assets_dict = {'da_bat': {'config_path': 'input_files/models/district_models/example_CA/config.csv',
+                                   'topology_path': 'input_files/models/district_models/example_CA',
+                                   'profiles': {'elec_cns': 'demand_electric_3'}}}
 
-community_assets = main_prosumer.CommunityAssetMain(community_assets_dict, input_profiles, t_horizon, t_step).community_assets
+district_assets = main_prosumer.DistrictAssetMain(district_assets_dict, input_profiles, t_horizon, t_step).district_assets
 
-community_dict = {'community': {'config_path': 'input_files/models/district_models/example_community/config.csv',
-                                'profiles': {'elec_price': 'elec_price_1'}}}
+district_dict = {'community': {'config_path': 'input_files/models/district_models/example_community/config.csv',
+                               'profiles': {'elec_price': 'elec_price_1'}}}
 
-community_main = main_district.CommunityMain(community_dict, prosumers, community_assets, input_profiles, t_horizon, t_step)
+disctrict_main = main_district.DistrictMain(district_dict, prosumers, district_assets, input_profiles, t_horizon, t_step)
 
-community_sizing_strategy = 'max_operational_profit'
-community_main.optimize_sizing(community_sizing_strategy)
+district_sizing_strategy = 'max_operational_profit'
+disctrict_main.optimize_sizing(district_sizing_strategy)
 
-community_operation_strategy = 'max_operational_profit'
-community_main.optimize_operation(t_horizon, community_operation_strategy)
+disctrict_operation_strategy = 'max_operational_profit'
+disctrict_main.optimize_operation(t_horizon, disctrict_operation_strategy)
 
-community_main.save_results()
+disctrict_main.save_results()