diff --git a/fsw/inc/cs_msg.h b/fsw/inc/cs_msg.h
index b7e2796..acf2bd6 100644
--- a/fsw/inc/cs_msg.h
+++ b/fsw/inc/cs_msg.h
@@ -37,6 +37,8 @@
  */
 typedef struct
 {
+    CFE_MSG_TelemetryHeader_t TlmHeader; /**< \brief cFE SB Tlm Msg Hdr */
+
     uint8   CmdCounter;                  /**< \brief CS Application Command Counter */
     uint8   CmdErrCounter;               /**< \brief CS Application Command Error Counter */
     uint8   ChecksumState;               /**< \brief CS Application global checksum state */
@@ -65,15 +67,6 @@ typedef struct
     uint32  LastOneShotMaxBytesPerCycle; /**< \brief Max bytes per cycle for last one shot checksum command */
     uint32  LastOneShotChecksum;         /**< \brief Checksum of the last one shot checksum command */
     uint32  PassCounter;                 /**< \brief Number of times CS has passed through all of its tables */
-} CS_HkPacket_Payload_t;
-
-/**
- *  \brief Housekeeping Packet Structure
- */
-typedef struct
-{
-    CFE_MSG_TelemetryHeader_t TlmHeader; /**< \brief cFE SB Tlm Msg Hdr */
-    CS_HkPacket_Payload_t Payload; /**< \brief CS HK Payload */
 } CS_HkPacket_t;
 
 /**\}*/
@@ -148,7 +141,7 @@ typedef struct
 typedef struct
 {
     CFE_MSG_CommandHeader_t CmdHeader;
-    CS_GetEntryIDCmd_Payload_t Payload;
+    cpuaddr                 Address; /**< \brief Address to get the ID for */
 } CS_GetEntryIDCmd_t;
 
 /**
@@ -195,7 +188,10 @@ typedef struct
 typedef struct
 {
     CFE_MSG_CommandHeader_t CmdHeader;
-    CS_OneShotCmd_Payload_t Payload;
+    cpuaddr                 Address; /**< \brief Address to start checksum */
+    uint32                  Size;    /**< \brief Number of bytes to checksum */
+    uint32 MaxBytesPerCycle; /**< \brief Max Number of bytes to compute per cycle. Value of Zero to use platform config
+                                value */
 } CS_OneShotCmd_t;
 
 /**\}*/
diff --git a/fsw/inc/cs_tbldefs.h b/fsw/inc/cs_tbldefs.h
index 51c2640..9ab4923 100644
--- a/fsw/inc/cs_tbldefs.h
+++ b/fsw/inc/cs_tbldefs.h
@@ -68,10 +68,10 @@
  */
 typedef struct
 {
-    cpuaddr StartAddress;       /**< \brief The Start address to Checksum */
-    uint16  State;              /**< \brief Uses the CS_STATE_... defines from above */
-    uint16  Filler16;           /** <\brief Padding */
-    uint32  NumBytesToChecksum; /**< \brief The number of Bytes to Checksum */
+    CFE_ES_MemAddress_t StartAddress;       /**< \brief The Start address to Checksum */
+    uint16              State;              /**< \brief Uses the CS_STATE_... defines from above */
+    uint16              Filler16;           /** <\brief Padding */
+    uint32              NumBytesToChecksum; /**< \brief The number of Bytes to Checksum */
 } CS_Def_EepromMemory_Table_Entry_t;
 
 /**
@@ -79,14 +79,13 @@ typedef struct
  */
 typedef struct
 {
-    cpuaddr StartAddress;       /**< \brief The Start address to Checksum */
-    uint16  State;              /**< \brief Uses the CS_STATE_... defines from above */
-    uint16  ComputedYet;        /**< \brief Have we computed an Integrity value yet */
-    uint32  NumBytesToChecksum; /**< \brief The number of Bytes to Checksum */
-    uint32  ComparisonValue;    /**< \brief The Memory Integrity Value */
-    uint32  ByteOffset;         /**< \brief Where a previous unfinished calc left off */
-    uint32  TempChecksumValue;  /**< \brief The unfinished caluculation */
-    uint32  Filler32;           /**< \brief Padding */
+    CFE_ES_MemAddress_t StartAddress;       /**< \brief The Start address to Checksum */
+    uint16              State;              /**< \brief Uses the CS_STATE_... defines from above */
+    uint16              ComputedYet;        /**< \brief Have we computed an Integrity value yet */
+    uint32              NumBytesToChecksum; /**< \brief The number of Bytes to Checksum */
+    uint32              ComparisonValue;    /**< \brief The Memory Integrity Value */
+    uint32              ByteOffset;         /**< \brief Where a previous unfinished calc left off */
+    uint32              TempChecksumValue;  /**< \brief The unfinished caluculation */
 } CS_Res_EepromMemory_Table_Entry_t;
 
 /**
@@ -112,17 +111,17 @@ typedef struct
  */
 typedef struct
 {
-    cpuaddr          StartAddress;                    /**< \brief The Start address to Checksum */
-    uint16           State;                           /**< \brief Uses the CS_STATE_... defines from above */
-    uint16           ComputedYet;                     /**< \brief Have we computed an Integrity value yet */
-    uint32           NumBytesToChecksum;              /**< \brief The number of Bytes to Checksum */
-    uint32           ComparisonValue;                 /**< \brief The Memory Integrity Value */
-    uint32           ByteOffset;                      /**< \brief Where a previous unfinished calc left off */
-    uint32           TempChecksumValue;               /**< \brief The unfinished caluculation */
-    CFE_TBL_Handle_t TblHandle;                       /**< \brief handle recieved from CFE_TBL */
-    bool             IsCSOwner;                       /**< \brief Is CS the original owner of this table */
-    bool             Filler8;                         /**< \brief Padding */
-    char             Name[CFE_TBL_MAX_FULL_NAME_LEN]; /**< \brief name of the table */
+    CFE_ES_MemAddress_t StartAddress;                    /**< \brief The Start address to Checksum */
+    uint16              State;                           /**< \brief Uses the CS_STATE_... defines from above */
+    uint16              ComputedYet;                     /**< \brief Have we computed an Integrity value yet */
+    uint32              NumBytesToChecksum;              /**< \brief The number of Bytes to Checksum */
+    uint32              ComparisonValue;                 /**< \brief The Memory Integrity Value */
+    uint32              ByteOffset;                      /**< \brief Where a previous unfinished calc left off */
+    uint32              TempChecksumValue;               /**< \brief The unfinished caluculation */
+    CFE_TBL_Handle_t    TblHandle;                       /**< \brief handle recieved from CFE_TBL */
+    bool                IsCSOwner;                       /**< \brief Is CS the original owner of this table */
+    bool                Filler8;                         /**< \brief Padding */
+    char                Name[CFE_TBL_MAX_FULL_NAME_LEN]; /**< \brief name of the table */
 } CS_Res_Tables_Table_Entry_t;
 
 /**
@@ -130,14 +129,14 @@ typedef struct
  */
 typedef struct
 {
-    cpuaddr StartAddress;          /**< \brief The Start address to Checksum */
-    uint16  State;                 /**< \brief Uses the CS_STATE_... defines from above */
-    uint16  ComputedYet;           /**< \brief Have we computed an Integrity value yet */
-    uint32  NumBytesToChecksum;    /**< \brief The number of Bytes to Checksum */
-    uint32  ComparisonValue;       /**< \brief The Memory Integrity Value */
-    uint32  ByteOffset;            /**< \brief Where a previous unfinished calc left off */
-    uint32  TempChecksumValue;     /**< \brief The unfinished caluculation */
-    char    Name[OS_MAX_API_NAME]; /**< \brief name of the app */
+    CFE_ES_MemAddress_t StartAddress;          /**< \brief The Start address to Checksum */
+    uint16              State;                 /**< \brief Uses the CS_STATE_... defines from above */
+    uint16              ComputedYet;           /**< \brief Have we computed an Integrity value yet */
+    uint32              NumBytesToChecksum;    /**< \brief The number of Bytes to Checksum */
+    uint32              ComparisonValue;       /**< \brief The Memory Integrity Value */
+    uint32              ByteOffset;            /**< \brief Where a previous unfinished calc left off */
+    uint32              TempChecksumValue;     /**< \brief The unfinished caluculation */
+    char                Name[OS_MAX_API_NAME]; /**< \brief name of the app */
 } CS_Res_App_Table_Entry_t;
 
 /**************************************************************************