diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentPorts.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentPorts.scala
index 83bd9acdc..dbe5e7a4a 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentPorts.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentPorts.scala
@@ -54,7 +54,7 @@ case class ComponentPorts(
       inputPortWriter.getHandlerBases(typedInputPorts),
       inputPortWriter.getHandlers(serialInputPorts),
       inputPortWriter.getHandlerBases(serialInputPorts),
-      inputPortWriter.getPreMsgHooks(dataProductInputPorts),
+      inputPortWriter.getPreMsgHooks(dataProductAsyncInputPorts),
       inputPortWriter.getPreMsgHooks(typedAsyncInputPorts),
       inputPortWriter.getPreMsgHooks(serialAsyncInputPorts),
       outputPortWriter.getInvokers(dataProductOutputPorts),
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp
index 5afa92c48..9d2bb0948 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp
@@ -2600,25 +2600,6 @@ void ActiveGuardedProductsComponentBase ::
   );
 }
 
-// ----------------------------------------------------------------------
-// Pre-message hooks for special async input ports
-//
-// Each of these functions is invoked just before processing a message
-// on the corresponding port. By default, they do nothing. You can
-// override them to provide specific pre-message behavior.
-// ----------------------------------------------------------------------
-
-void ActiveGuardedProductsComponentBase ::
-  productRecvIn_preMsgHook(
-      FwIndexType portNum,
-      FwDpIdType id,
-      const Fw::Buffer& buffer,
-      const Fw::Success& status
-  )
-{
-  // Default: no-op
-}
-
 // ----------------------------------------------------------------------
 // Pre-message hooks for typed async input ports
 //
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp
index 2852b6482..70942b11a 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp
@@ -1128,24 +1128,6 @@ class ActiveGuardedProductsComponentBase :
         const S& s //!< A struct
     );
 
-  PROTECTED:
-
-    // ----------------------------------------------------------------------
-    // Pre-message hooks for special async input ports
-    //
-    // Each of these functions is invoked just before processing a message
-    // on the corresponding port. By default, they do nothing. You can
-    // override them to provide specific pre-message behavior.
-    // ----------------------------------------------------------------------
-
-    //! Pre-message hook for async input port productRecvIn
-    virtual void productRecvIn_preMsgHook(
-        FwIndexType portNum, //!< The port number
-        FwDpIdType id, //!< The container ID
-        const Fw::Buffer& buffer, //!< The buffer
-        const Fw::Success& status //!< The status
-    );
-
   PROTECTED:
 
     // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp
index b3fe50eaf..8d26f17ee 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp
@@ -2594,25 +2594,6 @@ void ActiveSyncProductsComponentBase ::
   );
 }
 
-// ----------------------------------------------------------------------
-// Pre-message hooks for special async input ports
-//
-// Each of these functions is invoked just before processing a message
-// on the corresponding port. By default, they do nothing. You can
-// override them to provide specific pre-message behavior.
-// ----------------------------------------------------------------------
-
-void ActiveSyncProductsComponentBase ::
-  productRecvIn_preMsgHook(
-      FwIndexType portNum,
-      FwDpIdType id,
-      const Fw::Buffer& buffer,
-      const Fw::Success& status
-  )
-{
-  // Default: no-op
-}
-
 // ----------------------------------------------------------------------
 // Pre-message hooks for typed async input ports
 //
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp
index 5f4bc065a..73f73df55 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp
@@ -1128,24 +1128,6 @@ class ActiveSyncProductsComponentBase :
         const S& s //!< A struct
     );
 
-  PROTECTED:
-
-    // ----------------------------------------------------------------------
-    // Pre-message hooks for special async input ports
-    //
-    // Each of these functions is invoked just before processing a message
-    // on the corresponding port. By default, they do nothing. You can
-    // override them to provide specific pre-message behavior.
-    // ----------------------------------------------------------------------
-
-    //! Pre-message hook for async input port productRecvIn
-    virtual void productRecvIn_preMsgHook(
-        FwIndexType portNum, //!< The port number
-        FwDpIdType id, //!< The container ID
-        const Fw::Buffer& buffer, //!< The buffer
-        const Fw::Success& status //!< The status
-    );
-
   PROTECTED:
 
     // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp
index 84c54439f..b5ff7feb3 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp
@@ -1855,25 +1855,6 @@ void PassiveGuardedProductsComponentBase ::
   );
 }
 
-// ----------------------------------------------------------------------
-// Pre-message hooks for special async input ports
-//
-// Each of these functions is invoked just before processing a message
-// on the corresponding port. By default, they do nothing. You can
-// override them to provide specific pre-message behavior.
-// ----------------------------------------------------------------------
-
-void PassiveGuardedProductsComponentBase ::
-  productRecvIn_preMsgHook(
-      FwIndexType portNum,
-      FwDpIdType id,
-      const Fw::Buffer& buffer,
-      const Fw::Success& status
-  )
-{
-  // Default: no-op
-}
-
 // ----------------------------------------------------------------------
 // Invocation functions for special output ports
 // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp
index b6cbad603..565b5e92e 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp
@@ -956,24 +956,6 @@ class PassiveGuardedProductsComponentBase :
         const S& s //!< A struct
     );
 
-  PROTECTED:
-
-    // ----------------------------------------------------------------------
-    // Pre-message hooks for special async input ports
-    //
-    // Each of these functions is invoked just before processing a message
-    // on the corresponding port. By default, they do nothing. You can
-    // override them to provide specific pre-message behavior.
-    // ----------------------------------------------------------------------
-
-    //! Pre-message hook for async input port productRecvIn
-    virtual void productRecvIn_preMsgHook(
-        FwIndexType portNum, //!< The port number
-        FwDpIdType id, //!< The container ID
-        const Fw::Buffer& buffer, //!< The buffer
-        const Fw::Success& status //!< The status
-    );
-
   PROTECTED:
 
     // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.cpp
index 3cdfc8478..ee1779268 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.cpp
@@ -265,25 +265,6 @@ void PassiveSyncProductPortsOnlyComponentBase ::
   );
 }
 
-// ----------------------------------------------------------------------
-// Pre-message hooks for special async input ports
-//
-// Each of these functions is invoked just before processing a message
-// on the corresponding port. By default, they do nothing. You can
-// override them to provide specific pre-message behavior.
-// ----------------------------------------------------------------------
-
-void PassiveSyncProductPortsOnlyComponentBase ::
-  productRecvIn_preMsgHook(
-      FwIndexType portNum,
-      FwDpIdType id,
-      const Fw::Buffer& buffer,
-      const Fw::Success& status
-  )
-{
-  // Default: no-op
-}
-
 // ----------------------------------------------------------------------
 // Invocation functions for special output ports
 // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.hpp
index 38365fb58..965cff779 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.hpp
@@ -188,24 +188,6 @@ class PassiveSyncProductPortsOnlyComponentBase :
         const Fw::Success& status //!< The status
     );
 
-  PROTECTED:
-
-    // ----------------------------------------------------------------------
-    // Pre-message hooks for special async input ports
-    //
-    // Each of these functions is invoked just before processing a message
-    // on the corresponding port. By default, they do nothing. You can
-    // override them to provide specific pre-message behavior.
-    // ----------------------------------------------------------------------
-
-    //! Pre-message hook for async input port productRecvIn
-    virtual void productRecvIn_preMsgHook(
-        FwIndexType portNum, //!< The port number
-        FwDpIdType id, //!< The container ID
-        const Fw::Buffer& buffer, //!< The buffer
-        const Fw::Success& status //!< The status
-    );
-
   PROTECTED:
 
     // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp
index e7934c87e..f546f5868 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp
@@ -1849,25 +1849,6 @@ void PassiveSyncProductsComponentBase ::
   );
 }
 
-// ----------------------------------------------------------------------
-// Pre-message hooks for special async input ports
-//
-// Each of these functions is invoked just before processing a message
-// on the corresponding port. By default, they do nothing. You can
-// override them to provide specific pre-message behavior.
-// ----------------------------------------------------------------------
-
-void PassiveSyncProductsComponentBase ::
-  productRecvIn_preMsgHook(
-      FwIndexType portNum,
-      FwDpIdType id,
-      const Fw::Buffer& buffer,
-      const Fw::Success& status
-  )
-{
-  // Default: no-op
-}
-
 // ----------------------------------------------------------------------
 // Invocation functions for special output ports
 // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp
index 326baaebc..cc90bb3c0 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp
@@ -956,24 +956,6 @@ class PassiveSyncProductsComponentBase :
         const S& s //!< A struct
     );
 
-  PROTECTED:
-
-    // ----------------------------------------------------------------------
-    // Pre-message hooks for special async input ports
-    //
-    // Each of these functions is invoked just before processing a message
-    // on the corresponding port. By default, they do nothing. You can
-    // override them to provide specific pre-message behavior.
-    // ----------------------------------------------------------------------
-
-    //! Pre-message hook for async input port productRecvIn
-    virtual void productRecvIn_preMsgHook(
-        FwIndexType portNum, //!< The port number
-        FwDpIdType id, //!< The container ID
-        const Fw::Buffer& buffer, //!< The buffer
-        const Fw::Success& status //!< The status
-    );
-
   PROTECTED:
 
     // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp
index d00bbd013..fbcd42ed8 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp
@@ -2146,25 +2146,6 @@ void PassiveTestComponentBase ::
   );
 }
 
-// ----------------------------------------------------------------------
-// Pre-message hooks for special async input ports
-//
-// Each of these functions is invoked just before processing a message
-// on the corresponding port. By default, they do nothing. You can
-// override them to provide specific pre-message behavior.
-// ----------------------------------------------------------------------
-
-void PassiveTestComponentBase ::
-  productRecvIn_preMsgHook(
-      FwIndexType portNum,
-      FwDpIdType id,
-      const Fw::Buffer& buffer,
-      const Fw::Success& status
-  )
-{
-  // Default: no-op
-}
-
 // ----------------------------------------------------------------------
 // Invocation functions for special output ports
 // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp
index 95eeb36a7..f719de2d9 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp
@@ -1057,24 +1057,6 @@ class PassiveTestComponentBase :
         const S& s //!< A struct
     );
 
-  PROTECTED:
-
-    // ----------------------------------------------------------------------
-    // Pre-message hooks for special async input ports
-    //
-    // Each of these functions is invoked just before processing a message
-    // on the corresponding port. By default, they do nothing. You can
-    // override them to provide specific pre-message behavior.
-    // ----------------------------------------------------------------------
-
-    //! Pre-message hook for async input port productRecvIn
-    virtual void productRecvIn_preMsgHook(
-        FwIndexType portNum, //!< The port number
-        FwDpIdType id, //!< The container ID
-        const Fw::Buffer& buffer, //!< The buffer
-        const Fw::Success& status //!< The status
-    );
-
   PROTECTED:
 
     // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp
index ddf072bbd..693c41bb1 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp
@@ -2600,25 +2600,6 @@ void QueuedGuardedProductsComponentBase ::
   );
 }
 
-// ----------------------------------------------------------------------
-// Pre-message hooks for special async input ports
-//
-// Each of these functions is invoked just before processing a message
-// on the corresponding port. By default, they do nothing. You can
-// override them to provide specific pre-message behavior.
-// ----------------------------------------------------------------------
-
-void QueuedGuardedProductsComponentBase ::
-  productRecvIn_preMsgHook(
-      FwIndexType portNum,
-      FwDpIdType id,
-      const Fw::Buffer& buffer,
-      const Fw::Success& status
-  )
-{
-  // Default: no-op
-}
-
 // ----------------------------------------------------------------------
 // Pre-message hooks for typed async input ports
 //
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp
index 626304a56..532dad701 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp
@@ -1128,24 +1128,6 @@ class QueuedGuardedProductsComponentBase :
         const S& s //!< A struct
     );
 
-  PROTECTED:
-
-    // ----------------------------------------------------------------------
-    // Pre-message hooks for special async input ports
-    //
-    // Each of these functions is invoked just before processing a message
-    // on the corresponding port. By default, they do nothing. You can
-    // override them to provide specific pre-message behavior.
-    // ----------------------------------------------------------------------
-
-    //! Pre-message hook for async input port productRecvIn
-    virtual void productRecvIn_preMsgHook(
-        FwIndexType portNum, //!< The port number
-        FwDpIdType id, //!< The container ID
-        const Fw::Buffer& buffer, //!< The buffer
-        const Fw::Success& status //!< The status
-    );
-
   PROTECTED:
 
     // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp
index 3ad6412cf..209717ec2 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp
@@ -2594,25 +2594,6 @@ void QueuedSyncProductsComponentBase ::
   );
 }
 
-// ----------------------------------------------------------------------
-// Pre-message hooks for special async input ports
-//
-// Each of these functions is invoked just before processing a message
-// on the corresponding port. By default, they do nothing. You can
-// override them to provide specific pre-message behavior.
-// ----------------------------------------------------------------------
-
-void QueuedSyncProductsComponentBase ::
-  productRecvIn_preMsgHook(
-      FwIndexType portNum,
-      FwDpIdType id,
-      const Fw::Buffer& buffer,
-      const Fw::Success& status
-  )
-{
-  // Default: no-op
-}
-
 // ----------------------------------------------------------------------
 // Pre-message hooks for typed async input ports
 //
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp
index d618298b0..6ba5b4c15 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp
@@ -1128,24 +1128,6 @@ class QueuedSyncProductsComponentBase :
         const S& s //!< A struct
     );
 
-  PROTECTED:
-
-    // ----------------------------------------------------------------------
-    // Pre-message hooks for special async input ports
-    //
-    // Each of these functions is invoked just before processing a message
-    // on the corresponding port. By default, they do nothing. You can
-    // override them to provide specific pre-message behavior.
-    // ----------------------------------------------------------------------
-
-    //! Pre-message hook for async input port productRecvIn
-    virtual void productRecvIn_preMsgHook(
-        FwIndexType portNum, //!< The port number
-        FwDpIdType id, //!< The container ID
-        const Fw::Buffer& buffer, //!< The buffer
-        const Fw::Success& status //!< The status
-    );
-
   PROTECTED:
 
     // ----------------------------------------------------------------------