diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index d48a1692..96148c1b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -10,7 +10,7 @@ A clear and concise description of what the contribution is.
 **Testing performed**
 Steps taken to test the contribution:
 1. Build steps '...'
-1. Execution steps '...'
+2. Execution steps '...'
 
 **Expected behavior changes**
 A clear and concise description of how this contribution will change behavior and level of impact.
diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml
index 69a424f7..7a1e14b7 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
     uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
-    with: 
+    with:
       component-path: psp
       make: 'make -C build/native/default_cpu1/psp'
diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml
index e4501110..e1da057b 100644
--- a/.github/workflows/icbundle.yml
+++ b/.github/workflows/icbundle.yml
@@ -59,13 +59,13 @@ jobs:
           done
           changelog_entry="${changelog_entry}\n${see_entry}\n"
           sed -ir "s|# Changelog|$changelog_entry|" CHANGELOG.md
-          
+
           buildnumber_entry=$'#define CFE_PSP_IMPL_BUILD_NUMBER   '${rev_num}
           sed -ir "s|#define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/mcp750-vxworks/inc/psp_version.h
-          
+
           buildnumber_entry=$'#define CFE_PSP_IMPL_BUILD_NUMBER   '${rev_num}
           sed -ir "s|#define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/pc-linux/inc/psp_version.h
-          
+
           buildnumber_entry=$'#define CFE_PSP_IMPL_BUILD_NUMBER   '${rev_num}
           sed -ir "s|#define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/pc-rtems/inc/psp_version.h
       - name: Commit and Push Updates to IC Branch
diff --git a/fsw/mcp750-vxworks/src/cfe_psp_memory.c b/fsw/mcp750-vxworks/src/cfe_psp_memory.c
index 911c4d6a..9bb4cd44 100644
--- a/fsw/mcp750-vxworks/src/cfe_psp_memory.c
+++ b/fsw/mcp750-vxworks/src/cfe_psp_memory.c
@@ -530,7 +530,7 @@ int32 CFE_PSP_GetCFETextSegmentInfo(cpuaddr *PtrToCFESegment, uint32 *SizeOfCFES
             }
             else
             {
-                return_code = CFE_PSP_SUCCESS;
+                return_code = CFE_PSP_ERROR;
             }
         }
     }
diff --git a/ut-stubs/src/cfe_psp_cds_api_handlers.c b/ut-stubs/src/cfe_psp_cds_api_handlers.c
index 696723c3..eaf66b0f 100644
--- a/ut-stubs/src/cfe_psp_cds_api_handlers.c
+++ b/ut-stubs/src/cfe_psp_cds_api_handlers.c
@@ -17,7 +17,7 @@
  ************************************************************************/
 
 /*
-** File: ut_bsp_stubs.c
+** File: cfe_psp_cds_api_handlers.c
 **
 ** Purpose:
 ** Unit test stubs for BSP routines
diff --git a/ut-stubs/src/cfe_psp_exception_api_handlers.c b/ut-stubs/src/cfe_psp_exception_api_handlers.c
index e7e10ba1..8b87de2f 100644
--- a/ut-stubs/src/cfe_psp_exception_api_handlers.c
+++ b/ut-stubs/src/cfe_psp_exception_api_handlers.c
@@ -17,7 +17,7 @@
  ************************************************************************/
 
 /*
-** File: ut_bsp_stubs.c
+** File: cfe_psp_exception_api_handlers.c
 **
 ** Purpose:
 ** Unit test stubs for BSP routines
diff --git a/ut-stubs/src/cfe_psp_id_api_handlers.c b/ut-stubs/src/cfe_psp_id_api_handlers.c
index d57f1be1..441bfc72 100644
--- a/ut-stubs/src/cfe_psp_id_api_handlers.c
+++ b/ut-stubs/src/cfe_psp_id_api_handlers.c
@@ -17,7 +17,7 @@
  ************************************************************************/
 
 /*
-** File: ut_bsp_stubs.c
+** File: cfe_psp_id_api_handlers.c
 **
 ** Purpose:
 ** Unit test stubs for BSP routines
diff --git a/ut-stubs/src/cfe_psp_memrange_api_handlers.c b/ut-stubs/src/cfe_psp_memrange_api_handlers.c
index 0c679db3..93feae7b 100644
--- a/ut-stubs/src/cfe_psp_memrange_api_handlers.c
+++ b/ut-stubs/src/cfe_psp_memrange_api_handlers.c
@@ -17,7 +17,7 @@
  ************************************************************************/
 
 /*
-** File: ut_bsp_stubs.c
+** File: cfe_psp_memrange_api_handlers.c
 **
 ** Purpose:
 ** Unit test stubs for BSP routines
diff --git a/ut-stubs/src/cfe_psp_timertick_api_handlers.c b/ut-stubs/src/cfe_psp_timertick_api_handlers.c
index c52bd5f4..06d84a2c 100644
--- a/ut-stubs/src/cfe_psp_timertick_api_handlers.c
+++ b/ut-stubs/src/cfe_psp_timertick_api_handlers.c
@@ -17,7 +17,7 @@
  ************************************************************************/
 
 /*
-** File: ut_bsp_stubs.c
+** File: cfe_psp_timertick_api_handlers.c
 **
 ** Purpose:
 ** Unit test stubs for BSP routines
diff --git a/ut-stubs/src/cfe_psp_version_api_handlers.c b/ut-stubs/src/cfe_psp_version_api_handlers.c
index 07700ce0..4685457d 100644
--- a/ut-stubs/src/cfe_psp_version_api_handlers.c
+++ b/ut-stubs/src/cfe_psp_version_api_handlers.c
@@ -17,7 +17,7 @@
  ************************************************************************/
 
 /*
-** File: ut_bsp_stubs.c
+** File: cfe_psp_version_api_handlers.c
 **
 ** Purpose:
 ** Unit test stubs for BSP routines
diff --git a/ut-stubs/src/cfe_psp_watchdog_api_handlers.c b/ut-stubs/src/cfe_psp_watchdog_api_handlers.c
index 501e1e23..65cdf2b9 100644
--- a/ut-stubs/src/cfe_psp_watchdog_api_handlers.c
+++ b/ut-stubs/src/cfe_psp_watchdog_api_handlers.c
@@ -17,7 +17,7 @@
  ************************************************************************/
 
 /*
-** File: ut_bsp_stubs.c
+** File: cfe_psp_watchdog_api_handlers.c
 **
 ** Purpose:
 ** Unit test stubs for BSP routines