diff --git a/fsw/cfe-core/src/es/cfe_es_api.c b/fsw/cfe-core/src/es/cfe_es_api.c
index 480955071..1594a640b 100644
--- a/fsw/cfe-core/src/es/cfe_es_api.c
+++ b/fsw/cfe-core/src/es/cfe_es_api.c
@@ -721,7 +721,7 @@ void CFE_ES_WaitForStartupSync(uint32 TimeOutMilliseconds)
 */
 int32 CFE_ES_RegisterApp(void)
 {
-   int32 Result = CFE_SUCCESS;
+   int32 Result;
 
    CFE_ES_LockSharedData(__func__,__LINE__);
 
@@ -1470,7 +1470,7 @@ uint32 CFE_ES_CalculateCRC(const void *DataPtr, uint32 DataLength, uint32 InputC
 */
 int32 CFE_ES_RegisterCDS(CFE_ES_CDSHandle_t *CDSHandlePtr, int32 BlockSize, const char *Name)
 {
-    int32   Status = CFE_SUCCESS;
+    int32   Status;
     size_t  NameLen = 0;
     uint32  ThisAppId = 0;
     
@@ -1550,7 +1550,7 @@ int32 CFE_ES_RegisterCDS(CFE_ES_CDSHandle_t *CDSHandlePtr, int32 BlockSize, cons
 */
 int32 CFE_ES_CopyToCDS(CFE_ES_CDSHandle_t Handle, void *DataToCopy)
 {
-    int32 Status = CFE_SUCCESS;
+    int32 Status;
     
     Status = CFE_ES_CDSBlockWrite(CFE_ES_Global.CDSVars.Registry[Handle].MemHandle, DataToCopy);
     
@@ -1565,7 +1565,7 @@ int32 CFE_ES_CopyToCDS(CFE_ES_CDSHandle_t Handle, void *DataToCopy)
 */
 int32 CFE_ES_RestoreFromCDS(void *RestoreToMemory, CFE_ES_CDSHandle_t Handle)
 {
-    int32 Status = CFE_SUCCESS;
+    int32 Status;
     
     Status = CFE_ES_CDSBlockRead(RestoreToMemory, CFE_ES_Global.CDSVars.Registry[Handle].MemHandle);
     
diff --git a/fsw/cfe-core/src/es/cfe_es_apps.h b/fsw/cfe-core/src/es/cfe_es_apps.h
index 10aca3b55..613ddcd7d 100644
--- a/fsw/cfe-core/src/es/cfe_es_apps.h
+++ b/fsw/cfe-core/src/es/cfe_es_apps.h
@@ -174,9 +174,9 @@ int32 CFE_ES_AppCreate(uint32 *ApplicationIdPtr,
 ** Internal function to load a a new cFE shared Library
 */
 int32 CFE_ES_LoadLibrary(uint32 *LibraryIdPtr,
-                       const char   *Path,
+                       const char   *FileName,
                        const void   *EntryPointData,
-                       const char   *Name);
+                       const char   *LibName);
 
 /*
 ** Get Application List
diff --git a/fsw/cfe-core/src/es/cfe_es_cds.c b/fsw/cfe-core/src/es/cfe_es_cds.c
index 216a19147..ff8cf85ff 100644
--- a/fsw/cfe-core/src/es/cfe_es_cds.c
+++ b/fsw/cfe-core/src/es/cfe_es_cds.c
@@ -149,7 +149,7 @@ int32 CFE_ES_RebuildCDS(void);
 int32 CFE_ES_CDS_EarlyInit(void)
 {
     uint32  MinRequiredSize = 0;
-    int32   Status = CFE_SUCCESS;
+    int32   Status;
     
     /* Compute the minimum size required for the CDS with the current configuration of the cFE */
     MinRequiredSize = (sizeof(CFE_ES_Global.CDSVars.ValidityField) * 2) +            /* Minimum size for validity fields */
@@ -512,7 +512,7 @@ int32 CFE_ES_InitCDSRegistry(void)
 
 int32 CFE_ES_UpdateCDSRegistry(void)
 {
-    int32 Status = CFE_SUCCESS;
+    int32 Status;
     
     /* Copy the contents of the local registry to the CDS */
     Status = CFE_PSP_WriteToCDS(CFE_ES_Global.CDSVars.Registry, 
@@ -696,7 +696,7 @@ int32 CFE_ES_FindFreeCDSRegistryEntry(void)
 
 int32 CFE_ES_RebuildCDS(void)
 {
-    int32 Status = CFE_SUCCESS;
+    int32 Status;
     int32 PoolOffset;
     
     /* First, determine if the CDS registry stored in the CDS is smaller or equal */
diff --git a/fsw/cfe-core/src/es/cfe_es_log.h b/fsw/cfe-core/src/es/cfe_es_log.h
index 82988b531..c595be3e7 100644
--- a/fsw/cfe-core/src/es/cfe_es_log.h
+++ b/fsw/cfe-core/src/es/cfe_es_log.h
@@ -239,19 +239,19 @@ void CFE_ES_SysLogReadData(CFE_ES_SysLogReadBuffer_t *Buffer);
  * The operating mode of the system log controls its behavior once filled to the point
  * where additional messages can no longer be stored.
  *
- * If "LogMode" is set to DISCARD, then the message will be truncated
+ * If "Mode" is set to DISCARD, then the message will be truncated
  * to fit in the available space, or completely discarded if no space exists.
  *
- * If "LogMode" is set to OVERWRITE, then the oldest message(s) in the
+ * If "Mode" is set to OVERWRITE, then the oldest message(s) in the
  * system log will be overwritten with this new message.
  *
  * \note Switching from OVERWRITE to DISCARD mode may take effect immediately, as the
  * setting only takes effect when the buffer "wrap-point" is reached at the end.
  *
- * \param LogMode   The desired operating mode
+ * \param Mode   The desired operating mode
  * \return CFE_SUCCESS if set successfully
  */
-int32 CFE_ES_SysLogSetMode(CFE_ES_LogMode_Enum_t LogMode);
+int32 CFE_ES_SysLogSetMode(CFE_ES_LogMode_Enum_t Mode);
 
 /**
  * \brief Format a message intended for output to the system log
diff --git a/fsw/cfe-core/src/es/cfe_es_shell.c b/fsw/cfe-core/src/es/cfe_es_shell.c
index 0387667c7..c1a2202a7 100644
--- a/fsw/cfe-core/src/es/cfe_es_shell.c
+++ b/fsw/cfe-core/src/es/cfe_es_shell.c
@@ -282,7 +282,7 @@ int32 CFE_ES_ListTasks(int32 fd)
      * length defined by osconfig.
      */
     char                 Line [96 + (OS_MAX_API_NAME * 2)];
-    int32                Result = CFE_SUCCESS;
+    int32                Result;
     CFE_ES_TaskInfo_t    TaskInfo;
     
     /* Make sure we start at the beginning of the file */
@@ -356,7 +356,7 @@ static void CFE_ES_ShellCountObjectCallback(uint32 object_id, void *arg)
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 int32 CFE_ES_ListResources(int32 fd)
 {
-    int32 Result = CFE_SUCCESS;
+    int32 Result;
     int32 NumSemaphores = 0;
     int32 NumCountSems =0;
     int32 NumMutexes = 0;
diff --git a/fsw/cfe-core/src/es/cfe_es_start.c b/fsw/cfe-core/src/es/cfe_es_start.c
index c8a72d9fb..68d063a1c 100644
--- a/fsw/cfe-core/src/es/cfe_es_start.c
+++ b/fsw/cfe-core/src/es/cfe_es_start.c
@@ -48,7 +48,7 @@
 #include <stdio.h>
 #include <string.h>
 
-static int32 CFE_ES_MainTaskSyncDelay(uint32 AppMinState, uint32 TimeOutMilliseconds);
+static int32 CFE_ES_MainTaskSyncDelay(uint32 AppStateId, uint32 TimeOutMilliseconds);
 
 /***************************************************************************/
 
@@ -480,7 +480,7 @@ void CFE_ES_SetupResetVariables(uint32 StartType, uint32 StartSubtype, uint32 Bo
 ** Purpose: This function initializes the file systems used in the cFE core.
 **
 */
-void CFE_ES_InitializeFileSystems(uint32 start_type)
+void CFE_ES_InitializeFileSystems(uint32 StartType)
 {
    int32   RetStatus;
    cpuaddr RamDiskMemoryAddress;
@@ -513,7 +513,7 @@ void CFE_ES_InitializeFileSystems(uint32 start_type)
    ** Next, either format, or just initialize the RAM disk depending on
    ** the reset type
    */
-   if ( start_type == CFE_PSP_RST_TYPE_POWERON )
+   if ( StartType == CFE_PSP_RST_TYPE_POWERON )
    {
       RetStatus = OS_mkfs((void *)RamDiskMemoryAddress, "/ramdev0", "RAM", CFE_PLATFORM_ES_RAM_DISK_SECTOR_SIZE, CFE_PLATFORM_ES_RAM_DISK_NUM_SECTORS );
       if ( RetStatus != OS_FS_SUCCESS )
@@ -584,7 +584,7 @@ void CFE_ES_InitializeFileSystems(uint32 start_type)
    ** Note: When CFE_PLATFORM_ES_RAM_DISK_PERCENT_RESERVED is set to 0, this feature is 
    **       disabled.
    */
-   if ((start_type == CFE_PSP_RST_TYPE_PROCESSOR) && (CFE_PLATFORM_ES_RAM_DISK_PERCENT_RESERVED > 0))
+   if ((StartType == CFE_PSP_RST_TYPE_PROCESSOR) && (CFE_PLATFORM_ES_RAM_DISK_PERCENT_RESERVED > 0))
    {
       /*
       ** See how many blocks are free in the RAM disk
diff --git a/fsw/cfe-core/src/es/cfe_es_start.h b/fsw/cfe-core/src/es/cfe_es_start.h
index aafc3e5bd..e98990cc8 100644
--- a/fsw/cfe-core/src/es/cfe_es_start.h
+++ b/fsw/cfe-core/src/es/cfe_es_start.h
@@ -93,7 +93,7 @@ extern CFE_ES_ObjectTable_t CFE_ES_ObjectTable[CFE_PLATFORM_ES_OBJECT_TABLE_SIZE
 extern void  CFE_ES_CreateObjects(void);
 extern void  CFE_ES_SetupResetVariables(uint32 StartType, uint32 StartSubtype, uint32 BootSource);
 extern void  CFE_ES_InitializeFileSystems(uint32 StartType);
-extern void CFE_ES_SetupPerfVariables(uint32 StartType);
+extern void CFE_ES_SetupPerfVariables(uint32 ResetType);
 
 
 #endif  /* _cfe_es_start_ */
diff --git a/fsw/cfe-core/src/es/cfe_es_syslog.c b/fsw/cfe-core/src/es/cfe_es_syslog.c
index 2d8339457..c71797da1 100644
--- a/fsw/cfe-core/src/es/cfe_es_syslog.c
+++ b/fsw/cfe-core/src/es/cfe_es_syslog.c
@@ -373,7 +373,7 @@ int32 CFE_ES_SysLogSetMode(CFE_ES_LogMode_Enum_t Mode)
  * with arguments similar to the "vsnprintf()" C library API call
  * -----------------------------------------------------------------
  */
-void CFE_ES_SysLog_vsnprintf(char *Buffer, size_t BufferSize, const char *SpecStringPtr, va_list ap)
+void CFE_ES_SysLog_vsnprintf(char *Buffer, size_t BufferSize, const char *SpecStringPtr, va_list ArgPtr)
 {
     size_t StringLen;
     size_t MaxLen;
@@ -405,7 +405,7 @@ void CFE_ES_SysLog_vsnprintf(char *Buffer, size_t BufferSize, const char *SpecSt
             ++StringLen;
 
             /* note that vsnprintf() may return a size larger than the buffer, if it truncates. */
-            PrintLen = vsnprintf(&Buffer[StringLen], BufferSize - StringLen, SpecStringPtr, ap);
+            PrintLen = vsnprintf(&Buffer[StringLen], BufferSize - StringLen, SpecStringPtr, ArgPtr);
             if (PrintLen > 0)
             {
                 StringLen += PrintLen;
diff --git a/fsw/cfe-core/src/fs/cfe_fs_api.c b/fsw/cfe-core/src/fs/cfe_fs_api.c
index 3d77cb486..17038edb0 100644
--- a/fsw/cfe-core/src/fs/cfe_fs_api.c
+++ b/fsw/cfe-core/src/fs/cfe_fs_api.c
@@ -166,7 +166,7 @@ int32 CFE_FS_WriteHeader(int32 FileDes, CFE_FS_Header_t *Hdr)
 
 int32 CFE_FS_SetTimestamp(int32 FileDes, CFE_TIME_SysTime_t NewTimestamp)
 {
-    int32              Result = OS_FS_SUCCESS;
+    int32              Result;
     CFE_FS_Header_t    TempHdr;
     int32              EndianCheck = 0x01020304;
     CFE_TIME_SysTime_t OutTimestamp = NewTimestamp;
diff --git a/fsw/cfe-core/src/fs/cfe_fs_decompress.c b/fsw/cfe-core/src/fs/cfe_fs_decompress.c
index 0ffa3181d..dd8bf0124 100644
--- a/fsw/cfe-core/src/fs/cfe_fs_decompress.c
+++ b/fsw/cfe-core/src/fs/cfe_fs_decompress.c
@@ -203,6 +203,7 @@ int32 FS_gz_eat_header_Reentrant( CFE_FS_Decompress_State_t *State )
 		if( State->Error != CFE_SUCCESS ) return CFE_FS_GZIP_READ_ERROR_HEADER;
 		stamp |= (uint32)NEXTBYTE() << 16;
 		if( State->Error != CFE_SUCCESS ) return CFE_FS_GZIP_READ_ERROR_HEADER;
+        /* cppcheck-suppress unreadVariable */
 		stamp |= (uint32)NEXTBYTE() << 24;
 		if( State->Error != CFE_SUCCESS ) return CFE_FS_GZIP_READ_ERROR_HEADER;
 		
diff --git a/fsw/cfe-core/src/fs/cfe_fs_priv.c b/fsw/cfe-core/src/fs/cfe_fs_priv.c
index 6bd4fbc07..b4d59ac66 100644
--- a/fsw/cfe-core/src/fs/cfe_fs_priv.c
+++ b/fsw/cfe-core/src/fs/cfe_fs_priv.c
@@ -63,7 +63,7 @@ CFE_FS_t CFE_FS;
 */
 int32 CFE_FS_EarlyInit (void) 
 {
-    int32 Stat = CFE_SUCCESS;
+    int32 Stat;
 
     Stat = OS_MutSemCreate(&CFE_FS.SharedDataMutexId, "CFE_FS_SharedMutex", 0);
     if( Stat != OS_SUCCESS )
diff --git a/fsw/cfe-core/src/sb/cfe_sb_init.c b/fsw/cfe-core/src/sb/cfe_sb_init.c
index d7492f91f..90164f734 100644
--- a/fsw/cfe-core/src/sb/cfe_sb_init.c
+++ b/fsw/cfe-core/src/sb/cfe_sb_init.c
@@ -85,7 +85,7 @@ uint32 CFE_SB_MemPoolDefSize[CFE_ES_MAX_MEMPOOL_BLOCK_SIZES] =
 */
 int32 CFE_SB_EarlyInit (void) {
 
-    int32 Stat = CFE_SUCCESS;
+    int32 Stat;
 
     CFE_SB_Default_Qos.Priority    = CFE_SB_QOS_LOW_PRIORITY;
     CFE_SB_Default_Qos.Reliability = CFE_SB_QOS_LOW_RELIABILITY;
@@ -217,9 +217,8 @@ void CFE_SB_InitPipeTbl(void){
 */
 void CFE_SB_InitMsgMap(void){
 
-    CFE_SB_MsgKey_Atom_t   KeyVal;
-
 #ifdef MESSAGE_FORMAT_IS_CCSDS
+    CFE_SB_MsgKey_Atom_t   KeyVal;
 
     for (KeyVal=0; KeyVal < CFE_SB_MAX_NUMBER_OF_MSG_KEYS; KeyVal++)
     {
diff --git a/fsw/cfe-core/src/sb/cfe_sb_priv.c b/fsw/cfe-core/src/sb/cfe_sb_priv.c
index ea897a519..0ecee2f7f 100644
--- a/fsw/cfe-core/src/sb/cfe_sb_priv.c
+++ b/fsw/cfe-core/src/sb/cfe_sb_priv.c
@@ -705,9 +705,9 @@ char *CFE_SB_GetAppTskName(uint32 TaskId,char *FullName){
 */
 uint8 CFE_SB_GetPktType(CFE_SB_MsgId_t MsgId)
 {
-    CFE_SB_MsgId_Atom_t Val = MsgId;
 
 #ifdef MESSAGE_FORMAT_IS_CCSDS
+    CFE_SB_MsgId_Atom_t Val = MsgId;
 
 #ifndef MESSAGE_FORMAT_IS_CCSDS_VER_2
         return CFE_TST(Val,12);
diff --git a/fsw/cfe-core/src/sb/cfe_sb_priv.h b/fsw/cfe-core/src/sb/cfe_sb_priv.h
index b2656f7b3..a47e10c07 100644
--- a/fsw/cfe-core/src/sb/cfe_sb_priv.h
+++ b/fsw/cfe-core/src/sb/cfe_sb_priv.h
@@ -351,8 +351,8 @@ CFE_SB_MsgKey_t CFE_SB_ConvertMsgIdtoMsgKey(CFE_SB_MsgId_t MsgId);
 void   CFE_SB_LockSharedData(const char *FuncName, int32 LineNumber);
 void   CFE_SB_UnlockSharedData(const char *FuncName, int32 LineNumber);
 void   CFE_SB_ReleaseBuffer (CFE_SB_BufferD_t *bd, CFE_SB_DestinationD_t *dest);
-int32  CFE_SB_ReadQueue(CFE_SB_PipeD_t *pd,uint32 TskId,
-                        CFE_SB_TimeOut_t time_out,CFE_SB_BufferD_t **message );
+int32  CFE_SB_ReadQueue(CFE_SB_PipeD_t *PipeDscPtr,uint32 TskId,
+                        CFE_SB_TimeOut_t Time_Out,CFE_SB_BufferD_t **Message );
 int32  CFE_SB_WriteQueue(CFE_SB_PipeD_t *pd,uint32 TskId,
                          const CFE_SB_BufferD_t *bd,CFE_SB_MsgId_t MsgId );
 CFE_SB_MsgRouteIdx_t CFE_SB_GetRoutingTblIdx(CFE_SB_MsgKey_t MsgKey);
@@ -366,7 +366,7 @@ void   CFE_SB_ResetCounters(void);
 char   *CFE_SB_GetPipeName(CFE_SB_PipeId_t PipeId);
 void   CFE_SB_SetMsgSeqCnt(CFE_SB_MsgPtr_t MsgPtr,uint32 Count);
 char   *CFE_SB_GetAppTskName(uint32 TaskId, char* FullName);
-CFE_SB_BufferD_t *CFE_SB_GetBufferFromPool(CFE_SB_MsgId_t MsgId, uint16 size);
+CFE_SB_BufferD_t *CFE_SB_GetBufferFromPool(CFE_SB_MsgId_t MsgId, uint16 Size);
 CFE_SB_BufferD_t *CFE_SB_GetBufferFromCaller(CFE_SB_MsgId_t MsgId, void *Address);
 CFE_SB_PipeD_t   *CFE_SB_GetPipePtr(CFE_SB_PipeId_t PipeId);
 CFE_SB_PipeId_t  CFE_SB_GetAvailPipeIdx(void);
@@ -402,8 +402,8 @@ uint32 CFE_SB_RequestToSendEvent(uint32 TaskId, uint32 Bit);
 void CFE_SB_FinishSendEvent(uint32 TaskId, uint32 Bit);
 CFE_SB_DestinationD_t *CFE_SB_GetDestinationBlk(void);
 int32 CFE_SB_PutDestinationBlk(CFE_SB_DestinationD_t *Dest);
-int32 CFE_SB_AddDest(CFE_SB_RouteEntry_t *RouteEntry, CFE_SB_DestinationD_t *Dest);
-int32 CFE_SB_RemoveDest(CFE_SB_RouteEntry_t *RouteEntry, CFE_SB_DestinationD_t *Dest);
+int32 CFE_SB_AddDest(CFE_SB_RouteEntry_t *RouteEntry, CFE_SB_DestinationD_t *NewNode);
+int32 CFE_SB_RemoveDest(CFE_SB_RouteEntry_t *RouteEntry, CFE_SB_DestinationD_t *NodeToRemove);
 
 
 /*****************************************************************************/
diff --git a/fsw/cfe-core/src/sb/cfe_sb_task.c b/fsw/cfe-core/src/sb/cfe_sb_task.c
index 7999cc962..2546fd61f 100644
--- a/fsw/cfe-core/src/sb/cfe_sb_task.c
+++ b/fsw/cfe-core/src/sb/cfe_sb_task.c
@@ -137,7 +137,7 @@ int32 CFE_SB_AppInit(void){
 
     uint32 CfgFileEventsToFilter = 0;    
     uint32 *TmpPtr = NULL;
-    int32  Status = CFE_SUCCESS;
+    int32  Status;
     
     Status = CFE_ES_RegisterApp();
 
diff --git a/fsw/cfe-core/src/sb/cfe_sb_util.c b/fsw/cfe-core/src/sb/cfe_sb_util.c
index ef673ee66..673fc8c91 100644
--- a/fsw/cfe-core/src/sb/cfe_sb_util.c
+++ b/fsw/cfe-core/src/sb/cfe_sb_util.c
@@ -109,10 +109,10 @@ void CFE_SB_InitMsg(void           *MsgPtr,
 */
 uint16 CFE_SB_MsgHdrSize(const CFE_SB_Msg_t *MsgPtr)
 {
-    uint16 size;
 
 #ifdef MESSAGE_FORMAT_IS_CCSDS
 
+    uint16 size;
     const CCSDS_PriHdr_t  *HdrPtr;
 
     HdrPtr = (const CCSDS_PriHdr_t *) MsgPtr;
diff --git a/fsw/cfe-core/src/tbl/cfe_tbl_api.c b/fsw/cfe-core/src/tbl/cfe_tbl_api.c
index 5f3270604..b38a9e280 100644
--- a/fsw/cfe-core/src/tbl/cfe_tbl_api.c
+++ b/fsw/cfe-core/src/tbl/cfe_tbl_api.c
@@ -62,7 +62,7 @@ int32 CFE_TBL_Register( CFE_TBL_Handle_t *TblHandlePtr,
     CFE_TBL_RegistryRec_t      *RegRecPtr = NULL;
     CFE_TBL_LoadBuff_t         *WorkingBufferPtr;
     CFE_TBL_CritRegRec_t       *CritRegRecPtr = NULL;
-    int32                       Status = CFE_SUCCESS;
+    int32                       Status;
     size_t                      NameLen = 0;
     int16                       RegIndx = -1;
     uint32                      ThisAppId;
@@ -516,7 +516,7 @@ int32 CFE_TBL_Register( CFE_TBL_Handle_t *TblHandlePtr,
 int32 CFE_TBL_Share( CFE_TBL_Handle_t *TblHandlePtr,
                      const char *TblName )
 {
-    int32   Status = CFE_SUCCESS;
+    int32   Status;
     uint32  ThisAppId;
     int16   RegIndx = CFE_TBL_NOT_FOUND;
     CFE_TBL_AccessDescriptor_t *AccessDescPtr = NULL;
@@ -1048,7 +1048,7 @@ int32 CFE_TBL_Update( CFE_TBL_Handle_t TblHandle )
 int32 CFE_TBL_GetAddress( void **TblPtr,
                           CFE_TBL_Handle_t TblHandle )
 {
-    int32   Status = CFE_SUCCESS;
+    int32   Status;
     uint32  ThisAppId;
 
     /* Assume failure at returning the table address */
@@ -1124,7 +1124,7 @@ int32 CFE_TBL_GetAddresses( void **TblPtrs[],
                             const CFE_TBL_Handle_t TblHandles[] )
 {
     uint16  i;
-    int32   Status = CFE_SUCCESS;
+    int32   Status;
     uint32  ThisAppId;
 
     /* Assume failure at returning the table addresses */
@@ -1203,7 +1203,7 @@ int32 CFE_TBL_ReleaseAddresses( uint16 NumTables,
 
 int32 CFE_TBL_Validate( CFE_TBL_Handle_t TblHandle )
 {
-    int32                       Status = CFE_SUCCESS;
+    int32                       Status;
     uint32                      ThisAppId;
     CFE_TBL_RegistryRec_t      *RegRecPtr;
     CFE_TBL_AccessDescriptor_t *AccessDescPtr;
@@ -1416,7 +1416,7 @@ int32 CFE_TBL_Manage( CFE_TBL_Handle_t TblHandle )
 
 int32 CFE_TBL_GetStatus( CFE_TBL_Handle_t TblHandle )
 {
-    int32                       Status = CFE_SUCCESS;
+    int32                       Status ;
     uint32                      ThisAppId;
     CFE_TBL_RegistryRec_t      *RegRecPtr;
     CFE_TBL_AccessDescriptor_t *AccessDescPtr;
@@ -1521,7 +1521,7 @@ int32 CFE_TBL_GetInfo( CFE_TBL_Info_t *TblInfoPtr, const char *TblName )
 
 int32 CFE_TBL_DumpToBuffer( CFE_TBL_Handle_t TblHandle )
 {
-    int32                       Status = CFE_SUCCESS;
+    int32                       Status;
     CFE_TBL_AccessDescriptor_t *AccessDescPtr = NULL;
     CFE_TBL_RegistryRec_t      *RegRecPtr = NULL;
     CFE_TBL_DumpControl_t      *DumpCtrlPtr = NULL;
@@ -1565,7 +1565,7 @@ int32 CFE_TBL_DumpToBuffer( CFE_TBL_Handle_t TblHandle )
 
 int32 CFE_TBL_Modified( CFE_TBL_Handle_t TblHandle )
 {
-    int32                       Status = CFE_SUCCESS;
+    int32                       Status;
     CFE_TBL_AccessDescriptor_t *AccessDescPtr = NULL;
     CFE_TBL_RegistryRec_t      *RegRecPtr = NULL;
     CFE_TBL_Handle_t            AccessIterator;
@@ -1642,7 +1642,7 @@ int32 CFE_TBL_Modified( CFE_TBL_Handle_t TblHandle )
 
 int32 CFE_TBL_NotifyByMessage(CFE_TBL_Handle_t TblHandle, CFE_SB_MsgId_t MsgId, uint16 CommandCode, uint32 Parameter)
 {
-    int32                       Status = CFE_SUCCESS;
+    int32                       Status;
     CFE_TBL_AccessDescriptor_t *AccessDescPtr = NULL;
     CFE_TBL_RegistryRec_t      *RegRecPtr = NULL;
     uint32                      ThisAppId;
diff --git a/fsw/cfe-core/src/tbl/cfe_tbl_internal.c b/fsw/cfe-core/src/tbl/cfe_tbl_internal.c
index 2f62a0dcf..bd8b87633 100644
--- a/fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+++ b/fsw/cfe-core/src/tbl/cfe_tbl_internal.c
@@ -377,7 +377,7 @@ int32 CFE_TBL_ValidateAppID(uint32 *AppIdPtr)
 
 int32 CFE_TBL_ValidateAccess(CFE_TBL_Handle_t TblHandle, uint32 *AppIdPtr)
 {
-    int32 Status = CFE_SUCCESS;
+    int32 Status;
 
     /* Check to make sure App ID is legit */
     Status = CFE_TBL_ValidateAppID(AppIdPtr);
@@ -537,7 +537,7 @@ int32 CFE_TBL_RemoveAccessLink(CFE_TBL_Handle_t TblHandle)
 
 int32 CFE_TBL_GetAddressInternal(void **TblPtr, CFE_TBL_Handle_t TblHandle, uint32 ThisAppId)
 {
-    int32   Status = CFE_SUCCESS;
+    int32   Status;
     CFE_TBL_AccessDescriptor_t *AccessDescPtr;
     CFE_TBL_RegistryRec_t *RegRecPtr;
 
@@ -1460,7 +1460,7 @@ void CFE_TBL_UpdateCriticalTblCDS(CFE_TBL_RegistryRec_t *RegRecPtr)
 {
     CFE_TBL_CritRegRec_t *CritRegRecPtr = NULL;
     
-    int32 Status = CFE_SUCCESS;
+    int32 Status;
     
     /* Copy an image of the updated table to the CDS for safekeeping */
     Status = CFE_ES_CopyToCDS(RegRecPtr->CDSHandle, RegRecPtr->Buffers[RegRecPtr->ActiveBufferIndex].BufferPtr);