Update regression tests with new name syntax

"Water Heater Ambient Temp Schedule - 71.6 Default" -> " Water Heater Ambient Temp Schedule 71.6F Default" also, update necb qaqc report expected results
NREL · Jul 23, 2024 · 02bd18e · 02bd18e
1 parent d8c7bf5
commit 02bd18e
Show file tree

Hide file tree

Showing 64 changed files with 173 additions and 173 deletions.
diff --git a/lib/openstudio-standards/prototypes/common/objects/Prototype.ServiceWaterHeating.rb b/lib/openstudio-standards/prototypes/common/objects/Prototype.ServiceWaterHeating.rb
@@ -396,7 +396,7 @@ def model_add_heatpump_water_heater(model,
       # assume the water heater is indoors at 70F for now
       default_water_heater_ambient_temp_sch = OpenstudioStandards::Schedules.create_constant_schedule_ruleset(model,
                                                                                                               OpenStudio.convert(70.0, 'F', 'C').get,
-                                                                                                              name: 'Water Heater Ambient Temp Schedule - 70F',
+                                                                                                              name: 'Water Heater Ambient Temp Schedule 70F',
                                                                                                               schedule_type_limit: 'Temperature')
       if temp_sch_type_limits.nil?
         temp_sch_type_limits = OpenstudioStandards::Schedules.create_schedule_type_limits(model,

diff --git a/lib/openstudio-standards/service_water_heating/component.rb b/lib/openstudio-standards/service_water_heating/component.rb
@@ -144,7 +144,7 @@ def self.model_add_water_heater(model,
         indoor_temp_c = OpenStudio.convert(indoor_temp_f, 'F', 'C').get
         default_water_heater_ambient_temp_sch = OpenstudioStandards::Schedules.create_constant_schedule_ruleset(model,
                                                                                                                 indoor_temp_c,
-                                                                                                                name: "Water Heater Ambient Temp Schedule - #{indoor_temp_f} F",
+                                                                                                                name: "Water Heater Ambient Temp Schedule #{indoor_temp_f}F",
                                                                                                                 schedule_type_limit: 'Temperature')
         default_water_heater_ambient_temp_sch.setScheduleTypeLimits(temp_sch_type_limits)
         water_heater.setAmbientTemperatureIndicator('Schedule')

diff --git a/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/NorthernEducation.osm b/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/NorthernEducation.osm
@@ -44366,15 +44366,15 @@ OS:Connection,
 
 OS:Schedule:Ruleset,
   {9d5b666a-4e1e-46b3-9d97-8c5c37fc3b63}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name
   {74f82300-3fbb-4409-b504-cf26bb955cdb}, !- Default Day Schedule Name
   {756b8134-4003-4632-9ddb-72e4c2c884b6}, !- Summer Design Day Schedule Name
   {1016e14d-d134-44b4-8243-fef610fe7c9c}; !- Winter Design Day Schedule Name
 
 OS:Schedule:Day,
   {74f82300-3fbb-4409-b504-cf26bb955cdb}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F_Default, !- Name
+  Water Heater Ambient Temp Schedule 70F_Default, !- Name
   {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1
@@ -44383,7 +44383,7 @@ OS:Schedule:Day,
 
 OS:Schedule:Day,
   {756b8134-4003-4632-9ddb-72e4c2c884b6}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F_Summer_Design_Day, !- Name
+  Water Heater Ambient Temp Schedule 70F_Summer_Design_Day, !- Name
   {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1
@@ -44392,7 +44392,7 @@ OS:Schedule:Day,
 
 OS:Schedule:Day,
   {1016e14d-d134-44b4-8243-fef610fe7c9c}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F_Winter_Design_Day, !- Name
+  Water Heater Ambient Temp Schedule 70F_Winter_Design_Day, !- Name
   {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1

diff --git a/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/NorthernHealthCare.osm b/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/NorthernHealthCare.osm
@@ -48651,15 +48651,15 @@ OS:Connection,
 
 OS:Schedule:Ruleset,
   {4f677daa-59d2-49b5-aa1a-6dd83e0b19bd}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name
   {d34869e3-d524-49a8-be02-404ef50ddebd}, !- Default Day Schedule Name
   {1b0aa04d-8083-4db1-b00e-25f523c27ed6}, !- Summer Design Day Schedule Name
   {96989d3c-9a1f-45e2-aa14-e96ed361f0b5}; !- Winter Design Day Schedule Name
 
 OS:Schedule:Day,
   {d34869e3-d524-49a8-be02-404ef50ddebd}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F_Default, !- Name
+  Water Heater Ambient Temp Schedule 70F_Default, !- Name
   {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1
@@ -48668,7 +48668,7 @@ OS:Schedule:Day,
 
 OS:Schedule:Day,
   {1b0aa04d-8083-4db1-b00e-25f523c27ed6}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F_Summer_Design_Day, !- Name
+  Water Heater Ambient Temp Schedule 70F_Summer_Design_Day, !- Name
   {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1
@@ -48677,7 +48677,7 @@ OS:Schedule:Day,
 
 OS:Schedule:Day,
   {96989d3c-9a1f-45e2-aa14-e96ed361f0b5}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F_Winter_Design_Day, !- Name
+  Water Heater Ambient Temp Schedule 70F_Winter_Design_Day, !- Name
   {85e3f998-9b04-469c-b1ae-993d46032970}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1

diff --git a/lib/openstudio-standards/standards/necb/common/construction_defaults.osm b/lib/openstudio-standards/standards/necb/common/construction_defaults.osm
@@ -1928,13 +1928,13 @@ OS:Schedule:Day,
 
 OS:Schedule:Ruleset,
   {402721ef-5979-4bdf-8041-e590c3fe0060}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {7b49cd38-34d6-4fe8-8f95-f7546eac6e94}, !- Schedule Type Limits Name
   {5d1da6bc-bb9e-4fd7-930d-a079c77f9584}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {5d1da6bc-bb9e-4fd7-930d-a079c77f9584}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default, !- Name
+  Water Heater Ambient Temp Schedule 70F Default, !- Name
   {7b49cd38-34d6-4fe8-8f95-f7546eac6e94}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1

diff --git a/test/90_1_prm/models/MidRiseApt_2010_5A.osm b/test/90_1_prm/models/MidRiseApt_2010_5A.osm
@@ -25516,13 +25516,13 @@ OS:Schedule:Day,
 
 OS:Schedule:Ruleset,
   {b3701f32-28f1-4a69-8704-7d7d3f8dbfe8}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {e73bbd84-0a04-44b7-ab23-e6b6e1d44b6b}, !- Schedule Type Limits Name
   {84ffc99d-68e2-46c5-af9f-854c2e411c66}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {84ffc99d-68e2-46c5-af9f-854c2e411c66}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default, !- Name
+  Water Heater Ambient Temp Schedule 70F Default, !- Name
   {e73bbd84-0a04-44b7-ab23-e6b6e1d44b6b}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1

diff --git a/test/90_1_prm/models/SecondarySchool-DOE Ref Pre-1980-ASHRAE 169-2006-2A.osm b/test/90_1_prm/models/SecondarySchool-DOE Ref Pre-1980-ASHRAE 169-2006-2A.osm
@@ -30944,13 +30944,13 @@ OS:Schedule:Day,
 
 OS:Schedule:Ruleset,
   {9734297c-4b42-4c03-8a6e-74d3cb24a131}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {2c1748a8-4314-4beb-bf13-d10dfb07abec}, !- Schedule Type Limits Name
   {789e97a7-f832-4be2-84ae-d1fd2490e2f1}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {789e97a7-f832-4be2-84ae-d1fd2490e2f1}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default, !- Name
+  Water Heater Ambient Temp Schedule 70F Default, !- Name
   {2c1748a8-4314-4beb-bf13-d10dfb07abec}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1

diff --git a/test/deer_prototype/models/ecc_test.osm b/test/deer_prototype/models/ecc_test.osm
@@ -29065,13 +29065,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {796f3498-7ebe-42ac-8960-eae89fa70e3a}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {083c8dcc-f29c-4a3e-932c-3f99636c132c}, !- Schedule Type Limits Name
   {d21bc2f4-d070-45bb-a9d3-1154015bc9ca}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {d21bc2f4-d070-45bb-a9d3-1154015bc9ca}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default, !- Name
+  Water Heater Ambient Temp Schedule 70F Default, !- Name
   {083c8dcc-f29c-4a3e-932c-3f99636c132c}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1
@@ -29698,13 +29698,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {b3d81da1-fb2c-461b-9edd-34023df91f6a}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F 1, !- Name
+  Water Heater Ambient Temp Schedule 70F 1, !- Name
   {4e72bbce-6c60-4bae-8307-1027756816c9}, !- Schedule Type Limits Name
   {c2a068ed-0d16-4595-990b-164086a648b6}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {c2a068ed-0d16-4595-990b-164086a648b6}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default 1, !- Name
+  Water Heater Ambient Temp Schedule 70F Default 1, !- Name
   {4e72bbce-6c60-4bae-8307-1027756816c9}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1

diff --git a/test/deer_prototype/models/epr_test.osm b/test/deer_prototype/models/epr_test.osm
@@ -17204,13 +17204,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {c684f42c-2e14-4a64-960c-1655a1ccf06c}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {d1caf49c-42e9-4a74-966b-aa691b811dc2}, !- Schedule Type Limits Name
   {259c0569-8970-438f-9194-bb46252baf2f}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {259c0569-8970-438f-9194-bb46252baf2f}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default, !- Name
+  Water Heater Ambient Temp Schedule 70F Default, !- Name
   {d1caf49c-42e9-4a74-966b-aa691b811dc2}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1
@@ -17837,13 +17837,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {b5a17409-5fc1-4d9d-96d8-fc6a32c1d03f}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F 1, !- Name
+  Water Heater Ambient Temp Schedule 70F 1, !- Name
   {e6dd6281-356b-4cec-8dac-c02c21a6261b}, !- Schedule Type Limits Name
   {603a7c4e-e016-4660-badf-b702ba5f8606}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {603a7c4e-e016-4660-badf-b702ba5f8606}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default 1, !- Name
+  Water Heater Ambient Temp Schedule 70F Default 1, !- Name
   {e6dd6281-356b-4cec-8dac-c02c21a6261b}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1

diff --git a/test/deer_prototype/models/ese_test.osm b/test/deer_prototype/models/ese_test.osm
@@ -27087,13 +27087,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {41e5b44f-956a-46bf-9499-eb0a0d85e9fa}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {2665e144-e086-4a1f-9ff2-07b6ff3bc5ad}, !- Schedule Type Limits Name
   {bb0b7e76-dec1-4151-b4fd-8361b17aa1dd}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {bb0b7e76-dec1-4151-b4fd-8361b17aa1dd}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default, !- Name
+  Water Heater Ambient Temp Schedule 70F Default, !- Name
   {2665e144-e086-4a1f-9ff2-07b6ff3bc5ad}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1
@@ -27720,13 +27720,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {66a4cb5d-6b70-4ebe-b01d-12eaba2b6427}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F 1, !- Name
+  Water Heater Ambient Temp Schedule 70F 1, !- Name
   {c9149fd7-4442-4bd7-9f2a-f61e579cdcc9}, !- Schedule Type Limits Name
   {a1fbe7c3-c48b-465f-9f25-a0eda9eb416f}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {a1fbe7c3-c48b-465f-9f25-a0eda9eb416f}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default 1, !- Name
+  Water Heater Ambient Temp Schedule 70F Default 1, !- Name
   {c9149fd7-4442-4bd7-9f2a-f61e579cdcc9}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1

diff --git a/test/deer_prototype/models/eun_test.osm b/test/deer_prototype/models/eun_test.osm
@@ -35964,13 +35964,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {fd69d02c-d913-47c4-a331-3c7c154d75ea}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {c49d49cd-6e0a-465b-ae97-98c637d33c21}, !- Schedule Type Limits Name
   {7e7bd4ca-6225-49ff-880b-d9c2ef54021f}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {7e7bd4ca-6225-49ff-880b-d9c2ef54021f}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default, !- Name
+  Water Heater Ambient Temp Schedule 70F Default, !- Name
   {c49d49cd-6e0a-465b-ae97-98c637d33c21}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1
@@ -36597,13 +36597,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {a41113f0-f8cd-4665-8d87-4124a83dbdda}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F 1, !- Name
+  Water Heater Ambient Temp Schedule 70F 1, !- Name
   {2f7a481f-a056-4aad-933a-a11907dc4236}, !- Schedule Type Limits Name
   {f0d52eaf-084b-4650-9f95-e6983ba97692}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {f0d52eaf-084b-4650-9f95-e6983ba97692}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default 1, !- Name
+  Water Heater Ambient Temp Schedule 70F Default 1, !- Name
   {2f7a481f-a056-4aad-933a-a11907dc4236}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1
@@ -37335,13 +37335,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {4e012543-98ce-4d13-8a9a-cda6056bdabf}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F 2, !- Name
+  Water Heater Ambient Temp Schedule 70F 2, !- Name
   {6af03a07-1898-4360-ab64-0b2ea06920e5}, !- Schedule Type Limits Name
   {b5783e61-9fa4-4fd7-b34f-5e034a56d1bb}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {b5783e61-9fa4-4fd7-b34f-5e034a56d1bb}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default 2, !- Name
+  Water Heater Ambient Temp Schedule 70F Default 2, !- Name
   {6af03a07-1898-4360-ab64-0b2ea06920e5}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1

diff --git a/test/deer_prototype/models/hsp_test.osm b/test/deer_prototype/models/hsp_test.osm
@@ -19161,13 +19161,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {acae2e06-641a-40e2-b31f-2692543d026d}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {3106d09b-761f-4a45-8ba6-95302e8eedf7}, !- Schedule Type Limits Name
   {f686b43b-6cc5-4a89-8e23-7b24df7a38f8}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {f686b43b-6cc5-4a89-8e23-7b24df7a38f8}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default, !- Name
+  Water Heater Ambient Temp Schedule 70F Default, !- Name
   {3106d09b-761f-4a45-8ba6-95302e8eedf7}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1
@@ -19794,13 +19794,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {a9e3bbd8-47b2-45dd-82cc-f31316313b92}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F 1, !- Name
+  Water Heater Ambient Temp Schedule 70F 1, !- Name
   {bbc82270-1631-4ba6-89a2-e36f654be89f}, !- Schedule Type Limits Name
   {a7798739-ea0e-48e4-9474-e0c0dfd2dae7}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {a7798739-ea0e-48e4-9474-e0c0dfd2dae7}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default 1, !- Name
+  Water Heater Ambient Temp Schedule 70F Default 1, !- Name
   {bbc82270-1631-4ba6-89a2-e36f654be89f}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1

diff --git a/test/deer_prototype/models/htl_test.osm b/test/deer_prototype/models/htl_test.osm
@@ -29879,13 +29879,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {642583d6-d852-4914-9383-50e704bfec23}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {49eaace2-4351-473c-a9be-60df9e08ff69}, !- Schedule Type Limits Name
   {f46b1019-a8b4-4532-861d-a227aa922799}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {f46b1019-a8b4-4532-861d-a227aa922799}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default, !- Name
+  Water Heater Ambient Temp Schedule 70F Default, !- Name
   {49eaace2-4351-473c-a9be-60df9e08ff69}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1
@@ -30512,13 +30512,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {8f8d5065-356d-49d8-8668-11b320c1e570}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F 1, !- Name
+  Water Heater Ambient Temp Schedule 70F 1, !- Name
   {570d5c31-f9cd-4206-ba3f-962132d598e2}, !- Schedule Type Limits Name
   {a912c77f-ecfc-460a-a936-cc742ca2f9a5}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {a912c77f-ecfc-460a-a936-cc742ca2f9a5}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default 1, !- Name
+  Water Heater Ambient Temp Schedule 70F Default 1, !- Name
   {570d5c31-f9cd-4206-ba3f-962132d598e2}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1
@@ -31250,13 +31250,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {5cd76845-7399-4d23-add4-cadbd034c86e}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F 2, !- Name
+  Water Heater Ambient Temp Schedule 70F 2, !- Name
   {d524afc0-4c55-4e17-8b79-c375431d2c96}, !- Schedule Type Limits Name
   {88b205b4-2970-4973-9333-9b91d5b5400e}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {88b205b4-2970-4973-9333-9b91d5b5400e}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default 2, !- Name
+  Water Heater Ambient Temp Schedule 70F Default 2, !- Name
   {d524afc0-4c55-4e17-8b79-c375431d2c96}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1

diff --git a/test/deer_prototype/models/mfm_test.osm b/test/deer_prototype/models/mfm_test.osm
@@ -13358,13 +13358,13 @@ OS:AdditionalProperties,
 
 OS:Schedule:Ruleset,
   {aec6080c-36a5-4862-9a9c-3a51ac2f9705}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {b71af9dc-2b3e-481a-a630-2c2f0d7b6815}, !- Schedule Type Limits Name
   {de971b16-396b-4c27-8782-1a883b56bdc7}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {de971b16-396b-4c27-8782-1a883b56bdc7}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default, !- Name
+  Water Heater Ambient Temp Schedule 70F Default, !- Name
   {b71af9dc-2b3e-481a-a630-2c2f0d7b6815}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1

diff --git a/test/deer_prototype/models/mtl_test.osm b/test/deer_prototype/models/mtl_test.osm
@@ -11644,13 +11644,13 @@ OS:WaterHeater:Mixed,
 
 OS:Schedule:Ruleset,
   {9ac945b7-b636-4572-8932-29a4e890c743}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F, !- Name
+  Water Heater Ambient Temp Schedule 70F, !- Name
   {c5486cab-6789-47e0-b07e-7c8f2f84cb5f}, !- Schedule Type Limits Name
   {bfe7a5a7-0ef1-4098-bc99-26cce31ae3bd}; !- Default Day Schedule Name
 
 OS:Schedule:Day,
   {bfe7a5a7-0ef1-4098-bc99-26cce31ae3bd}, !- Handle
-  Water Heater Ambient Temp Schedule - 70F Default, !- Name
+  Water Heater Ambient Temp Schedule 70F Default, !- Name
   {c5486cab-6789-47e0-b07e-7c8f2f84cb5f}, !- Schedule Type Limits Name
   ,                                       !- Interpolate to Timestep
   24,                                     !- Hour 1