diff --git a/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.computer_room_acs.json b/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.computer_room_acs.json
index 58a966d4a6..5866ab1b67 100644
--- a/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.computer_room_acs.json
+++ b/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.computer_room_acs.json
@@ -2,7 +2,7 @@
   "computer_room_acs": [
     {
       "cooling_type": "AirCooled",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 0,
       "maximum_capacity": 64999.99,
@@ -12,7 +12,7 @@
     },
     {
       "cooling_type": "AirCooled",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 0,
       "maximum_capacity": 64999.99,
@@ -22,7 +22,7 @@
     },
     {
       "cooling_type": "AirCooled",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 65000,
       "maximum_capacity": 239999.99,
@@ -32,7 +32,7 @@
     },
     {
       "cooling_type": "AirCooled",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 65000,
       "maximum_capacity": 239999.99,
@@ -42,7 +42,7 @@
     },
     {
       "cooling_type": "AirCooled",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 240000,
       "maximum_capacity": 9999999999,
@@ -52,7 +52,7 @@
     },
     {
       "cooling_type": "AirCooled",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 240000,
       "maximum_capacity": 9999999999,
@@ -62,7 +62,7 @@
     },
     {
       "cooling_type": "WaterCooled",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 0,
       "maximum_capacity": 64999.99,
@@ -72,7 +72,7 @@
     },
     {
       "cooling_type": "WaterCooled",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 0,
       "maximum_capacity": 64999.99,
@@ -82,7 +82,7 @@
     },
     {
       "cooling_type": "WaterCooled",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 65000,
       "maximum_capacity": 239999.99,
@@ -92,7 +92,7 @@
     },
     {
       "cooling_type": "WaterCooled",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 65000,
       "maximum_capacity": 239999.99,
@@ -102,7 +102,7 @@
     },
     {
       "cooling_type": "WaterCooled",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 240000,
       "maximum_capacity": 9999999999,
@@ -112,7 +112,7 @@
     },
     {
       "cooling_type": "WaterCooled",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 240000,
       "maximum_capacity": 9999999999,
@@ -122,7 +122,7 @@
     },
     {
       "cooling_type": "WaterCooled with fluid economizer",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 0,
       "maximum_capacity": 64999.99,
@@ -132,7 +132,7 @@
     },
     {
       "cooling_type": "WaterCooled with fluid economizer",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 0,
       "maximum_capacity": 64999.99,
@@ -142,7 +142,7 @@
     },
     {
       "cooling_type": "WaterCooled with fluid economizer",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 65000,
       "maximum_capacity": 239999.99,
@@ -152,7 +152,7 @@
     },
     {
       "cooling_type": "WaterCooled with fluid economizer",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 65000,
       "maximum_capacity": 239999.99,
@@ -162,7 +162,7 @@
     },
     {
       "cooling_type": "WaterCooled with fluid economizer",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 240000,
       "maximum_capacity": 9999999999,
@@ -172,7 +172,7 @@
     },
     {
       "cooling_type": "WaterCooled with fluid economizer",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 240000,
       "maximum_capacity": 9999999999,
@@ -182,7 +182,7 @@
     },
     {
       "cooling_type": "GlycolCooled",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 0,
       "maximum_capacity": 64999.99,
@@ -192,7 +192,7 @@
     },
     {
       "cooling_type": "GlycolCooled",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 0,
       "maximum_capacity": 64999.99,
@@ -202,7 +202,7 @@
     },
     {
       "cooling_type": "GlycolCooled",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 65000,
       "maximum_capacity": 239999.99,
@@ -212,7 +212,7 @@
     },
     {
       "cooling_type": "GlycolCooled",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 65000,
       "maximum_capacity": 239999.99,
@@ -222,7 +222,7 @@
     },
     {
       "cooling_type": "GlycolCooled",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 240000,
       "maximum_capacity": 9999999999,
@@ -232,7 +232,7 @@
     },
     {
       "cooling_type": "GlycolCooled",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 240000,
       "maximum_capacity": 9999999999,
@@ -242,7 +242,7 @@
     },
     {
       "cooling_type": "GlycolCooled with fluid economizer",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 0,
       "maximum_capacity": 64999.99,
@@ -252,7 +252,7 @@
     },
     {
       "cooling_type": "GlycolCooled with fluid economizer",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 0,
       "maximum_capacity": 64999.99,
@@ -262,7 +262,7 @@
     },
     {
       "cooling_type": "GlycolCooled with fluid economizer",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 65000,
       "maximum_capacity": 239999.99,
@@ -272,7 +272,7 @@
     },
     {
       "cooling_type": "GlycolCooled with fluid economizer",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 65000,
       "maximum_capacity": 239999.99,
@@ -282,7 +282,7 @@
     },
     {
       "cooling_type": "GlycolCooled with fluid economizer",
-      "standard_model": null,
+      "standard_model": "Downflow units",
       "rating_condition": null,
       "minimum_capacity": 240000,
       "maximum_capacity": 9999999999,
@@ -292,7 +292,7 @@
     },
     {
       "cooling_type": "GlycolCooled with fluid economizer",
-      "standard_model": null,
+      "standard_model": "Upflow units",
       "rating_condition": null,
       "minimum_capacity": 240000,
       "maximum_capacity": 9999999999,
diff --git a/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/data/ashrae_90_1_2019.furnaces.json b/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/data/ashrae_90_1_2019.furnaces.json
index 6f9b5d505f..1719797ae8 100644
--- a/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/data/ashrae_90_1_2019.furnaces.json
+++ b/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/data/ashrae_90_1_2019.furnaces.json
@@ -46,7 +46,7 @@
       "start_date": "1919-09-09T00:00:00+00:00",
       "end_date": "2999-09-09T00:00:00+00:00",
       "minimum_annual_fuel_utilization_efficiency": 0.81,
-      "minimum_thermal_efficiency": null,
+      "minimum_thermal_efficiency": 0.8,
       "minimum_combustion_efficiency": null,
       "standby_mode_power": null,
       "off_mode_power": null
@@ -131,7 +131,7 @@
       "start_date": "1919-09-09T00:00:00+00:00",
       "end_date": "2999-09-09T00:00:00+00:00",
       "minimum_annual_fuel_utilization_efficiency": 0.78,
-      "minimum_thermal_efficiency": null,
+      "minimum_thermal_efficiency": 0.8,
       "minimum_combustion_efficiency": null,
       "standby_mode_power": null,
       "off_mode_power": null