From 3ab6f1cea4d81afd25c78ca0187b22c2bf2e99de Mon Sep 17 00:00:00 2001
From: Jacob Schwartz <jacob@jaschwartz.net>
Date: Sun, 3 Dec 2023 15:55:51 -0500
Subject: [PATCH 1/9] Rename network.csv columns

---
 src/load_inputs/load_network_data.jl | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/load_inputs/load_network_data.jl b/src/load_inputs/load_network_data.jl
index 558699aea5..caed718f7c 100644
--- a/src/load_inputs/load_network_data.jl
+++ b/src/load_inputs/load_network_data.jl
@@ -90,19 +90,19 @@ end
 
 Loads the network map from a list-style interface
 ```
-..., Network_Lines, Origin_Zone, Destination_Zone, ...
-                 1,           1,                2,
-                 2,           1,                3,
+..., Network_Lines, Start_Node, End_Node, ...
+                 1,           1,       2,
+                 2,           1,       3,
 ```
 """
 function load_network_map_from_list(network_var::DataFrame, Z, L, list_columns)
     start_col, end_col = list_columns
     mat = zeros(L, Z)
-    start_zones = collect(skipmissing(network_var[!, start_col]))
-    end_zones = collect(skipmissing(network_var[!, end_col]))
+    start_nodes = collect(skipmissing(network_var[!, start_col]))
+    end_nodes = collect(skipmissing(network_var[!, end_col]))
     for l in 1:L
-        mat[l, start_zones[l]] = 1
-        mat[l, end_zones[l]] = -1
+        mat[l, start_nodes[l]] = 1
+        mat[l, end_nodes[l]] = -1
     end
     mat
 end
@@ -128,7 +128,7 @@ end
 function load_network_map(network_var::DataFrame, Z, L)
     columns = names(network_var)
 
-    list_columns = ["Origin_Zone", "Destination_Zone"]
+    list_columns = ["Start_Node", "End_Node"]
     has_network_list = all([c in columns for c in list_columns])
 
     zones_as_strings = ["z" * string(i) for i in 1:Z]
@@ -145,6 +145,8 @@ function load_network_map(network_var::DataFrame, Z, L)
     elseif has_network_list
         load_network_map_from_list(network_var, Z, L, list_columns)
     elseif has_network_matrix
+		@warn """Loading the network map in a matrix format is deprecated as of v0.4
+		and will be removed in v0.5."""
         load_network_map_from_matrix(network_var, Z, L)
     end
 end

From 9a7b5baf0eecbf5d8f86497ec004688e477f9b9e Mon Sep 17 00:00:00 2001
From: Jacob Schwartz <jacob@jaschwartz.net>
Date: Sun, 3 Dec 2023 16:16:18 -0500
Subject: [PATCH 2/9] Add deprecation warning

---
 src/load_inputs/load_network_data.jl | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/load_inputs/load_network_data.jl b/src/load_inputs/load_network_data.jl
index caed718f7c..cb660008fe 100644
--- a/src/load_inputs/load_network_data.jl
+++ b/src/load_inputs/load_network_data.jl
@@ -121,6 +121,7 @@ starting node of the line and the zone with entry -1 is the ending node of the l
 """
 function load_network_map_from_matrix(network_var::DataFrame, Z, L)
     # Topology of the network source-sink matrix
+	network_map_matrix_format_deprecation_warning()
     col = findall(s -> s == "z1", names(network_var))[1]
     mat = Matrix{Float64}(network_var[1:L, col:col+Z-1])
 end
@@ -145,8 +146,17 @@ function load_network_map(network_var::DataFrame, Z, L)
     elseif has_network_list
         load_network_map_from_list(network_var, Z, L, list_columns)
     elseif has_network_matrix
-		@warn """Loading the network map in a matrix format is deprecated as of v0.4
-		and will be removed in v0.5."""
         load_network_map_from_matrix(network_var, Z, L)
     end
 end
+
+function network_map_matrix_format_deprecation_warning()
+		@warn """Loading the network map in a matrix format is deprecated as of v0.4
+and will be removed in v0.5. Instead, use the more compact list-style format.
+
+..., Network_Lines, Start_Node, End_Node, ...
+                 1,          1,        2,
+                 2,          1,        3,
+                 3,          2,        3,
+""" maxlog=1
+end

From b3c5a094b9ea7c1d7b3b71e8aee3f761384c15c2 Mon Sep 17 00:00:00 2001
From: Jacob Schwartz <jacob@jaschwartz.net>
Date: Sun, 3 Dec 2023 16:30:16 -0500
Subject: [PATCH 3/9] Rename Origin/Destination_Zone to Start/End_Node

---
 docs/src/data_documentation.md | 18 +++++++++---------
 docs/src/model_notation.md     |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/src/data_documentation.md b/docs/src/data_documentation.md
index 1931325814..5b67dd15b4 100644
--- a/docs/src/data_documentation.md
+++ b/docs/src/data_documentation.md
@@ -188,7 +188,7 @@ This input file contains input parameters related to: 1) definition of model zon
 |**Settings-specific Columns**|
 |**Multiple zone model**||
 |Network\_Lines | Numerical index for each network line. The length of this column is counted but the actual values are not used.|
-| z* (Network map) **OR** Origin_Zone, Destination_Zone | See below |
+| z* (Network map) **OR** Start_Node, End_Node | See below |
 |Line\_Max\_Flow\_MW | Existing capacity of the inter-regional transmission line.|
 |**NetworkExpansion = 1**||
 |Line\_Max\_Reinforcement\_MW |Maximum allowable capacity addition to the existing transmission line.|
@@ -211,17 +211,17 @@ This input file contains input parameters related to: 1) definition of model zon
 There are two interfaces implemented for specifying the network topology itself: a matrix interface and a list interface.
 Only one choice is permitted in a given file.
 
-The list interface consists of a column for the lines origin zone and one for the line's destination zone.
+The list interface consists of a column for the lines start node and one for the line's end node.
 Here is a snippet of the Network.csv file for a map with three zones and two lines:
 ```
-Network_Lines, Origin_Zone, Destination_Zone,
-            1,           1,                2,
-            2,           1,                3,
+Network_Lines, Start_Node, End_Node,
+            1,          1,        2,
+            2,          1,        3,
 ```
 
 The matrix interface requires N columns labeled `z1, z2, z3 ... zN`,
-and L rows, one for each network line (or interregional path), with a `1` in the column corresponding to the 'origin' zone 
-and a `-1` in the column corresponding to the 'destination' zone for each line.
+and L rows, one for each network line (or interregional path), with a `1` in the column corresponding to the 'start' zone 
+and a `-1` in the column corresponding to the 'end' zone for each line.
 Here is the same network map implemented as a matrix:
 ```
 Network_Lines, z1, z2, z3,
@@ -229,8 +229,8 @@ Network_Lines, z1, z2, z3,
             2,  1,  0, -1,
 ```
 
-Note that in either case, positive flows indicate flow from origin to destination zone;
-negative flows indicate flow from destination to origin zone.
+Note that in either case, positive flows indicate flow from start to end node;
+negative flows indicate flow from end to start node.
 
 
 #### 2.1.3 Demand\_data.csv (Load\_data.csv)
diff --git a/docs/src/model_notation.md b/docs/src/model_notation.md
index defffad6fc..a5283eda67 100644
--- a/docs/src/model_notation.md
+++ b/docs/src/model_notation.md
@@ -238,7 +238,7 @@ $\mathcal{W} \subseteq \mathcal{G}$ | where $\mathcal{W}$ set of hydroelectric g
 |$\rho_{y,z,t}^{max,pv}$ | Maximum available generation per unit of installed capacity for the solar PV component of a co-located VRE and storage resource during time step t for technology y in zone z [%]|
 |$\rho_{y,z,t}^{max,wind}$ | Maximum available generation per unit of installed capacity for the wind component of a co-located VRE and storage resource during time step t for technology y in zone z [%]|
 |$VREIndex_{y,z}$ | Resource bin index for VRE technology $y$ in zone $z$. $VREIndex_{y,z}=1$ for the first bin, and $VREIndex_{y,z}=0$ for remaining bins. Only defined for $y\in \mathcal{VRE}$ |
-|$\varphi^{map}_{l,z}$ | Topology of the network, for line l: $\varphi^{map}_{l,z}=1$ for zone $z$ of origin, - 1 for zone $z$ of destination, 0 otherwise. |
+|$\varphi^{map}_{l,z}$ | Topology of the network, for line l: $\varphi^{map}_{l,z}=1$ for start node $z$, - 1 for end node $z$, 0 otherwise. |
 |$\eta_{y,z}^{loss}$ | Self discharge rate per time step per unit of installed capacity for storage technology $y$ in zone $z$ [%]|
 |$\eta_{y,z}^{charge}$ | Single-trip efficiency of storage charging/demand deferral for technology $y$ in zone $z$ [%]|
 |$\eta_{y,z}^{discharge}$ | Single-trip efficiency of storage (and hydro reservoir) discharging/demand satisfaction for technology $y$ in zone $z$ [%]|

From 06da7b46195e6ec0e93526cf9bb4f4f0ef4f063e Mon Sep 17 00:00:00 2001
From: Jacob Schwartz <jacob@jaschwartz.net>
Date: Sun, 3 Dec 2023 16:31:08 -0500
Subject: [PATCH 4/9] Better warning

---
 src/load_inputs/load_network_data.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/load_inputs/load_network_data.jl b/src/load_inputs/load_network_data.jl
index cb660008fe..c3f2b8a306 100644
--- a/src/load_inputs/load_network_data.jl
+++ b/src/load_inputs/load_network_data.jl
@@ -151,7 +151,7 @@ function load_network_map(network_var::DataFrame, Z, L)
 end
 
 function network_map_matrix_format_deprecation_warning()
-		@warn """Loading the network map in a matrix format is deprecated as of v0.4
+		@warn """Specifying the network map as a matrix is deprecated as of v0.4
 and will be removed in v0.5. Instead, use the more compact list-style format.
 
 ..., Network_Lines, Start_Node, End_Node, ...

From 5f977048163649e931b20bf5df4e3db2d43e028a Mon Sep 17 00:00:00 2001
From: Jacob Schwartz <jacob@jaschwartz.net>
Date: Sun, 3 Dec 2023 16:42:30 -0500
Subject: [PATCH 5/9] Update Network.csv matrixes->columns

---
 .../RealSystemExample/ISONE_Trizone/Network.csv           | 8 ++++----
 .../ISONE_Trizone_FullTimeseries/Network.csv              | 8 ++++----
 .../ISONE_Trizone_MultiStage/Inputs/Inputs_p1/Network.csv | 8 ++++----
 .../ISONE_Trizone_MultiStage/Inputs/Inputs_p2/Network.csv | 8 ++++----
 .../ISONE_Trizone_MultiStage/Inputs/Inputs_p3/Network.csv | 8 ++++----
 Example_Systems/SmallNewEngland/ThreeZones/Network.csv    | 8 ++++----
 .../ThreeZones_MultiStage/Inputs/Inputs_p1/Network.csv    | 8 ++++----
 .../ThreeZones_MultiStage/Inputs/Inputs_p2/Network.csv    | 8 ++++----
 .../ThreeZones_MultiStage/Inputs/Inputs_p3/Network.csv    | 8 ++++----
 .../ThreeZones_Slack_Variables_Example/Network.csv        | 8 ++++----
 Example_Systems/VREStor_Example/Network.csv               | 6 +++---
 test/ThreeZones/Network.csv                               | 8 ++++----
 test/VREStor/Network.csv                                  | 8 ++++----
 13 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone/Network.csv b/Example_Systems/RealSystemExample/ISONE_Trizone/Network.csv
index a26c95a6be..9540f1d295 100644
--- a/Example_Systems/RealSystemExample/ISONE_Trizone/Network.csv
+++ b/Example_Systems/RealSystemExample/ISONE_Trizone/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
-NENGREST,z1,1,1,-1,0,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0
-NENG_CT,z2,2,1,0,-1,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0
-NENG_ME,z3,,,,,,,,,,,,,
\ No newline at end of file
+,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
+NENGREST,z1,1,1,2,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0
+NENG_CT,z2,2,1,3,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0
+NENG_ME,z3,,,,,,,,,,,,
diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv b/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv
index a26c95a6be..869305b005 100644
--- a/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv
+++ b/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
-NENGREST,z1,1,1,-1,0,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0
-NENG_CT,z2,2,1,0,-1,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0
-NENG_ME,z3,,,,,,,,,,,,,
\ No newline at end of file
+,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
+NENGREST,z1,1,1,2,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0
+NENG_CT,z2,2,1,3,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0
+NENG_ME,z3,,,,,,,,,,,
diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p1/Network.csv b/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p1/Network.csv
index 13317c8d9f..a5d95cd74e 100644
--- a/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p1/Network.csv
+++ b/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p1/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
-NENGREST,z1,1,1,-1,0,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0,5900,0.062,30
-NENG_CT,z2,2,1,0,-1,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0,4000,0.062,30
-NENG_ME,z3,,,,,,,,,,,,,,,,
+,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
+NENGREST,z1,1,1,2,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0,5900,0.062,30
+NENG_CT,z2,2,1,3,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0,4000,0.062,30
+NENG_ME,z3,,,,,,,,,,,,,,,
diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p2/Network.csv b/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p2/Network.csv
index 13317c8d9f..a5d95cd74e 100644
--- a/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p2/Network.csv
+++ b/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p2/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
-NENGREST,z1,1,1,-1,0,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0,5900,0.062,30
-NENG_CT,z2,2,1,0,-1,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0,4000,0.062,30
-NENG_ME,z3,,,,,,,,,,,,,,,,
+,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
+NENGREST,z1,1,1,2,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0,5900,0.062,30
+NENG_CT,z2,2,1,3,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0,4000,0.062,30
+NENG_ME,z3,,,,,,,,,,,,,,,
diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p3/Network.csv b/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p3/Network.csv
index 13317c8d9f..a5d95cd74e 100644
--- a/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p3/Network.csv
+++ b/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p3/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
-NENGREST,z1,1,1,-1,0,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0,5900,0.062,30
-NENG_CT,z2,2,1,0,-1,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0,4000,0.062,30
-NENG_ME,z3,,,,,,,,,,,,,,,,
+,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
+NENGREST,z1,1,1,2,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0,5900,0.062,30
+NENG_CT,z2,2,1,3,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0,4000,0.062,30
+NENG_ME,z3,,,,,,,,,,,,,,,
diff --git a/Example_Systems/SmallNewEngland/ThreeZones/Network.csv b/Example_Systems/SmallNewEngland/ThreeZones/Network.csv
index 5cca655c66..63bebe68b1 100644
--- a/Example_Systems/SmallNewEngland/ThreeZones/Network.csv
+++ b/Example_Systems/SmallNewEngland/ThreeZones/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
-MA,z1,1,1,-1,0,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0
-CT,z2,2,1,0,-1,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0
-ME,z3,,,,,,,,,,,,,
\ No newline at end of file
+,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
+MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0
+CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0
+ME,z3,,,,,,,,,,,,
diff --git a/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p1/Network.csv b/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p1/Network.csv
index a67a2667e5..a6af5746e1 100644
--- a/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p1/Network.csv
+++ b/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p1/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
-MA,z1,1,1,-1,0,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0,7000,0.062,30
-CT,z2,2,1,0,-1,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0,5000,0.062,30
-ME,z3,,,,,,,,,,,,,,,,
+,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
+MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0,7000,0.062,30
+CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0,5000,0.062,30
+ME,z3,,,,,,,,,,,,,,,
diff --git a/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p2/Network.csv b/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p2/Network.csv
index a67a2667e5..a6af5746e1 100644
--- a/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p2/Network.csv
+++ b/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p2/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
-MA,z1,1,1,-1,0,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0,7000,0.062,30
-CT,z2,2,1,0,-1,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0,5000,0.062,30
-ME,z3,,,,,,,,,,,,,,,,
+,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
+MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0,7000,0.062,30
+CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0,5000,0.062,30
+ME,z3,,,,,,,,,,,,,,,
diff --git a/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p3/Network.csv b/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p3/Network.csv
index a67a2667e5..a6af5746e1 100644
--- a/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p3/Network.csv
+++ b/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p3/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
-MA,z1,1,1,-1,0,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0,7000,0.062,30
-CT,z2,2,1,0,-1,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0,5000,0.062,30
-ME,z3,,,,,,,,,,,,,,,,
+,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
+MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0,7000,0.062,30
+CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0,5000,0.062,30
+ME,z3,,,,,,,,,,,,,,,
diff --git a/Example_Systems/SmallNewEngland/ThreeZones_Slack_Variables_Example/Network.csv b/Example_Systems/SmallNewEngland/ThreeZones_Slack_Variables_Example/Network.csv
index 5cca655c66..2dd876bb66 100644
--- a/Example_Systems/SmallNewEngland/ThreeZones_Slack_Variables_Example/Network.csv
+++ b/Example_Systems/SmallNewEngland/ThreeZones_Slack_Variables_Example/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
-MA,z1,1,1,-1,0,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0
-CT,z2,2,1,0,-1,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0
-ME,z3,,,,,,,,,,,,,
\ No newline at end of file
+,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
+MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0
+CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0
+ME,z3,,,,,,,,,,,
diff --git a/Example_Systems/VREStor_Example/Network.csv b/Example_Systems/VREStor_Example/Network.csv
index c286cebd00..09de54563e 100644
--- a/Example_Systems/VREStor_Example/Network.csv
+++ b/Example_Systems/VREStor_Example/Network.csv
@@ -1,4 +1,4 @@
-Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,Line_Min_Flow_MW,transmission_path_name,Line_Reinforcement_Cost_per_MWyr,Line_Reinforcement_Cost_per_MW,Line_Loss_Percentage,Line_Max_Reinforcement_MW,DerateCapRes_1,CapRes_Excl_1,DerateCapRes_2,CapRes_Excl_2,DerateCapRes_3,CapRes_Excl_3
-z1,1.0,1.0,-1.0,0.0,820.0,820.0,EIC_to_TRE,45958.0,948772.0,0.0649,410.0,0.95,0.0,0.95,0.0,0.95,0.0
-z2,2.0,1.0,0.0,-1.0,1830.0,1830.0,EIC_to_WECC,71600.0,1478140.0,0.1001,915.0,0.95,0.0,0.95,0.0,0.95,0.0
+Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,Line_Min_Flow_MW,transmission_path_name,Line_Reinforcement_Cost_per_MWyr,Line_Reinforcement_Cost_per_MW,Line_Loss_Percentage,Line_Max_Reinforcement_MW,DerateCapRes_1,CapRes_Excl_1,DerateCapRes_2,CapRes_Excl_2,DerateCapRes_3,CapRes_Excl_3
+z1,1.0,1,2,820.0,820.0,EIC_to_TRE,45958.0,948772.0,0.0649,410.0,0.95,0.0,0.95,0.0,0.95,0.0
+z2,2.0,1,3,1830.0,1830.0,EIC_to_WECC,71600.0,1478140.0,0.1001,915.0,0.95,0.0,0.95,0.0,0.95,0.0
 z3,,,,,,,,,,,,,,,,,
diff --git a/test/ThreeZones/Network.csv b/test/ThreeZones/Network.csv
index 5cca655c66..63bebe68b1 100644
--- a/test/ThreeZones/Network.csv
+++ b/test/ThreeZones/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
-MA,z1,1,1,-1,0,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0
-CT,z2,2,1,0,-1,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0
-ME,z3,,,,,,,,,,,,,
\ No newline at end of file
+,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
+MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0
+CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0
+ME,z3,,,,,,,,,,,,
diff --git a/test/VREStor/Network.csv b/test/VREStor/Network.csv
index c286cebd00..9f0dfee2c7 100644
--- a/test/VREStor/Network.csv
+++ b/test/VREStor/Network.csv
@@ -1,4 +1,4 @@
-Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,Line_Min_Flow_MW,transmission_path_name,Line_Reinforcement_Cost_per_MWyr,Line_Reinforcement_Cost_per_MW,Line_Loss_Percentage,Line_Max_Reinforcement_MW,DerateCapRes_1,CapRes_Excl_1,DerateCapRes_2,CapRes_Excl_2,DerateCapRes_3,CapRes_Excl_3
-z1,1.0,1.0,-1.0,0.0,820.0,820.0,EIC_to_TRE,45958.0,948772.0,0.0649,410.0,0.95,0.0,0.95,0.0,0.95,0.0
-z2,2.0,1.0,0.0,-1.0,1830.0,1830.0,EIC_to_WECC,71600.0,1478140.0,0.1001,915.0,0.95,0.0,0.95,0.0,0.95,0.0
-z3,,,,,,,,,,,,,,,,,
+Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,Line_Min_Flow_MW,transmission_path_name,Line_Reinforcement_Cost_per_MWyr,Line_Reinforcement_Cost_per_MW,Line_Loss_Percentage,Line_Max_Reinforcement_MW,DerateCapRes_1,CapRes_Excl_1,DerateCapRes_2,CapRes_Excl_2,DerateCapRes_3,CapRes_Excl_3
+z1,1.0,1,2,820.0,820.0,EIC_to_TRE,45958.0,948772.0,0.0649,410.0,0.95,0.0,0.95,0.0,0.95,0.0
+z2,2.0,1,3,1830.0,1830.0,EIC_to_WECC,71600.0,1478140.0,0.1001,915.0,0.95,0.0,0.95,0.0,0.95,0.0
+z3,,,,,,,,,,,,,,,,

From 803b1f7e381a8e1baa63be96f6a105dcf1024c77 Mon Sep 17 00:00:00 2001
From: Jacob Schwartz <jacob@jaschwartz.net>
Date: Sun, 3 Dec 2023 16:49:55 -0500
Subject: [PATCH 6/9] Add missing comma

---
 .../RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv  | 2 +-
 .../ThreeZones_Slack_Variables_Example/Network.csv              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv b/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv
index 869305b005..9540f1d295 100644
--- a/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv
+++ b/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv
@@ -1,4 +1,4 @@
 ,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
 NENGREST,z1,1,1,2,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0
 NENG_CT,z2,2,1,3,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0
-NENG_ME,z3,,,,,,,,,,,
+NENG_ME,z3,,,,,,,,,,,,
diff --git a/Example_Systems/SmallNewEngland/ThreeZones_Slack_Variables_Example/Network.csv b/Example_Systems/SmallNewEngland/ThreeZones_Slack_Variables_Example/Network.csv
index 2dd876bb66..63bebe68b1 100644
--- a/Example_Systems/SmallNewEngland/ThreeZones_Slack_Variables_Example/Network.csv
+++ b/Example_Systems/SmallNewEngland/ThreeZones_Slack_Variables_Example/Network.csv
@@ -1,4 +1,4 @@
 ,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
 MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0
 CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0
-ME,z3,,,,,,,,,,,
+ME,z3,,,,,,,,,,,,

From 2c148155a4a1740cae86b06fde4011a00b2d929e Mon Sep 17 00:00:00 2001
From: Jacob Schwartz <jacob@jaschwartz.net>
Date: Sun, 3 Dec 2023 16:52:52 -0500
Subject: [PATCH 7/9] Remove extra comma

---
 Example_Systems/VREStor_Example/Network.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Example_Systems/VREStor_Example/Network.csv b/Example_Systems/VREStor_Example/Network.csv
index 09de54563e..9f0dfee2c7 100644
--- a/Example_Systems/VREStor_Example/Network.csv
+++ b/Example_Systems/VREStor_Example/Network.csv
@@ -1,4 +1,4 @@
 Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,Line_Min_Flow_MW,transmission_path_name,Line_Reinforcement_Cost_per_MWyr,Line_Reinforcement_Cost_per_MW,Line_Loss_Percentage,Line_Max_Reinforcement_MW,DerateCapRes_1,CapRes_Excl_1,DerateCapRes_2,CapRes_Excl_2,DerateCapRes_3,CapRes_Excl_3
 z1,1.0,1,2,820.0,820.0,EIC_to_TRE,45958.0,948772.0,0.0649,410.0,0.95,0.0,0.95,0.0,0.95,0.0
 z2,2.0,1,3,1830.0,1830.0,EIC_to_WECC,71600.0,1478140.0,0.1001,915.0,0.95,0.0,0.95,0.0,0.95,0.0
-z3,,,,,,,,,,,,,,,,,
+z3,,,,,,,,,,,,,,,,

From c128a15a8adb7360dc4eff94455401cd0e0254d4 Mon Sep 17 00:00:00 2001
From: Jacob Schwartz <jacob@jaschwartz.net>
Date: Mon, 4 Dec 2023 10:01:50 -0500
Subject: [PATCH 8/9] Rename back to Zone in Examples and loading code

---
 .../ISONE_Trizone/Network.csv                  |  2 +-
 .../ISONE_Trizone_FullTimeseries/Network.csv   |  2 +-
 .../Inputs/Inputs_p1/Network.csv               |  2 +-
 .../Inputs/Inputs_p2/Network.csv               |  2 +-
 .../Inputs/Inputs_p3/Network.csv               |  2 +-
 .../Network.csv                                |  8 ++++----
 .../SmallNewEngland/ThreeZones/Network.csv     |  2 +-
 .../Inputs/Inputs_p1/Network.csv               |  2 +-
 .../Inputs/Inputs_p2/Network.csv               |  2 +-
 .../Inputs/Inputs_p3/Network.csv               |  2 +-
 .../Network.csv                                |  2 +-
 Example_Systems/VREStor_Example/Network.csv    |  2 +-
 src/load_inputs/load_network_data.jl           | 18 +++++++++---------
 test/ThreeZones/Network.csv                    |  2 +-
 test/VREStor/Network.csv                       |  2 +-
 15 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone/Network.csv b/Example_Systems/RealSystemExample/ISONE_Trizone/Network.csv
index 9540f1d295..7afea3db0f 100644
--- a/Example_Systems/RealSystemExample/ISONE_Trizone/Network.csv
+++ b/Example_Systems/RealSystemExample/ISONE_Trizone/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
+,Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
 NENGREST,z1,1,1,2,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0
 NENG_CT,z2,2,1,3,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0
 NENG_ME,z3,,,,,,,,,,,,
diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv b/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv
index 9540f1d295..7afea3db0f 100644
--- a/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv
+++ b/Example_Systems/RealSystemExample/ISONE_Trizone_FullTimeseries/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
+,Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
 NENGREST,z1,1,1,2,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0
 NENG_CT,z2,2,1,3,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0
 NENG_ME,z3,,,,,,,,,,,,
diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p1/Network.csv b/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p1/Network.csv
index a5d95cd74e..76bb6f5c34 100644
--- a/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p1/Network.csv
+++ b/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p1/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
+,Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
 NENGREST,z1,1,1,2,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0,5900,0.062,30
 NENG_CT,z2,2,1,3,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0,4000,0.062,30
 NENG_ME,z3,,,,,,,,,,,,,,,
diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p2/Network.csv b/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p2/Network.csv
index a5d95cd74e..76bb6f5c34 100644
--- a/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p2/Network.csv
+++ b/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p2/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
+,Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
 NENGREST,z1,1,1,2,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0,5900,0.062,30
 NENG_CT,z2,2,1,3,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0,4000,0.062,30
 NENG_ME,z3,,,,,,,,,,,,,,,
diff --git a/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p3/Network.csv b/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p3/Network.csv
index a5d95cd74e..76bb6f5c34 100644
--- a/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p3/Network.csv
+++ b/Example_Systems/RealSystemExample/ISONE_Trizone_MultiStage/Inputs/Inputs_p3/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
+,Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
 NENGREST,z1,1,1,2,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0,5900,0.062,30
 NENG_CT,z2,2,1,3,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0,4000,0.062,30
 NENG_ME,z3,,,,,,,,,,,,,,,
diff --git a/Example_Systems/RealSystemExample/MGA_ISONE_Trizone_FullTimeseries/Network.csv b/Example_Systems/RealSystemExample/MGA_ISONE_Trizone_FullTimeseries/Network.csv
index a26c95a6be..7afea3db0f 100644
--- a/Example_Systems/RealSystemExample/MGA_ISONE_Trizone_FullTimeseries/Network.csv
+++ b/Example_Systems/RealSystemExample/MGA_ISONE_Trizone_FullTimeseries/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,z1,z2,z3,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
-NENGREST,z1,1,1,-1,0,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0
-NENG_CT,z2,2,1,0,-1,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0
-NENG_ME,z3,,,,,,,,,,,,,
\ No newline at end of file
+,Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
+NENGREST,z1,1,1,2,2950,NENGREST_to_NENG_CT,123.0584,0.012305837,2950,12060,0.95,0,0
+NENG_CT,z2,2,1,3,2000,NENGREST_to_NENG_ME,196.5385,0.019653847,2000,19261,0.95,0,0
+NENG_ME,z3,,,,,,,,,,,,
diff --git a/Example_Systems/SmallNewEngland/ThreeZones/Network.csv b/Example_Systems/SmallNewEngland/ThreeZones/Network.csv
index 63bebe68b1..c6413479ff 100644
--- a/Example_Systems/SmallNewEngland/ThreeZones/Network.csv
+++ b/Example_Systems/SmallNewEngland/ThreeZones/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
+,Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
 MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0
 CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0
 ME,z3,,,,,,,,,,,,
diff --git a/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p1/Network.csv b/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p1/Network.csv
index a6af5746e1..e233912403 100644
--- a/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p1/Network.csv
+++ b/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p1/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
+,Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
 MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0,7000,0.062,30
 CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0,5000,0.062,30
 ME,z3,,,,,,,,,,,,,,,
diff --git a/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p2/Network.csv b/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p2/Network.csv
index a6af5746e1..e233912403 100644
--- a/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p2/Network.csv
+++ b/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p2/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
+,Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
 MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0,7000,0.062,30
 CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0,5000,0.062,30
 ME,z3,,,,,,,,,,,,,,,
diff --git a/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p3/Network.csv b/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p3/Network.csv
index a6af5746e1..e233912403 100644
--- a/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p3/Network.csv
+++ b/Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/Inputs_p3/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
+,Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1,Line_Max_Flow_Possible_MW,WACC,Capital_Recovery_Period
 MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0,7000,0.062,30
 CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0,5000,0.062,30
 ME,z3,,,,,,,,,,,,,,,
diff --git a/Example_Systems/SmallNewEngland/ThreeZones_Slack_Variables_Example/Network.csv b/Example_Systems/SmallNewEngland/ThreeZones_Slack_Variables_Example/Network.csv
index 63bebe68b1..c6413479ff 100644
--- a/Example_Systems/SmallNewEngland/ThreeZones_Slack_Variables_Example/Network.csv
+++ b/Example_Systems/SmallNewEngland/ThreeZones_Slack_Variables_Example/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
+,Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
 MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0
 CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0
 ME,z3,,,,,,,,,,,,
diff --git a/Example_Systems/VREStor_Example/Network.csv b/Example_Systems/VREStor_Example/Network.csv
index 9f0dfee2c7..1a7000a3b6 100644
--- a/Example_Systems/VREStor_Example/Network.csv
+++ b/Example_Systems/VREStor_Example/Network.csv
@@ -1,4 +1,4 @@
-Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,Line_Min_Flow_MW,transmission_path_name,Line_Reinforcement_Cost_per_MWyr,Line_Reinforcement_Cost_per_MW,Line_Loss_Percentage,Line_Max_Reinforcement_MW,DerateCapRes_1,CapRes_Excl_1,DerateCapRes_2,CapRes_Excl_2,DerateCapRes_3,CapRes_Excl_3
+Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,Line_Min_Flow_MW,transmission_path_name,Line_Reinforcement_Cost_per_MWyr,Line_Reinforcement_Cost_per_MW,Line_Loss_Percentage,Line_Max_Reinforcement_MW,DerateCapRes_1,CapRes_Excl_1,DerateCapRes_2,CapRes_Excl_2,DerateCapRes_3,CapRes_Excl_3
 z1,1.0,1,2,820.0,820.0,EIC_to_TRE,45958.0,948772.0,0.0649,410.0,0.95,0.0,0.95,0.0,0.95,0.0
 z2,2.0,1,3,1830.0,1830.0,EIC_to_WECC,71600.0,1478140.0,0.1001,915.0,0.95,0.0,0.95,0.0,0.95,0.0
 z3,,,,,,,,,,,,,,,,
diff --git a/src/load_inputs/load_network_data.jl b/src/load_inputs/load_network_data.jl
index c3f2b8a306..dc3acfbea3 100644
--- a/src/load_inputs/load_network_data.jl
+++ b/src/load_inputs/load_network_data.jl
@@ -90,7 +90,7 @@ end
 
 Loads the network map from a list-style interface
 ```
-..., Network_Lines, Start_Node, End_Node, ...
+..., Network_Lines, Start_Zone, End_Zone, ...
                  1,           1,       2,
                  2,           1,       3,
 ```
@@ -98,11 +98,11 @@ Loads the network map from a list-style interface
 function load_network_map_from_list(network_var::DataFrame, Z, L, list_columns)
     start_col, end_col = list_columns
     mat = zeros(L, Z)
-    start_nodes = collect(skipmissing(network_var[!, start_col]))
-    end_nodes = collect(skipmissing(network_var[!, end_col]))
+    start_zones = collect(skipmissing(network_var[!, start_col]))
+    end_zones = collect(skipmissing(network_var[!, end_col]))
     for l in 1:L
-        mat[l, start_nodes[l]] = 1
-        mat[l, end_nodes[l]] = -1
+        mat[l, start_zones[l]] = 1
+        mat[l, end_zones[l]] = -1
     end
     mat
 end
@@ -117,7 +117,7 @@ Loads the network map from a matrix-style interface
                  2,  1,  0, -1,
 ```
 This is equivalent to the list-style interface where the zone zN with entry +1 is the
-starting node of the line and the zone with entry -1 is the ending node of the line.
+starting zone of the line and the zone with entry -1 is the ending zone of the line.
 """
 function load_network_map_from_matrix(network_var::DataFrame, Z, L)
     # Topology of the network source-sink matrix
@@ -129,14 +129,14 @@ end
 function load_network_map(network_var::DataFrame, Z, L)
     columns = names(network_var)
 
-    list_columns = ["Start_Node", "End_Node"]
+    list_columns = ["Start_Zone", "End_Zone"]
     has_network_list = all([c in columns for c in list_columns])
 
     zones_as_strings = ["z" * string(i) for i in 1:Z]
     has_network_matrix =  all([c in columns for c in zones_as_strings])
 
     instructions = """The transmission network should be specified in the form of a matrix
-           (with columns z1, z2, ... zN) or in the form of lists (with Start_Node, End_Node),
+           (with columns z1, z2, ... zN) or in the form of lists (with Start_Zone, End_Zone),
            but not both. See the documentation for examples."""
 
     if has_network_list && has_network_matrix
@@ -154,7 +154,7 @@ function network_map_matrix_format_deprecation_warning()
 		@warn """Specifying the network map as a matrix is deprecated as of v0.4
 and will be removed in v0.5. Instead, use the more compact list-style format.
 
-..., Network_Lines, Start_Node, End_Node, ...
+..., Network_Lines, Start_Zone, End_Zone, ...
                  1,          1,        2,
                  2,          1,        3,
                  3,          2,        3,
diff --git a/test/ThreeZones/Network.csv b/test/ThreeZones/Network.csv
index 63bebe68b1..c6413479ff 100644
--- a/test/ThreeZones/Network.csv
+++ b/test/ThreeZones/Network.csv
@@ -1,4 +1,4 @@
-,Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
+,Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,transmission_path_name,distance_mile,Line_Loss_Percentage,Line_Max_Reinforcement_MW,Line_Reinforcement_Cost_per_MWyr,DerateCapRes_1,CapRes_1,CapRes_Excl_1
 MA,z1,1,1,2,2950,MA_to_CT,123.0584,0.012305837,2950,12060,0.95,0,0
 CT,z2,2,1,3,2000,MA_to_ME,196.5385,0.019653847,2000,19261,0.95,0,0
 ME,z3,,,,,,,,,,,,
diff --git a/test/VREStor/Network.csv b/test/VREStor/Network.csv
index 9f0dfee2c7..1a7000a3b6 100644
--- a/test/VREStor/Network.csv
+++ b/test/VREStor/Network.csv
@@ -1,4 +1,4 @@
-Network_zones,Network_Lines,Start_Node,End_Node,Line_Max_Flow_MW,Line_Min_Flow_MW,transmission_path_name,Line_Reinforcement_Cost_per_MWyr,Line_Reinforcement_Cost_per_MW,Line_Loss_Percentage,Line_Max_Reinforcement_MW,DerateCapRes_1,CapRes_Excl_1,DerateCapRes_2,CapRes_Excl_2,DerateCapRes_3,CapRes_Excl_3
+Network_zones,Network_Lines,Start_Zone,End_Zone,Line_Max_Flow_MW,Line_Min_Flow_MW,transmission_path_name,Line_Reinforcement_Cost_per_MWyr,Line_Reinforcement_Cost_per_MW,Line_Loss_Percentage,Line_Max_Reinforcement_MW,DerateCapRes_1,CapRes_Excl_1,DerateCapRes_2,CapRes_Excl_2,DerateCapRes_3,CapRes_Excl_3
 z1,1.0,1,2,820.0,820.0,EIC_to_TRE,45958.0,948772.0,0.0649,410.0,0.95,0.0,0.95,0.0,0.95,0.0
 z2,2.0,1,3,1830.0,1830.0,EIC_to_WECC,71600.0,1478140.0,0.1001,915.0,0.95,0.0,0.95,0.0,0.95,0.0
 z3,,,,,,,,,,,,,,,,

From 390b98b9630de1a6f7df07d965fe942c29f41a38 Mon Sep 17 00:00:00 2001
From: Jacob Schwartz <jacob@jaschwartz.net>
Date: Mon, 4 Dec 2023 10:07:25 -0500
Subject: [PATCH 9/9] Change docs back to 'zone'

---
 docs/src/data_documentation.md | 10 +++++-----
 docs/src/model_notation.md     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/src/data_documentation.md b/docs/src/data_documentation.md
index 5b67dd15b4..5505831700 100644
--- a/docs/src/data_documentation.md
+++ b/docs/src/data_documentation.md
@@ -188,7 +188,7 @@ This input file contains input parameters related to: 1) definition of model zon
 |**Settings-specific Columns**|
 |**Multiple zone model**||
 |Network\_Lines | Numerical index for each network line. The length of this column is counted but the actual values are not used.|
-| z* (Network map) **OR** Start_Node, End_Node | See below |
+| z* (Network map) **OR** Start_Zone, End_Zone | See below |
 |Line\_Max\_Flow\_MW | Existing capacity of the inter-regional transmission line.|
 |**NetworkExpansion = 1**||
 |Line\_Max\_Reinforcement\_MW |Maximum allowable capacity addition to the existing transmission line.|
@@ -211,10 +211,10 @@ This input file contains input parameters related to: 1) definition of model zon
 There are two interfaces implemented for specifying the network topology itself: a matrix interface and a list interface.
 Only one choice is permitted in a given file.
 
-The list interface consists of a column for the lines start node and one for the line's end node.
+The list interface consists of a column for the lines start zone and one for the line's end zone.
 Here is a snippet of the Network.csv file for a map with three zones and two lines:
 ```
-Network_Lines, Start_Node, End_Node,
+Network_Lines, Start_Zone, End_Zone,
             1,          1,        2,
             2,          1,        3,
 ```
@@ -229,8 +229,8 @@ Network_Lines, z1, z2, z3,
             2,  1,  0, -1,
 ```
 
-Note that in either case, positive flows indicate flow from start to end node;
-negative flows indicate flow from end to start node.
+Note that in either case, positive flows indicate flow from start to end zone;
+negative flows indicate flow from end to start zone.
 
 
 #### 2.1.3 Demand\_data.csv (Load\_data.csv)
diff --git a/docs/src/model_notation.md b/docs/src/model_notation.md
index a5283eda67..aa8d39df27 100644
--- a/docs/src/model_notation.md
+++ b/docs/src/model_notation.md
@@ -238,7 +238,7 @@ $\mathcal{W} \subseteq \mathcal{G}$ | where $\mathcal{W}$ set of hydroelectric g
 |$\rho_{y,z,t}^{max,pv}$ | Maximum available generation per unit of installed capacity for the solar PV component of a co-located VRE and storage resource during time step t for technology y in zone z [%]|
 |$\rho_{y,z,t}^{max,wind}$ | Maximum available generation per unit of installed capacity for the wind component of a co-located VRE and storage resource during time step t for technology y in zone z [%]|
 |$VREIndex_{y,z}$ | Resource bin index for VRE technology $y$ in zone $z$. $VREIndex_{y,z}=1$ for the first bin, and $VREIndex_{y,z}=0$ for remaining bins. Only defined for $y\in \mathcal{VRE}$ |
-|$\varphi^{map}_{l,z}$ | Topology of the network, for line l: $\varphi^{map}_{l,z}=1$ for start node $z$, - 1 for end node $z$, 0 otherwise. |
+|$\varphi^{map}_{l,z}$ | Topology of the network, for line l: $\varphi^{map}_{l,z}=1$ for start zone $z$, - 1 for end zone $z$, 0 otherwise. |
 |$\eta_{y,z}^{loss}$ | Self discharge rate per time step per unit of installed capacity for storage technology $y$ in zone $z$ [%]|
 |$\eta_{y,z}^{charge}$ | Single-trip efficiency of storage charging/demand deferral for technology $y$ in zone $z$ [%]|
 |$\eta_{y,z}^{discharge}$ | Single-trip efficiency of storage (and hydro reservoir) discharging/demand satisfaction for technology $y$ in zone $z$ [%]|