diff --git a/resources/energyplus/ProposedEnergy+.idd b/resources/energyplus/ProposedEnergy+.idd
index 74aa9e96904..453aea5067c 100644
--- a/resources/energyplus/ProposedEnergy+.idd
+++ b/resources/energyplus/ProposedEnergy+.idd
@@ -45130,7 +45130,7 @@ DistrictCooling,
        \type object-list
        \object-list ScheduleNames
 
-DistrictHeating,
+DistrictHeating:Water,
        \memo Centralized source of hot water, such as a district heating system.
   A1 , \field Name
        \required-field
diff --git a/src/energyplus/ForwardTranslator/ForwardTranslateDistrictHeating.cpp b/src/energyplus/ForwardTranslator/ForwardTranslateDistrictHeating.cpp
index de3cd1b8b2b..12baa4342c8 100644
--- a/src/energyplus/ForwardTranslator/ForwardTranslateDistrictHeating.cpp
+++ b/src/energyplus/ForwardTranslator/ForwardTranslateDistrictHeating.cpp
@@ -26,7 +26,7 @@ namespace energyplus {
     OptionalModelObject temp;
     boost::optional<double> value;
 
-    IdfObject idfObject(IddObjectType::DistrictHeating);
+    IdfObject idfObject(IddObjectType::DistrictHeating_Water);
 
     m_idfObjects.push_back(idfObject);
 
@@ -44,7 +44,7 @@ namespace energyplus {
     if (temp) {
       s = temp->name();
       if (s) {
-        idfObject.setString(openstudio::DistrictHeatingFields::HotWaterInletNodeName, *s);
+        idfObject.setString(openstudio::DistrictHeating_WaterFields::HotWaterInletNodeName, *s);
       }
     }
     ///////////////////////////////////////////////////////////////////////////
@@ -55,7 +55,7 @@ namespace energyplus {
     if (temp) {
       s = temp->name();
       if (s) {
-        idfObject.setString(openstudio::DistrictHeatingFields::HotWaterOutletNodeName, *s);
+        idfObject.setString(openstudio::DistrictHeating_WaterFields::HotWaterOutletNodeName, *s);
       }
     }
     ///
@@ -64,9 +64,9 @@ namespace energyplus {
     ///////////////////////////////////////////////////////////////////////////
     //Nominal Capacity ///////////////////////////////////////////////////
     if (modelObject.isNominalCapacityAutosized()) {
-      idfObject.setString(DistrictHeatingFields::NominalCapacity, "Autosize");
+      idfObject.setString(DistrictHeating_WaterFields::NominalCapacity, "Autosize");
     } else if ((value = modelObject.nominalCapacity())) {
-      idfObject.setDouble(DistrictHeatingFields::NominalCapacity, value.get());
+      idfObject.setDouble(DistrictHeating_WaterFields::NominalCapacity, value.get());
     }
     //
     ////////////////////////////////////////////////////////////////////////