diff --git a/src/model/AirLoopHVACExhaustSystem.cpp b/src/model/AirLoopHVACExhaustSystem.cpp
index 86a3b271e2..5b52aefbf6 100644
--- a/src/model/AirLoopHVACExhaustSystem.cpp
+++ b/src/model/AirLoopHVACExhaustSystem.cpp
@@ -47,18 +47,18 @@ namespace model {
   namespace detail {
 
     AirLoopHVACExhaustSystem_Impl::AirLoopHVACExhaustSystem_Impl(const IdfObject& idfObject, Model_Impl* model, bool keepHandle)
-      : StraightComponent_Impl(idfObject, model, keepHandle) {
+      : HVACComponent_Impl(idfObject, model, keepHandle) {
       OS_ASSERT(idfObject.iddObject().type() == AirLoopHVACExhaustSystem::iddObjectType());
     }
 
     AirLoopHVACExhaustSystem_Impl::AirLoopHVACExhaustSystem_Impl(const openstudio::detail::WorkspaceObject_Impl& other, Model_Impl* model,
                                                                  bool keepHandle)
-      : StraightComponent_Impl(other, model, keepHandle) {
+      : HVACComponent_Impl(other, model, keepHandle) {
       OS_ASSERT(other.iddObject().type() == AirLoopHVACExhaustSystem::iddObjectType());
     }
 
     AirLoopHVACExhaustSystem_Impl::AirLoopHVACExhaustSystem_Impl(const AirLoopHVACExhaustSystem_Impl& other, Model_Impl* model, bool keepHandle)
-      : StraightComponent_Impl(other, model, keepHandle) {}
+      : HVACComponent_Impl(other, model, keepHandle) {}
 
     const std::vector<std::string>& AirLoopHVACExhaustSystem_Impl::outputVariableNames() const {
       static std::vector<std::string> result;
@@ -106,7 +106,7 @@ namespace model {
 
   }  // namespace detail
 
-  AirLoopHVACExhaustSystem::AirLoopHVACExhaustSystem(const Model& model) : StraightComponent(AirLoopHVACExhaustSystem::iddObjectType(), model) {
+  AirLoopHVACExhaustSystem::AirLoopHVACExhaustSystem(const Model& model) : HVACComponent(AirLoopHVACExhaustSystem::iddObjectType(), model) {
     OS_ASSERT(getImpl<detail::AirLoopHVACExhaustSystem_Impl>());
 
     bool ok = true;
@@ -130,8 +130,7 @@ namespace model {
   }
 
   /// @cond
-  AirLoopHVACExhaustSystem::AirLoopHVACExhaustSystem(std::shared_ptr<detail::AirLoopHVACExhaustSystem_Impl> impl)
-    : StraightComponent(std::move(impl)) {}
+  AirLoopHVACExhaustSystem::AirLoopHVACExhaustSystem(std::shared_ptr<detail::AirLoopHVACExhaustSystem_Impl> impl) : HVACComponent(std::move(impl)) {}
   /// @endcond
 
 }  // namespace model
diff --git a/src/model/AirLoopHVACExhaustSystem.hpp b/src/model/AirLoopHVACExhaustSystem.hpp
index 4c39c2ba69..8f43021e19 100644
--- a/src/model/AirLoopHVACExhaustSystem.hpp
+++ b/src/model/AirLoopHVACExhaustSystem.hpp
@@ -31,7 +31,7 @@
 #define MODEL_AIRLOOPHVACEXHAUSTSYSTEM_HPP
 
 #include <model/ModelAPI.hpp>
-#include "StraightComponent.hpp"
+#include "HVACComponent.hpp"
 
 namespace openstudio {
 namespace model {
@@ -44,8 +44,8 @@ namespace model {
 
   }  // namespace detail
 
-  /** AirLoopHVACExhaustSystem is a StraightComponent that wraps the OpenStudio IDD object 'OS:AirLoopHVAC:ExhaustSystem'. */
-  class MODEL_API AirLoopHVACExhaustSystem : public StraightComponent
+  /** AirLoopHVACExhaustSystem is a HVACComponent that wraps the OpenStudio IDD object 'OS:AirLoopHVAC:ExhaustSystem'. */
+  class MODEL_API AirLoopHVACExhaustSystem : public HVACComponent
   {
    public:
     /** @name Constructors and Destructors */
diff --git a/src/model/AirLoopHVACExhaustSystem_Impl.hpp b/src/model/AirLoopHVACExhaustSystem_Impl.hpp
index 0a1dbfdeea..f9f92401ce 100644
--- a/src/model/AirLoopHVACExhaustSystem_Impl.hpp
+++ b/src/model/AirLoopHVACExhaustSystem_Impl.hpp
@@ -31,7 +31,7 @@
 #define MODEL_AIRLOOPHVACEXHAUSTSYSTEM_IMPL_HPP
 
 #include <model/ModelAPI.hpp>
-#include "StraightComponent_Impl.hpp"
+#include "HVACComponent_Impl.hpp"
 
 namespace openstudio {
 namespace model {
@@ -40,8 +40,8 @@ namespace model {
 
   namespace detail {
 
-    /** AirLoopHVACExhaustSystem_Impl is a StraightComponent_Impl that is the implementation class for AirLoopHVACExhaustSystem.*/
-    class MODEL_API AirLoopHVACExhaustSystem_Impl : public StraightComponent_Impl
+    /** AirLoopHVACExhaustSystem_Impl is a HVACComponent_Impl that is the implementation class for AirLoopHVACExhaustSystem.*/
+    class MODEL_API AirLoopHVACExhaustSystem_Impl : public HVACComponent_Impl
     {
      public:
       /** @name Constructors and Destructors */