diff --git a/fsw/cfe-core/ut-stubs/ut_evs_stubs.c b/fsw/cfe-core/ut-stubs/ut_evs_stubs.c
index 3fe8038c9..5aa12224e 100644
--- a/fsw/cfe-core/ut-stubs/ut_evs_stubs.c
+++ b/fsw/cfe-core/ut-stubs/ut_evs_stubs.c
@@ -288,7 +288,7 @@ int32 CFE_EVS_SendEventWithAppID(uint16 EventID,
 **        Returns either a user-defined status flag or CFE_SUCCESS.
 **
 ******************************************************************************/
-int32 CFE_EVS_CleanUpApp(uint32 AppId)
+int32 CFE_EVS_CleanUpApp(CFE_ES_ResourceID_t AppId)
 {
     int32 status;
 
diff --git a/fsw/cfe-core/ut-stubs/ut_sb_stubs.c b/fsw/cfe-core/ut-stubs/ut_sb_stubs.c
index eff6d89cf..2ccc1bce5 100644
--- a/fsw/cfe-core/ut-stubs/ut_sb_stubs.c
+++ b/fsw/cfe-core/ut-stubs/ut_sb_stubs.c
@@ -765,7 +765,7 @@ uint16 CFE_SB_GetTotalMsgLength(const CFE_SB_Msg_t *MsgPtr)
 **        This function does not return a value.
 **
 ******************************************************************************/
-int32 CFE_SB_CleanUpApp(uint32 AppId)
+int32 CFE_SB_CleanUpApp(CFE_ES_ResourceID_t AppId)
 {
     int32 status;
 
diff --git a/fsw/cfe-core/ut-stubs/ut_tbl_stubs.c b/fsw/cfe-core/ut-stubs/ut_tbl_stubs.c
index b0befc23c..2fbef0ad1 100644
--- a/fsw/cfe-core/ut-stubs/ut_tbl_stubs.c
+++ b/fsw/cfe-core/ut-stubs/ut_tbl_stubs.c
@@ -91,7 +91,7 @@ void CFE_TBL_TaskMain(void)
 **        Returns CFE_SUCCESS.
 **
 ******************************************************************************/
-int32 CFE_TBL_CleanUpApp(uint32 AppId)
+int32 CFE_TBL_CleanUpApp(CFE_ES_ResourceID_t AppId)
 {
     int32 status;
 
diff --git a/fsw/cfe-core/ut-stubs/ut_time_stubs.c b/fsw/cfe-core/ut-stubs/ut_time_stubs.c
index a52720d0c..51a8df2c9 100644
--- a/fsw/cfe-core/ut-stubs/ut_time_stubs.c
+++ b/fsw/cfe-core/ut-stubs/ut_time_stubs.c
@@ -171,7 +171,7 @@ CFE_TIME_SysTime_t CFE_TIME_GetTime(void)
 **        Returns either a user-defined status flag or CFE_SUCCESS.
 **
 ******************************************************************************/
-int32 CFE_TIME_CleanUpApp(uint32 AppId)
+int32 CFE_TIME_CleanUpApp(CFE_ES_ResourceID_t AppId)
 {
     int32 status;