diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c
index 1686c5d..75bffae 100644
--- a/fsw/src/sample_app.c
+++ b/fsw/src/sample_app.c
@@ -271,7 +271,7 @@ void SAMPLE_ProcessCommandPacket( CFE_SB_MsgPtr_t Msg )
             break;
 
         case SAMPLE_APP_SEND_HK_MID:
-            SAMPLE_ReportHousekeeping((CCSDS_CommandPacket_t *)Msg);
+            SAMPLE_ReportHousekeeping((CFE_SB_CmdHdr_t *)Msg);
             break;
 
         default:
@@ -348,7 +348,7 @@ void SAMPLE_ProcessGroundCommand( CFE_SB_MsgPtr_t Msg )
 /*         telemetry, packetize it and send it to the housekeeping task via   */
 /*         the software bus                                                   */
 /* * * * * * * * * * * * * * * * * * * * * * * *  * * * * * * *  * *  * * * * */
-int32 SAMPLE_ReportHousekeeping( const CCSDS_CommandPacket_t *Msg )
+int32 SAMPLE_ReportHousekeeping( const CFE_SB_CmdHdr_t *Msg )
 {
     int i;
 
diff --git a/fsw/src/sample_app.h b/fsw/src/sample_app.h
index a7c2c47..14ab525 100644
--- a/fsw/src/sample_app.h
+++ b/fsw/src/sample_app.h
@@ -116,7 +116,7 @@ void  SAMPLE_AppMain(void);
 int32 SAMPLE_AppInit(void);
 void  SAMPLE_ProcessCommandPacket(CFE_SB_MsgPtr_t Msg);
 void  SAMPLE_ProcessGroundCommand(CFE_SB_MsgPtr_t Msg);
-int32 SAMPLE_ReportHousekeeping(const CCSDS_CommandPacket_t *Msg);
+int32 SAMPLE_ReportHousekeeping(const CFE_SB_CmdHdr_t *Msg);
 int32 SAMPLE_ResetCounters(const SAMPLE_ResetCounters_t *Msg);
 int32 SAMPLE_Process(const SAMPLE_Process_t *Msg);
 int32 SAMPLE_Noop(const SAMPLE_Noop_t *Msg);
diff --git a/unit-test/coveragetest/coveragetest_sample_app.c b/unit-test/coveragetest/coveragetest_sample_app.c
index 45dfdfd..9abf9c7 100644
--- a/unit-test/coveragetest/coveragetest_sample_app.c
+++ b/unit-test/coveragetest/coveragetest_sample_app.c
@@ -278,7 +278,7 @@ void Test_SAMPLE_ProcessCommandPacket(void)
     union
     {
         CFE_SB_Msg_t Base;
-        CCSDS_CommandPacket_t Cmd;
+        CFE_SB_CmdHdr_t Cmd;
         SAMPLE_Noop_t Noop;
         SAMPLE_ResetCounters_t Reset;
         SAMPLE_Process_t Process;
@@ -331,7 +331,7 @@ void Test_SAMPLE_ProcessGroundCommand(void)
     union
     {
         CFE_SB_Msg_t Base;
-        CCSDS_CommandPacket_t Cmd;
+        CFE_SB_CmdHdr_t Cmd;
         SAMPLE_Noop_t Noop;
         SAMPLE_ResetCounters_t Reset;
         SAMPLE_Process_t Process;
@@ -390,9 +390,9 @@ void Test_SAMPLE_ReportHousekeeping(void)
 {
     /*
      * Test Case For:
-     * void SAMPLE_ReportHousekeeping( const CCSDS_CommandPacket_t *Msg )
+     * void SAMPLE_ReportHousekeeping( const CFE_SB_CmdHdr_t *Msg )
      */
-    CCSDS_CommandPacket_t   CmdMsg;
+    CFE_SB_CmdHdr_t   CmdMsg;
     SAMPLE_HkTlm_t          HkTelemetryMsg;
 
     memset(&CmdMsg, 0, sizeof(CmdMsg));