diff --git a/resources/options_lookup.tsv b/resources/options_lookup.tsv
index 30cb93acf9..a4ffd682bf 100644
--- a/resources/options_lookup.tsv
+++ b/resources/options_lookup.tsv
@@ -12963,10 +12963,10 @@ Water Heater Fuel	Propane
 Water Heater In Unit	No
 Water Heater In Unit	Yes
 Water Heater Location	Attic	ResStockArguments	water_heater_location=attic
+Water Heater Location	Conditioned Mechanical Room	ResStockArguments	water_heater_location=other heated space
 Water Heater Location	Crawlspace	ResStockArguments	water_heater_location=crawlspace
 Water Heater Location	Garage	ResStockArguments	water_heater_location=garage
 Water Heater Location	Heated Basement	ResStockArguments	water_heater_location=basement - conditioned
-Water Heater Location	Living Space	ResStockArguments	water_heater_location=conditioned space
 Water Heater Location	None
 Water Heater Location	Outside	ResStockArguments	water_heater_location=other exterior
 Water Heater Location	Unheated Basement	ResStockArguments	water_heater_location=basement - unconditioned