diff --git a/projects/year_2020/Year 2015 Modify HOV Lanes and USE on CA-237 EB US 101 to North 1st Street_v2.yml b/projects/year_2020/year_2020_managed_lane_ca237e_us101_to_north_1st_street.yml
similarity index 93%
rename from projects/year_2020/Year 2015 Modify HOV Lanes and USE on CA-237 EB US 101 to North 1st Street_v2.yml
rename to projects/year_2020/year_2020_managed_lane_ca237e_us101_to_north_1st_street.yml
index 6de7b94..efb3704 100644
--- a/projects/year_2020/Year 2015 Modify HOV Lanes and USE on CA-237 EB US 101 to North 1st Street_v2.yml	
+++ b/projects/year_2020/year_2020_managed_lane_ca237e_us101_to_north_1st_street.yml
@@ -1,6 +1,6 @@
-project: Year 2015 Modify HOV Lanes and USE on CA-237 EB US 101 to North 1st Street_v2
+project: Year 2020 Modify HOV Lanes and USE on CA-237 EB US 101 to North 1st Street
 tags:
-- Year 2015
+- Year 2020
 - Managed Lanes
 - HOV Lanes
 dependencies: ''
diff --git a/projects/year_2020/Year 2015 Modify HOV Lanes and USE on CA-237 WB North 1st Street to US 101_v2.yml b/projects/year_2020/year_2020_managed_lane_ca237w_north_1st_street_to_us101.yml
similarity index 92%
rename from projects/year_2020/Year 2015 Modify HOV Lanes and USE on CA-237 WB North 1st Street to US 101_v2.yml
rename to projects/year_2020/year_2020_managed_lane_ca237w_north_1st_street_to_us101.yml
index f6abce5..6f25b19 100644
--- a/projects/year_2020/Year 2015 Modify HOV Lanes and USE on CA-237 WB North 1st Street to US 101_v2.yml	
+++ b/projects/year_2020/year_2020_managed_lane_ca237w_north_1st_street_to_us101.yml
@@ -1,6 +1,6 @@
-project: Year 2015 Modify HOV Lanes and USE on CA-237 WB North 1st Street to US 101_v2
+project: Year 2020 Modify HOV Lanes and USE on CA-237 WB North 1st Street to US 101
 tags:
-- Year 2015
+- Year 2020
 - Managed Lanes
 - HOV Lanes
 dependencies: ''
diff --git a/projects/year_2020/Year 2015 Modify Express Lanes and USE on I-580 EB (segment 02) Hacienda Drive to Airway Blvd_v2.yml b/projects/year_2020/year_2020_managed_lane_i580e_segment_02_hacienda_drive_to_airway_blvd.yml
similarity index 92%
rename from projects/year_2020/Year 2015 Modify Express Lanes and USE on I-580 EB (segment 02) Hacienda Drive to Airway Blvd_v2.yml
rename to projects/year_2020/year_2020_managed_lane_i580e_segment_02_hacienda_drive_to_airway_blvd.yml
index 4b48740..cd50123 100644
--- a/projects/year_2020/Year 2015 Modify Express Lanes and USE on I-580 EB (segment 02) Hacienda Drive to Airway Blvd_v2.yml	
+++ b/projects/year_2020/year_2020_managed_lane_i580e_segment_02_hacienda_drive_to_airway_blvd.yml
@@ -1,6 +1,7 @@
-project: Year 2015 Modify Express Lanes and USE on I-580 EB (segment 02) Hacienda Drive to Airway Blvd_v2
+project: Year 2020 Modify Express Lanes and USE on I-580 EB (segment 02) Hacienda
+  Drive to Airway Blvd
 tags:
-- Year 2015
+- Year 2020
 - Managed Lanes Review
 - Express Lanes
 - toll review
diff --git a/projects/year_2020/Year 2015 Modify HOV Lanes and USE on I-680 NB from Alcosta Blvd to Livorna Road_v2.yml b/projects/year_2020/year_2020_managed_lane_i680n_alcosta_blvd_to_livorna_road.yml
similarity index 96%
rename from projects/year_2020/Year 2015 Modify HOV Lanes and USE on I-680 NB from Alcosta Blvd to Livorna Road_v2.yml
rename to projects/year_2020/year_2020_managed_lane_i680n_alcosta_blvd_to_livorna_road.yml
index 3fbe943..475aefe 100644
--- a/projects/year_2020/Year 2015 Modify HOV Lanes and USE on I-680 NB from Alcosta Blvd to Livorna Road_v2.yml	
+++ b/projects/year_2020/year_2020_managed_lane_i680n_alcosta_blvd_to_livorna_road.yml
@@ -1,6 +1,6 @@
-project: Year 2015 Modify HOV Lanes and USE on I-680 NB from Alcosta Blvd to Livorna Road_v2
+project: Year 2020 Modify HOV Lanes and USE on I-680 NB from Alcosta Blvd to Livorna Road_v2
 tags:
-- Year 2015
+- Year 2020
 - Managed Lanes
 - HOV Lanes
 dependencies: ''
diff --git a/projects/year_2020/year_2015_managed_lane_i680n_ca_242_to_benicia_bridge.yml b/projects/year_2020/year_2020_managed_lane_i680n_ca_242_to_benicia_bridge.yml
similarity index 94%
rename from projects/year_2020/year_2015_managed_lane_i680n_ca_242_to_benicia_bridge.yml
rename to projects/year_2020/year_2020_managed_lane_i680n_ca_242_to_benicia_bridge.yml
index 039ce6d..1b9d056 100644
--- a/projects/year_2020/year_2015_managed_lane_i680n_ca_242_to_benicia_bridge.yml
+++ b/projects/year_2020/year_2020_managed_lane_i680n_ca_242_to_benicia_bridge.yml
@@ -1,6 +1,6 @@
-project: Year 2015 Modify HOV Lanes USE on I-680 NB CA-242 to Benicia Bridge
+project: Year 2020 Modify HOV Lanes USE on I-680 NB CA-242 to Benicia Bridge
 tags:
-- Year 2015
+- Year 2020
 - Managed Lanes
 - HOV Lanes
 dependencies: ''
diff --git a/projects/year_2020/Year 2015 Modify HOV Lanes and USE on I-680 SB from Benicia Bridge to Alcosta Blvd_v2.yml b/projects/year_2020/year_2020_managed_lane_i680s_benicia_bridge_to_alcosta_blvd.yml
similarity index 69%
rename from projects/year_2020/Year 2015 Modify HOV Lanes and USE on I-680 SB from Benicia Bridge to Alcosta Blvd_v2.yml
rename to projects/year_2020/year_2020_managed_lane_i680s_benicia_bridge_to_alcosta_blvd.yml
index d374e3f..6526ead 100644
--- a/projects/year_2020/Year 2015 Modify HOV Lanes and USE on I-680 SB from Benicia Bridge to Alcosta Blvd_v2.yml	
+++ b/projects/year_2020/year_2020_managed_lane_i680s_benicia_bridge_to_alcosta_blvd.yml
@@ -1,6 +1,6 @@
-project: Year 2015 Modify HOV Lanes and USE on I-680 SB from Benicia Bridge to Alcosta Blvd_v2
+project: Year 2020 Modify HOV Lanes and USE on I-680 SB from Benicia Bridge to Alcosta Blvd_v2
 tags:
-- Year 2015
+- Year 2020
 - Managed Lanes
 - HOV Lanes
 dependencies: ''
@@ -150,83 +150,85 @@ changes:
       - '19:00'
       set: 4
   - property: ML_access
-    set: 
-    - 3004224
-    - 2509649
-    - 3010135
-    - 3016470
-    - 3025099
-    - 3000614
-    - 3032642
-    - 3033216
-    - 3033231
-    - 3036717
-    - 3038482
-    - 3038607
-    - 3042180
-    - 3045454
-    - 3046827
-    - 3048345
-    - 3024246
-    - 3032602
-    - 3050723
-    - 3011597
-    - 3035041
-    - 3060899
-    - 3025184
-    - 3062365
-    - 3065235
-    - 3030043
-    - 3029631
-    - 3069148
-    - 3071038
-    - 3071646
-    - 3073572
-    - 3074065
-    - 3075186
-    - 3077367
-    - 3077886
-    - 3078507
-    - 3080048
-    - 3023903
+    set: all
+    # comment out and set as full access/egress to match TM1.5
+    # - 3004224
+    # - 2509649
+    # - 3010135
+    # - 3016470
+    # - 3025099
+    # - 3000614
+    # - 3032642
+    # - 3033216
+    # - 3033231
+    # - 3036717
+    # - 3038482
+    # - 3038607
+    # - 3042180
+    # - 3045454
+    # - 3046827
+    # - 3048345
+    # - 3024246
+    # - 3032602
+    # - 3050723
+    # - 3011597
+    # - 3035041
+    # - 3060899
+    # - 3025184
+    # - 3062365
+    # - 3065235
+    # - 3030043
+    # - 3029631
+    # - 3069148
+    # - 3071038
+    # - 3071646
+    # - 3073572
+    # - 3074065
+    # - 3075186
+    # - 3077367
+    # - 3077886
+    # - 3078507
+    # - 3080048
+    # - 3023903
   - property: ML_egress
-    set: 
-    - 3069148
-    - 2557598
-    - 3000614
-    - 3042180
-    - 3029631
-    - 3062365
-    - 3032642
-    - 3004224
-    - 3024246
-    - 3045454
-    - 3038482
-    - 3050723
-    - 3071355
-    - 3046827
-    - 3077886
-    - 3036717
-    - 3078507
-    - 3060899
-    - 3080048
-    - 3075186
-    - 2509649
-    - 3033216
-    - 3048345
-    - 3065235
-    - 3033231
-    - 3035041
-    - 3038607
-    - 3077330
-    - 3073572
-    - 3010135
-    - 3011597
-    - 3023903
-    - 3071646
-    - 3030043
-    - 3032602
-    - 3071038
-    - 3077367
-    - 3025099
-    - 3074065
+    set: all
+    # comment out and set as full access/egress to match TM1.5
+    # - 3069148
+    # - 2557598
+    # - 3000614
+    # - 3042180
+    # - 3029631
+    # - 3062365
+    # - 3032642
+    # - 3004224
+    # - 3024246
+    # - 3045454
+    # - 3038482
+    # - 3050723
+    # - 3071355
+    # - 3046827
+    # - 3077886
+    # - 3036717
+    # - 3078507
+    # - 3060899
+    # - 3080048
+    # - 3075186
+    # - 2509649
+    # - 3033216
+    # - 3048345
+    # - 3065235
+    # - 3033231
+    # - 3035041
+    # - 3038607
+    # - 3077330
+    # - 3073572
+    # - 3010135
+    # - 3011597
+    # - 3023903
+    # - 3071646
+    # - 3030043
+    # - 3032602
+    # - 3071038
+    # - 3077367
+    # - 3025099
+    # - 3074065