--- 
+++ 
@@ -378,18 +378,16 @@
 Output:Variable,*,Air System Relief Air Total Heat Loss Energy,hourly; !- HVAC Sum [J]
 Output:Variable,*,HVAC System Total Heat Rejection Energy,hourly; !- HVAC Sum [J]
 Output:Variable,*,Plant System Cycle On Off Status,hourly; !- HVAC Average []
-Output:Variable,*,District Cooling Chilled Water Energy,hourly; !- HVAC Sum [J]
-Output:Variable,*,District Cooling Chilled Water Rate,hourly; !- HVAC Average [W]
+Output:Variable,*,District Cooling Energy,hourly; !- HVAC Sum [J]
 Output:Variable,*,District Cooling Rate,hourly; !- HVAC Average [W]
 Output:Variable,*,District Cooling Inlet Temperature,hourly; !- HVAC Average [C]
 Output:Variable,*,District Cooling Outlet Temperature,hourly; !- HVAC Average [C]
 Output:Variable,*,District Cooling Mass Flow Rate,hourly; !- HVAC Average [kg/s]
-Output:Variable,*,District Heating Hot Water Energy,hourly; !- HVAC Sum [J]
-Output:Variable,*,District Heating Hot Water Rate,hourly; !- HVAC Average [W]
-Output:Variable,*,District Heating Rate,hourly; !- HVAC Average [W]
-Output:Variable,*,District Heating Inlet Temperature,hourly; !- HVAC Average [C]
-Output:Variable,*,District Heating Outlet Temperature,hourly; !- HVAC Average [C]
-Output:Variable,*,District Heating Mass Flow Rate,hourly; !- HVAC Average [kg/s]
+Output:Variable,*,District Heating Water Energy,hourly; !- HVAC Sum [J]
+Output:Variable,*,District Heating Water Rate,hourly; !- HVAC Average [W]
+Output:Variable,*,District Heating Water Inlet Temperature,hourly; !- HVAC Average [C]
+Output:Variable,*,District Heating Water Outlet Temperature,hourly; !- HVAC Average [C]
+Output:Variable,*,District Heating Water Mass Flow Rate,hourly; !- HVAC Average [kg/s]
 Output:Variable,*,Plant Supply Side Cooling Demand Rate,hourly; !- HVAC Average [W]
 Output:Variable,*,Plant Supply Side Heating Demand Rate,hourly; !- HVAC Average [W]
 Output:Variable,*,Plant Supply Side Inlet Mass Flow Rate,hourly; !- HVAC Average [kg/s]