diff --git a/src/model/AirflowNetworkOccupantVentilationControl.cpp b/src/model/AirflowNetworkOccupantVentilationControl.cpp
index 08b60a7ac4..253d3bab3e 100644
--- a/src/model/AirflowNetworkOccupantVentilationControl.cpp
+++ b/src/model/AirflowNetworkOccupantVentilationControl.cpp
@@ -51,16 +51,15 @@ namespace model {
     }
 
     std::vector<ScheduleTypeKey> AirflowNetworkOccupantVentilationControl_Impl::getScheduleTypeKeys(const Schedule& schedule) const {
-      // TODO: Check schedule display names.
       std::vector<ScheduleTypeKey> result;
       UnsignedVector fieldIndices = getSourceIndices(schedule.handle());
       UnsignedVector::const_iterator b(fieldIndices.begin());
       UnsignedVector::const_iterator e(fieldIndices.end());
       if (std::find(b, e, OS_AirflowNetworkOccupantVentilationControlFields::OpeningProbabilityScheduleName) != e) {
-        result.push_back(ScheduleTypeKey("AirflowNetworkOccupantVentilationControl", "Opening Probability"));
+        result.emplace_back("AirflowNetworkOccupantVentilationControl", "Opening Probability");
       }
       if (std::find(b, e, OS_AirflowNetworkOccupantVentilationControlFields::ClosingProbabilityScheduleName) != e) {
-        result.push_back(ScheduleTypeKey("AirflowNetworkOccupantVentilationControl", "Closing Probability"));
+        result.emplace_back("AirflowNetworkOccupantVentilationControl", "Closing Probability");
       }
       return result;
     }
diff --git a/src/model/AirflowNetworkSurface.cpp b/src/model/AirflowNetworkSurface.cpp
index c5fb6a5d42..e23cf9c172 100644
--- a/src/model/AirflowNetworkSurface.cpp
+++ b/src/model/AirflowNetworkSurface.cpp
@@ -60,16 +60,15 @@ namespace model {
     }
 
     std::vector<ScheduleTypeKey> AirflowNetworkSurface_Impl::getScheduleTypeKeys(const Schedule& schedule) const {
-      // TODO: Check schedule display names.
       std::vector<ScheduleTypeKey> result;
       UnsignedVector fieldIndices = getSourceIndices(schedule.handle());
       UnsignedVector::const_iterator b(fieldIndices.begin());
       UnsignedVector::const_iterator e(fieldIndices.end());
       if (std::find(b, e, OS_AirflowNetworkSurfaceFields::VentilationControlZoneTemperatureSetpointScheduleName) != e) {
-        result.push_back(ScheduleTypeKey("AirflowNetworkSurface", "Ventilation Control Zone Temperature Setpoint"));
+        result.emplace_back("AirflowNetworkSurface", "Ventilation Control Zone Temperature Setpoint");
       }
       if (std::find(b, e, OS_AirflowNetworkSurfaceFields::VentingAvailabilityScheduleName) != e) {
-        result.push_back(ScheduleTypeKey("AirflowNetworkSurface", "Venting Availability"));
+        result.emplace_back("AirflowNetworkSurface", "Venting Availability");
       }
       return result;
     }
diff --git a/src/model/AirflowNetworkZone.cpp b/src/model/AirflowNetworkZone.cpp
index 4c4ac03fe0..e8a358c852 100644
--- a/src/model/AirflowNetworkZone.cpp
+++ b/src/model/AirflowNetworkZone.cpp
@@ -52,16 +52,15 @@ namespace model {
     }
 
     std::vector<ScheduleTypeKey> AirflowNetworkZone_Impl::getScheduleTypeKeys(const Schedule& schedule) const {
-      // TODO: Check schedule display names.
       std::vector<ScheduleTypeKey> result;
       UnsignedVector fieldIndices = getSourceIndices(schedule.handle());
       UnsignedVector::const_iterator b(fieldIndices.begin());
       UnsignedVector::const_iterator e(fieldIndices.end());
       if (std::find(b, e, OS_AirflowNetworkZoneFields::VentilationControlZoneTemperatureSetpointScheduleName) != e) {
-        result.push_back(ScheduleTypeKey("AirflowNetworkZone", "Ventilation Control Zone Temperature Setpoint"));
+        result.emplace_back("AirflowNetworkZone", "Ventilation Control Zone Temperature Setpoint");
       }
       if (std::find(b, e, OS_AirflowNetworkZoneFields::VentingAvailabilityScheduleName) != e) {
-        result.push_back(ScheduleTypeKey("AirflowNetworkZone", "Venting Availability"));
+        result.emplace_back("AirflowNetworkZone", "Venting Availability");
       }
       return result;
     }
diff --git a/src/model/ScheduleTypeRegistry.cpp b/src/model/ScheduleTypeRegistry.cpp
index a24cbe7b57..6153e4eda6 100644
--- a/src/model/ScheduleTypeRegistry.cpp
+++ b/src/model/ScheduleTypeRegistry.cpp
@@ -94,6 +94,14 @@ namespace model {
        1.0},
       {"AirConditionerVariableRefrigerantFlow", "Thermostat Priority Schedule", "thermostatPrioritySchedule", false, "ControlMode", 0.0, 1.0},
       {"AirConditionerVariableRefrigerantFlow", "Basin Heater Operating Schedule", "basinHeaterOperatingSchedule", false, "Availability", 0.0, 1.0},
+      {"AirflowNetworkOccupantVentilationControl", "Opening Probability", "openingProbabilitySchedule", true, "", 0.0, 1.0},
+      {"AirflowNetworkOccupantVentilationControl", "Closing Probability", "closingProbabilitySchedule", true, "", 0.0, 1.0},
+      {"AirflowNetworkSurface", "Ventilation Control Zone Temperature Setpoint", "ventilationControlZoneTemperatureSetpointSchedule", true,
+       "Temperature", OptionalDouble(), OptionalDouble()},
+      {"AirflowNetworkSurface", "Venting Availability", "ventingAvailabilitySchedule", false, "Availability", 0.0, 1.0},
+      {"AirflowNetworkZone", "Ventilation Control Zone Temperature Setpoint", "ventilationControlZoneTemperatureSetpointSchedule", true,
+       "Temperature", OptionalDouble(), OptionalDouble()},
+      {"AirflowNetworkZone", "Venting Availability", "ventingAvailabilitySchedule", false, "Availability", 0.0, 1.0},
       {"AirLoopHVAC", "Return Air Bypass Flow Temperature Setpoint", "returnAirBypassFlowTemperatureSetpointSchedule", true, "Temperature",
        OptionalDouble(), OptionalDouble()},
       {"AirLoopHVACDedicatedOutdoorAirSystem", "Availability Schedule", "availabilitySchedule", false, "Availability", 0.0, 1.0},