diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml
index a364b0b..9e71f60 100644
--- a/.github/workflows/codeql-build.yml
+++ b/.github/workflows/codeql-build.yml
@@ -3,11 +3,11 @@ name: "CodeQL Analysis"
 on:
   push:
   pull_request:
-  
+
 jobs:
   codeql:
     name: CodeQL Analysis
     uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
-    with: 
+    with:
       component-path: apps/ci_lab
       make: 'make -C build/native/default_cpu1/apps/ci_lab'
diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c
index 11c9d0a..5eacb4b 100644
--- a/fsw/src/ci_lab_app.c
+++ b/fsw/src/ci_lab_app.c
@@ -48,7 +48,7 @@ CI_LAB_GlobalData_t CI_LAB_Global;
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *  * *  * * * * **/
 void CI_Lab_AppMain(void)
 {
-    int32            status;
+    CFE_Status_t     status;
     uint32           RunStatus = CFE_ES_RunStatus_APP_RUN;
     CFE_SB_Buffer_t *SBBufPtr;
 
@@ -177,9 +177,9 @@ void CI_LAB_ResetCounters_Internal(void)
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
 void CI_LAB_ReadUpLink(void)
 {
-    int    i;
-    int32  status;
-    uint8 *bytes;
+    int          i;
+    CFE_Status_t status;
+    uint8 *      bytes;
 
     for (i = 0; i <= 10; i++)
     {