diff --git a/modules/core_api/ut-stubs/src/cfe_es_stubs.c b/modules/core_api/ut-stubs/src/cfe_es_stubs.c
index e4c84be40..4e778ed58 100644
--- a/modules/core_api/ut-stubs/src/cfe_es_stubs.c
+++ b/modules/core_api/ut-stubs/src/cfe_es_stubs.c
@@ -115,11 +115,11 @@ CFE_Status_t CFE_ES_CopyToCDS(CFE_ES_CDSHandle_t Handle, void *DataToCopy)
  * Generated stub function for CFE_ES_CounterID_ToIndex()
  * ----------------------------------------------------
  */
-CFE_Status_t CFE_ES_CounterID_ToIndex(CFE_ES_CounterId_t CounterID, uint32 *Idx)
+CFE_Status_t CFE_ES_CounterID_ToIndex(CFE_ES_CounterId_t CounterId, uint32 *Idx)
 {
     UT_GenStub_SetupReturnBuffer(CFE_ES_CounterID_ToIndex, CFE_Status_t);
 
-    UT_GenStub_AddParam(CFE_ES_CounterID_ToIndex, CFE_ES_CounterId_t, CounterID);
+    UT_GenStub_AddParam(CFE_ES_CounterID_ToIndex, CFE_ES_CounterId_t, CounterId);
     UT_GenStub_AddParam(CFE_ES_CounterID_ToIndex, uint32 *, Idx);
 
     UT_GenStub_Execute(CFE_ES_CounterID_ToIndex, Basic, NULL);
@@ -468,12 +468,12 @@ int32 CFE_ES_GetModuleInfo(CFE_ES_AppInfo_t *ModuleInfo, CFE_ResourceId_t Resour
  * Generated stub function for CFE_ES_GetPoolBuf()
  * ----------------------------------------------------
  */
-int32 CFE_ES_GetPoolBuf(CFE_ES_MemPoolBuf_t *BufPtr, CFE_ES_MemHandle_t PoolID, size_t Size)
+int32 CFE_ES_GetPoolBuf(CFE_ES_MemPoolBuf_t *BufPtr, CFE_ES_MemHandle_t Handle, size_t Size)
 {
     UT_GenStub_SetupReturnBuffer(CFE_ES_GetPoolBuf, int32);
 
     UT_GenStub_AddParam(CFE_ES_GetPoolBuf, CFE_ES_MemPoolBuf_t *, BufPtr);
-    UT_GenStub_AddParam(CFE_ES_GetPoolBuf, CFE_ES_MemHandle_t, PoolID);
+    UT_GenStub_AddParam(CFE_ES_GetPoolBuf, CFE_ES_MemHandle_t, Handle);
     UT_GenStub_AddParam(CFE_ES_GetPoolBuf, size_t, Size);
 
     UT_GenStub_Execute(CFE_ES_GetPoolBuf, Basic, UT_DefaultHandler_CFE_ES_GetPoolBuf);
@@ -486,11 +486,11 @@ int32 CFE_ES_GetPoolBuf(CFE_ES_MemPoolBuf_t *BufPtr, CFE_ES_MemHandle_t PoolID,
  * Generated stub function for CFE_ES_GetPoolBufInfo()
  * ----------------------------------------------------
  */
-CFE_Status_t CFE_ES_GetPoolBufInfo(CFE_ES_MemHandle_t PoolID, CFE_ES_MemPoolBuf_t BufPtr)
+CFE_Status_t CFE_ES_GetPoolBufInfo(CFE_ES_MemHandle_t Handle, CFE_ES_MemPoolBuf_t BufPtr)
 {
     UT_GenStub_SetupReturnBuffer(CFE_ES_GetPoolBufInfo, CFE_Status_t);
 
-    UT_GenStub_AddParam(CFE_ES_GetPoolBufInfo, CFE_ES_MemHandle_t, PoolID);
+    UT_GenStub_AddParam(CFE_ES_GetPoolBufInfo, CFE_ES_MemHandle_t, Handle);
     UT_GenStub_AddParam(CFE_ES_GetPoolBufInfo, CFE_ES_MemPoolBuf_t, BufPtr);
 
     UT_GenStub_Execute(CFE_ES_GetPoolBufInfo, Basic, NULL);
@@ -614,11 +614,11 @@ void CFE_ES_IncrementTaskCounter(void)
  * Generated stub function for CFE_ES_LibID_ToIndex()
  * ----------------------------------------------------
  */
-int32 CFE_ES_LibID_ToIndex(CFE_ES_LibId_t LibID, uint32 *Idx)
+int32 CFE_ES_LibID_ToIndex(CFE_ES_LibId_t LibId, uint32 *Idx)
 {
     UT_GenStub_SetupReturnBuffer(CFE_ES_LibID_ToIndex, int32);
 
-    UT_GenStub_AddParam(CFE_ES_LibID_ToIndex, CFE_ES_LibId_t, LibID);
+    UT_GenStub_AddParam(CFE_ES_LibID_ToIndex, CFE_ES_LibId_t, LibId);
     UT_GenStub_AddParam(CFE_ES_LibID_ToIndex, uint32 *, Idx);
 
     UT_GenStub_Execute(CFE_ES_LibID_ToIndex, Basic, NULL);
@@ -744,11 +744,11 @@ void CFE_ES_ProcessAsyncEvent(void)
  * Generated stub function for CFE_ES_PutPoolBuf()
  * ----------------------------------------------------
  */
-int32 CFE_ES_PutPoolBuf(CFE_ES_MemHandle_t PoolID, CFE_ES_MemPoolBuf_t BufPtr)
+int32 CFE_ES_PutPoolBuf(CFE_ES_MemHandle_t Handle, CFE_ES_MemPoolBuf_t BufPtr)
 {
     UT_GenStub_SetupReturnBuffer(CFE_ES_PutPoolBuf, int32);
 
-    UT_GenStub_AddParam(CFE_ES_PutPoolBuf, CFE_ES_MemHandle_t, PoolID);
+    UT_GenStub_AddParam(CFE_ES_PutPoolBuf, CFE_ES_MemHandle_t, Handle);
     UT_GenStub_AddParam(CFE_ES_PutPoolBuf, CFE_ES_MemPoolBuf_t, BufPtr);
 
     UT_GenStub_Execute(CFE_ES_PutPoolBuf, Basic, NULL);
@@ -761,11 +761,11 @@ int32 CFE_ES_PutPoolBuf(CFE_ES_MemHandle_t PoolID, CFE_ES_MemPoolBuf_t BufPtr)
  * Generated stub function for CFE_ES_RegisterCDS()
  * ----------------------------------------------------
  */
-CFE_Status_t CFE_ES_RegisterCDS(CFE_ES_CDSHandle_t *HandlePtr, size_t BlockSize, const char *Name)
+CFE_Status_t CFE_ES_RegisterCDS(CFE_ES_CDSHandle_t *CDSHandlePtr, size_t BlockSize, const char *Name)
 {
     UT_GenStub_SetupReturnBuffer(CFE_ES_RegisterCDS, CFE_Status_t);
 
-    UT_GenStub_AddParam(CFE_ES_RegisterCDS, CFE_ES_CDSHandle_t *, HandlePtr);
+    UT_GenStub_AddParam(CFE_ES_RegisterCDS, CFE_ES_CDSHandle_t *, CDSHandlePtr);
     UT_GenStub_AddParam(CFE_ES_RegisterCDS, size_t, BlockSize);
     UT_GenStub_AddParam(CFE_ES_RegisterCDS, const char *, Name);
 
@@ -862,11 +862,11 @@ CFE_Status_t CFE_ES_RestoreFromCDS(void *RestoreToMemory, CFE_ES_CDSHandle_t Han
  * Generated stub function for CFE_ES_RunLoop()
  * ----------------------------------------------------
  */
-bool CFE_ES_RunLoop(uint32 *ExitStatus)
+bool CFE_ES_RunLoop(uint32 *RunStatus)
 {
     UT_GenStub_SetupReturnBuffer(CFE_ES_RunLoop, bool);
 
-    UT_GenStub_AddParam(CFE_ES_RunLoop, uint32 *, ExitStatus);
+    UT_GenStub_AddParam(CFE_ES_RunLoop, uint32 *, RunStatus);
 
     UT_GenStub_Execute(CFE_ES_RunLoop, Basic, UT_DefaultHandler_CFE_ES_RunLoop);
 
diff --git a/modules/core_api/ut-stubs/src/cfe_evs_stubs.c b/modules/core_api/ut-stubs/src/cfe_evs_stubs.c
index 72fd2ec5c..4ee8afc67 100644
--- a/modules/core_api/ut-stubs/src/cfe_evs_stubs.c
+++ b/modules/core_api/ut-stubs/src/cfe_evs_stubs.c
@@ -38,12 +38,12 @@ extern void UT_DefaultHandler_CFE_EVS_SendTimedEvent(void *, UT_EntryKey_t, cons
  * Generated stub function for CFE_EVS_Register()
  * ----------------------------------------------------
  */
-CFE_Status_t CFE_EVS_Register(const void *Filters, uint16 NumFilteredEvents, uint16 FilterScheme)
+CFE_Status_t CFE_EVS_Register(const void *Filters, uint16 NumEventFilters, uint16 FilterScheme)
 {
     UT_GenStub_SetupReturnBuffer(CFE_EVS_Register, CFE_Status_t);
 
     UT_GenStub_AddParam(CFE_EVS_Register, const void *, Filters);
-    UT_GenStub_AddParam(CFE_EVS_Register, uint16, NumFilteredEvents);
+    UT_GenStub_AddParam(CFE_EVS_Register, uint16, NumEventFilters);
     UT_GenStub_AddParam(CFE_EVS_Register, uint16, FilterScheme);
 
     UT_GenStub_Execute(CFE_EVS_Register, Basic, NULL);
diff --git a/modules/core_api/ut-stubs/src/cfe_msg_stubs.c b/modules/core_api/ut-stubs/src/cfe_msg_stubs.c
index 759cfd74c..1c5b6059f 100644
--- a/modules/core_api/ut-stubs/src/cfe_msg_stubs.c
+++ b/modules/core_api/ut-stubs/src/cfe_msg_stubs.c
@@ -492,12 +492,12 @@ CFE_Status_t CFE_MSG_SetMsgId(CFE_MSG_Message_t *MsgPtr, CFE_SB_MsgId_t MsgId)
  * Generated stub function for CFE_MSG_SetMsgTime()
  * ----------------------------------------------------
  */
-CFE_Status_t CFE_MSG_SetMsgTime(CFE_MSG_Message_t *MsgPtr, CFE_TIME_SysTime_t Time)
+CFE_Status_t CFE_MSG_SetMsgTime(CFE_MSG_Message_t *MsgPtr, CFE_TIME_SysTime_t NewTime)
 {
     UT_GenStub_SetupReturnBuffer(CFE_MSG_SetMsgTime, CFE_Status_t);
 
     UT_GenStub_AddParam(CFE_MSG_SetMsgTime, CFE_MSG_Message_t *, MsgPtr);
-    UT_GenStub_AddParam(CFE_MSG_SetMsgTime, CFE_TIME_SysTime_t, Time);
+    UT_GenStub_AddParam(CFE_MSG_SetMsgTime, CFE_TIME_SysTime_t, NewTime);
 
     UT_GenStub_Execute(CFE_MSG_SetMsgTime, Basic, NULL);
 
diff --git a/modules/core_api/ut-stubs/src/cfe_sb_stubs.c b/modules/core_api/ut-stubs/src/cfe_sb_stubs.c
index 35035222a..10c14c53c 100644
--- a/modules/core_api/ut-stubs/src/cfe_sb_stubs.c
+++ b/modules/core_api/ut-stubs/src/cfe_sb_stubs.c
@@ -133,12 +133,12 @@ CFE_Status_t CFE_SB_GetPipeName(char *PipeNameBuf, size_t PipeNameSize, CFE_SB_P
  * Generated stub function for CFE_SB_GetPipeOpts()
  * ----------------------------------------------------
  */
-CFE_Status_t CFE_SB_GetPipeOpts(CFE_SB_PipeId_t PipeId, uint8 *OptPtr)
+CFE_Status_t CFE_SB_GetPipeOpts(CFE_SB_PipeId_t PipeId, uint8 *OptsPtr)
 {
     UT_GenStub_SetupReturnBuffer(CFE_SB_GetPipeOpts, CFE_Status_t);
 
     UT_GenStub_AddParam(CFE_SB_GetPipeOpts, CFE_SB_PipeId_t, PipeId);
-    UT_GenStub_AddParam(CFE_SB_GetPipeOpts, uint8 *, OptPtr);
+    UT_GenStub_AddParam(CFE_SB_GetPipeOpts, uint8 *, OptsPtr);
 
     UT_GenStub_Execute(CFE_SB_GetPipeOpts, Basic, NULL);