diff --git a/README.md b/README.md
index 730d25e0c..937320ce8 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,13 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 
 ## Version History
 
+### Development Build: v6.0.0-rc4+dev42
+
+- Resolve UT uninitialized variable warnings
+- Add ut_assert to doxygen and fix warnings
+- Protect if OS_FDGetInfo called on socket
+- See <https://github.com/nasa/osal/pull/1226> and <https://github.com/nasa/cFS/pull/432>
+
 ### Development Build: v6.0.0-rc4+dev32
 
 - Typesafe definition of osal_id_t
diff --git a/docs/osal-detaildesign.doxyfile.in b/docs/osal-detaildesign.doxyfile.in
index 5eaf80d47..ee0602016 100644
--- a/docs/osal-detaildesign.doxyfile.in
+++ b/docs/osal-detaildesign.doxyfile.in
@@ -5,3 +5,5 @@
 INPUT    += @osal_MISSION_DIR@/src/os
 INPUT    += @osal_MISSION_DIR@/src/bsp
 
+# Include ut_assert documentation in detail design document
+INPUT    += @osal_MISSION_DIR@/ut_assert
diff --git a/src/bsp/shared/src/osapi-bsp.c b/src/bsp/shared/src/osapi-bsp.c
index 015b738c9..dac87a425 100644
--- a/src/bsp/shared/src/osapi-bsp.c
+++ b/src/bsp/shared/src/osapi-bsp.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-bsp.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  * This file  contains some of the OS APIs abstraction layer code
diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
index 9aaf2915f..fa668d038 100644
--- a/src/os/inc/osapi-version.h
+++ b/src/os/inc/osapi-version.h
@@ -36,7 +36,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   32
+#define OS_BUILD_NUMBER   42
 #define OS_BUILD_BASELINE "v6.0.0-rc4"
 
 /*
diff --git a/src/os/portable/os-impl-bsd-select.c b/src/os/portable/os-impl-bsd-select.c
index b41832f24..b812aa105 100644
--- a/src/os/portable/os-impl-bsd-select.c
+++ b/src/os/portable/os-impl-bsd-select.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-bsd-select.c
+ * \file
  * \author joseph.p.hickey@nasa.gov
  *
  * Purpose: This file contains wrappers around the select() system call
@@ -126,9 +126,10 @@ static int32 OS_FdSet_ConvertIn_Impl(int *os_maxfd, fd_set *os_set, const OS_FdS
  *
  * This un-sets bits in OSAL_set that are set in the OS_set
  *
- * \param[in]      OS_set   The fd_set from select
- * \param[in, out] OSAL_set The OS_FdSet updated by this helper
- *-----------------------------------------------------------------*/
+ * \param[in]     OS_set   The fd_set from select
+ * \param[in,out] OSAL_set The OS_FdSet updated by this helper
+ */
+/*-----------------------------------------------------------------*/
 static void OS_FdSet_ConvertOut_Impl(fd_set *OS_set, OS_FdSet *OSAL_set)
 {
     size_t       offset;
diff --git a/src/os/portable/os-impl-bsd-sockets.c b/src/os/portable/os-impl-bsd-sockets.c
index 1d8d8f4f5..53cac5237 100644
--- a/src/os/portable/os-impl-bsd-sockets.c
+++ b/src/os/portable/os-impl-bsd-sockets.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-bsd-sockets.c
+ * \file
  * \author joseph.p.hickey@nasa.gov
  *
  * Purpose: This file contains the network functionality for
diff --git a/src/os/portable/os-impl-console-bsp.c b/src/os/portable/os-impl-console-bsp.c
index cf628950c..946a8c056 100644
--- a/src/os/portable/os-impl-console-bsp.c
+++ b/src/os/portable/os-impl-console-bsp.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-console-bsp.c
+ * \file
  * \author joseph.p.hickey@nasa.gov
  *
  * Purpose:
diff --git a/src/os/portable/os-impl-no-loader.c b/src/os/portable/os-impl-no-loader.c
index b576bff62..59e0b8aeb 100644
--- a/src/os/portable/os-impl-no-loader.c
+++ b/src/os/portable/os-impl-no-loader.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-no-loader.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  * This file contains a module loader implementation for systems
diff --git a/src/os/portable/os-impl-no-network.c b/src/os/portable/os-impl-no-network.c
index b25a6faf9..434e9b8a8 100644
--- a/src/os/portable/os-impl-no-network.c
+++ b/src/os/portable/os-impl-no-network.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-no-network.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  * This file contains the network implementation for
diff --git a/src/os/portable/os-impl-no-shell.c b/src/os/portable/os-impl-no-shell.c
index 77ca23208..f551e9f22 100644
--- a/src/os/portable/os-impl-no-shell.c
+++ b/src/os/portable/os-impl-no-shell.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-no-shell.c
+ * \file
  *
  * No shell implementation, returns OS_ERR_NOT_IMPLEMENTED for calls
  */
diff --git a/src/os/portable/os-impl-no-sockets.c b/src/os/portable/os-impl-no-sockets.c
index 49143764e..f04caef3d 100644
--- a/src/os/portable/os-impl-no-sockets.c
+++ b/src/os/portable/os-impl-no-sockets.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-no-sockets.c
+ * \file
  * \author joseph.p.hickey@nasa.gov
  *
  * Purpose: All functions return OS_ERR_NOT_IMPLEMENTED.
diff --git a/src/os/portable/os-impl-no-symtab.c b/src/os/portable/os-impl-no-symtab.c
index 5a36ecee9..97e6c3ca6 100644
--- a/src/os/portable/os-impl-no-symtab.c
+++ b/src/os/portable/os-impl-no-symtab.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-no-symtab.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  * This file contains a symbol table implementation for systems
diff --git a/src/os/portable/os-impl-posix-dirs.c b/src/os/portable/os-impl-posix-dirs.c
index 87467960d..ef57a7ca0 100644
--- a/src/os/portable/os-impl-posix-dirs.c
+++ b/src/os/portable/os-impl-posix-dirs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-posix-dirs.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  * This file Contains all of the api calls for manipulating files
diff --git a/src/os/portable/os-impl-posix-dl-loader.c b/src/os/portable/os-impl-posix-dl-loader.c
index 3843d5050..d2c6aad52 100644
--- a/src/os/portable/os-impl-posix-dl-loader.c
+++ b/src/os/portable/os-impl-posix-dl-loader.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-posix-dl-loader.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  * This file contains a module loader implementation for systems
diff --git a/src/os/portable/os-impl-posix-dl-symtab.c b/src/os/portable/os-impl-posix-dl-symtab.c
index 81d578ad3..261932355 100644
--- a/src/os/portable/os-impl-posix-dl-symtab.c
+++ b/src/os/portable/os-impl-posix-dl-symtab.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-posix-dl-symtab.c
+ * \file
  * \author joseph.p.hickey@nasa.gov
  *
  * This file contains a module loader implementation for systems
diff --git a/src/os/portable/os-impl-posix-files.c b/src/os/portable/os-impl-posix-files.c
index 52da3a36e..dc3db7724 100644
--- a/src/os/portable/os-impl-posix-files.c
+++ b/src/os/portable/os-impl-posix-files.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-posix-files.c
+ * \file
  * \author joseph.p.hickey@nasa.gov
  *
  * This file Contains all of the api calls for manipulating files
diff --git a/src/os/portable/os-impl-posix-gettime.c b/src/os/portable/os-impl-posix-gettime.c
index 07fd7e3f9..3fe5eb310 100644
--- a/src/os/portable/os-impl-posix-gettime.c
+++ b/src/os/portable/os-impl-posix-gettime.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-posix-gettime.c
+ * \file
  * \author joseph.p.hickey@nasa.gov
  *
  * This file contains implementation for OS_GetLocalTime() and OS_SetLocalTime()
diff --git a/src/os/portable/os-impl-posix-io.c b/src/os/portable/os-impl-posix-io.c
index f6b2e3107..bc12baf00 100644
--- a/src/os/portable/os-impl-posix-io.c
+++ b/src/os/portable/os-impl-posix-io.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file   os-impl-posix-io.c
+ * \file
  * \author joseph.p.hickey@nasa.gov
  *
  * This file contains generic calls for manipulating filehandles
diff --git a/src/os/portable/os-impl-posix-network.c b/src/os/portable/os-impl-posix-network.c
index f6d5f540a..9f74b5607 100644
--- a/src/os/portable/os-impl-posix-network.c
+++ b/src/os/portable/os-impl-posix-network.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-posix-network.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  * This file contains the network functionality for
diff --git a/src/os/posix/src/os-impl-binsem.c b/src/os/posix/src/os-impl-binsem.c
index c794407ce..7c7c19bf4 100644
--- a/src/os/posix/src/os-impl-binsem.c
+++ b/src/os/posix/src/os-impl-binsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-binsem.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-common.c b/src/os/posix/src/os-impl-common.c
index 8fbd44ea4..6f54e8510 100644
--- a/src/os/posix/src/os-impl-common.c
+++ b/src/os/posix/src/os-impl-common.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-common.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-console.c b/src/os/posix/src/os-impl-console.c
index b6770fa25..3716acb66 100644
--- a/src/os/posix/src/os-impl-console.c
+++ b/src/os/posix/src/os-impl-console.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-console.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-countsem.c b/src/os/posix/src/os-impl-countsem.c
index ea79b88e3..d7374c424 100644
--- a/src/os/posix/src/os-impl-countsem.c
+++ b/src/os/posix/src/os-impl-countsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-countsem.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-dirs.c b/src/os/posix/src/os-impl-dirs.c
index 0e5b9b644..0dbc72138 100644
--- a/src/os/posix/src/os-impl-dirs.c
+++ b/src/os/posix/src/os-impl-dirs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-dirs.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-errors.c b/src/os/posix/src/os-impl-errors.c
index 4b32d8207..a34a9783e 100644
--- a/src/os/posix/src/os-impl-errors.c
+++ b/src/os/posix/src/os-impl-errors.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-errors.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-files.c b/src/os/posix/src/os-impl-files.c
index c828947b0..7fae2a057 100644
--- a/src/os/posix/src/os-impl-files.c
+++ b/src/os/posix/src/os-impl-files.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-files.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-filesys.c b/src/os/posix/src/os-impl-filesys.c
index 4213b39ad..d80d77f4b 100644
--- a/src/os/posix/src/os-impl-filesys.c
+++ b/src/os/posix/src/os-impl-filesys.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-filesys.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-heap.c b/src/os/posix/src/os-impl-heap.c
index db330bc1a..8587a0be7 100644
--- a/src/os/posix/src/os-impl-heap.c
+++ b/src/os/posix/src/os-impl-heap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-heap.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-idmap.c b/src/os/posix/src/os-impl-idmap.c
index 60c7ce0c2..7cc7dfc3e 100644
--- a/src/os/posix/src/os-impl-idmap.c
+++ b/src/os/posix/src/os-impl-idmap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-idmap.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-loader.c b/src/os/posix/src/os-impl-loader.c
index 8e8f7f606..40d3333c1 100644
--- a/src/os/posix/src/os-impl-loader.c
+++ b/src/os/posix/src/os-impl-loader.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-loader.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-mutex.c b/src/os/posix/src/os-impl-mutex.c
index 5a0e43593..a4914f077 100644
--- a/src/os/posix/src/os-impl-mutex.c
+++ b/src/os/posix/src/os-impl-mutex.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-mutex.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-no-module.c b/src/os/posix/src/os-impl-no-module.c
index c7c2c0ffb..8ed70970c 100644
--- a/src/os/posix/src/os-impl-no-module.c
+++ b/src/os/posix/src/os-impl-no-module.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-no-module.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-queues.c b/src/os/posix/src/os-impl-queues.c
index 87ce7e935..55a004b58 100644
--- a/src/os/posix/src/os-impl-queues.c
+++ b/src/os/posix/src/os-impl-queues.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-queues.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-shell.c b/src/os/posix/src/os-impl-shell.c
index 4b5d7cf23..265396a04 100644
--- a/src/os/posix/src/os-impl-shell.c
+++ b/src/os/posix/src/os-impl-shell.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-shell.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-tasks.c b/src/os/posix/src/os-impl-tasks.c
index e45beefa9..235b7d758 100644
--- a/src/os/posix/src/os-impl-tasks.c
+++ b/src/os/posix/src/os-impl-tasks.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-tasks.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/posix/src/os-impl-timebase.c b/src/os/posix/src/os-impl-timebase.c
index fd30f78fa..d23be616a 100644
--- a/src/os/posix/src/os-impl-timebase.c
+++ b/src/os/posix/src/os-impl-timebase.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-timebase.c
+ * \file
  * \ingroup  posix
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-binsem.c b/src/os/rtems/src/os-impl-binsem.c
index 8d15204fa..a4067a63c 100644
--- a/src/os/rtems/src/os-impl-binsem.c
+++ b/src/os/rtems/src/os-impl-binsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-binsem.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-common.c b/src/os/rtems/src/os-impl-common.c
index 5e32e286b..6b81b65b9 100644
--- a/src/os/rtems/src/os-impl-common.c
+++ b/src/os/rtems/src/os-impl-common.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-common.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-console.c b/src/os/rtems/src/os-impl-console.c
index 02458693a..895a69010 100644
--- a/src/os/rtems/src/os-impl-console.c
+++ b/src/os/rtems/src/os-impl-console.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-console.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-countsem.c b/src/os/rtems/src/os-impl-countsem.c
index 33b1719b6..9512d330a 100644
--- a/src/os/rtems/src/os-impl-countsem.c
+++ b/src/os/rtems/src/os-impl-countsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-countsem.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-dirs.c b/src/os/rtems/src/os-impl-dirs.c
index e5ede708b..16c027d7e 100644
--- a/src/os/rtems/src/os-impl-dirs.c
+++ b/src/os/rtems/src/os-impl-dirs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-dirs.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-errors.c b/src/os/rtems/src/os-impl-errors.c
index c0f59f2c8..3ef729a62 100644
--- a/src/os/rtems/src/os-impl-errors.c
+++ b/src/os/rtems/src/os-impl-errors.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-errors.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-files.c b/src/os/rtems/src/os-impl-files.c
index 48e76807d..0f6f0b751 100644
--- a/src/os/rtems/src/os-impl-files.c
+++ b/src/os/rtems/src/os-impl-files.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-files.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-filesys.c b/src/os/rtems/src/os-impl-filesys.c
index 4bdea8453..4fd8d7f25 100644
--- a/src/os/rtems/src/os-impl-filesys.c
+++ b/src/os/rtems/src/os-impl-filesys.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-filesys.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-heap.c b/src/os/rtems/src/os-impl-heap.c
index 4e67125cb..64769eec9 100644
--- a/src/os/rtems/src/os-impl-heap.c
+++ b/src/os/rtems/src/os-impl-heap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-heap.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-idmap.c b/src/os/rtems/src/os-impl-idmap.c
index cdce72602..8e1e77773 100644
--- a/src/os/rtems/src/os-impl-idmap.c
+++ b/src/os/rtems/src/os-impl-idmap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-idmap.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-loader.c b/src/os/rtems/src/os-impl-loader.c
index 21b086370..93b864dc6 100644
--- a/src/os/rtems/src/os-impl-loader.c
+++ b/src/os/rtems/src/os-impl-loader.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-loader.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-mutex.c b/src/os/rtems/src/os-impl-mutex.c
index 48874bdcc..db36169c1 100644
--- a/src/os/rtems/src/os-impl-mutex.c
+++ b/src/os/rtems/src/os-impl-mutex.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-mutex.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-network.c b/src/os/rtems/src/os-impl-network.c
index 19c92e485..3f04e6a82 100644
--- a/src/os/rtems/src/os-impl-network.c
+++ b/src/os/rtems/src/os-impl-network.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-network.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-no-module.c b/src/os/rtems/src/os-impl-no-module.c
index c70a0e8be..6b13b2c4a 100644
--- a/src/os/rtems/src/os-impl-no-module.c
+++ b/src/os/rtems/src/os-impl-no-module.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-no-module.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-queues.c b/src/os/rtems/src/os-impl-queues.c
index 2e8ec2188..066e5864a 100644
--- a/src/os/rtems/src/os-impl-queues.c
+++ b/src/os/rtems/src/os-impl-queues.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-queues.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-tasks.c b/src/os/rtems/src/os-impl-tasks.c
index 99407107c..e4e952715 100644
--- a/src/os/rtems/src/os-impl-tasks.c
+++ b/src/os/rtems/src/os-impl-tasks.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-tasks.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/rtems/src/os-impl-timebase.c b/src/os/rtems/src/os-impl-timebase.c
index b85151630..7db55ef49 100644
--- a/src/os/rtems/src/os-impl-timebase.c
+++ b/src/os/rtems/src/os-impl-timebase.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-timebase.c
+ * \file
  * \ingroup  rtems
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-binsem.c b/src/os/shared/src/osapi-binsem.c
index c068f529c..1bd44580b 100644
--- a/src/os/shared/src/osapi-binsem.c
+++ b/src/os/shared/src/osapi-binsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-binsem.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-clock.c b/src/os/shared/src/osapi-clock.c
index d5a844376..26f1c4e7c 100644
--- a/src/os/shared/src/osapi-clock.c
+++ b/src/os/shared/src/osapi-clock.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-clock.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-common.c b/src/os/shared/src/osapi-common.c
index d466f4d03..606bc5657 100644
--- a/src/os/shared/src/osapi-common.c
+++ b/src/os/shared/src/osapi-common.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-common.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-countsem.c b/src/os/shared/src/osapi-countsem.c
index c8208ae6d..deeaad1b3 100644
--- a/src/os/shared/src/osapi-countsem.c
+++ b/src/os/shared/src/osapi-countsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-countsem.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-debug.c b/src/os/shared/src/osapi-debug.c
index f67fe48dc..bce7c9cf9 100644
--- a/src/os/shared/src/osapi-debug.c
+++ b/src/os/shared/src/osapi-debug.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-debug.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-dir.c b/src/os/shared/src/osapi-dir.c
index 90eab3223..ce1991b71 100644
--- a/src/os/shared/src/osapi-dir.c
+++ b/src/os/shared/src/osapi-dir.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-dir.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-errors.c b/src/os/shared/src/osapi-errors.c
index d60d1b011..33d7b7dbc 100644
--- a/src/os/shared/src/osapi-errors.c
+++ b/src/os/shared/src/osapi-errors.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-errors.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-file.c b/src/os/shared/src/osapi-file.c
index c2d3191b6..89cd75baf 100644
--- a/src/os/shared/src/osapi-file.c
+++ b/src/os/shared/src/osapi-file.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-file.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -532,7 +532,10 @@ int32 OS_FDGetInfo(osal_id_t filedes, OS_file_prop_t *fd_prop)
     {
         record = OS_OBJECT_TABLE_GET(OS_global_stream_table, token);
 
-        strncpy(fd_prop->Path, record->name_entry, sizeof(fd_prop->Path) - 1);
+        if (record->name_entry != NULL)
+        {
+            strncpy(fd_prop->Path, record->name_entry, sizeof(fd_prop->Path) - 1);
+        }
         fd_prop->User    = record->creator;
         fd_prop->IsValid = true;
 
diff --git a/src/os/shared/src/osapi-filesys.c b/src/os/shared/src/osapi-filesys.c
index f2a77f264..439fe11fc 100644
--- a/src/os/shared/src/osapi-filesys.c
+++ b/src/os/shared/src/osapi-filesys.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-filesys.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-heap.c b/src/os/shared/src/osapi-heap.c
index 888d0d7ec..703368f71 100644
--- a/src/os/shared/src/osapi-heap.c
+++ b/src/os/shared/src/osapi-heap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-heap.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-idmap.c b/src/os/shared/src/osapi-idmap.c
index 725cbbdf0..da81c7d3e 100644
--- a/src/os/shared/src/osapi-idmap.c
+++ b/src/os/shared/src/osapi-idmap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-idmap.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-module.c b/src/os/shared/src/osapi-module.c
index 236006c24..c80f43272 100644
--- a/src/os/shared/src/osapi-module.c
+++ b/src/os/shared/src/osapi-module.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-module.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-mutex.c b/src/os/shared/src/osapi-mutex.c
index 70c651db0..5658df7fa 100644
--- a/src/os/shared/src/osapi-mutex.c
+++ b/src/os/shared/src/osapi-mutex.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-mutex.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-network.c b/src/os/shared/src/osapi-network.c
index 70367fa16..0af03c651 100644
--- a/src/os/shared/src/osapi-network.c
+++ b/src/os/shared/src/osapi-network.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-network.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-printf.c b/src/os/shared/src/osapi-printf.c
index fe3dfe427..c60bdb052 100644
--- a/src/os/shared/src/osapi-printf.c
+++ b/src/os/shared/src/osapi-printf.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-printf.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-queue.c b/src/os/shared/src/osapi-queue.c
index c3a351934..45fe457e7 100644
--- a/src/os/shared/src/osapi-queue.c
+++ b/src/os/shared/src/osapi-queue.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-queue.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-select.c b/src/os/shared/src/osapi-select.c
index e03b7050f..8a7d8925f 100644
--- a/src/os/shared/src/osapi-select.c
+++ b/src/os/shared/src/osapi-select.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-select.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-shell.c b/src/os/shared/src/osapi-shell.c
index 0443259c1..f3ad83210 100644
--- a/src/os/shared/src/osapi-shell.c
+++ b/src/os/shared/src/osapi-shell.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shell.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-sockets.c b/src/os/shared/src/osapi-sockets.c
index 5619f120f..0b942be5f 100644
--- a/src/os/shared/src/osapi-sockets.c
+++ b/src/os/shared/src/osapi-sockets.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-sockets.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-task.c b/src/os/shared/src/osapi-task.c
index abeb839c4..c0c4fa25e 100644
--- a/src/os/shared/src/osapi-task.c
+++ b/src/os/shared/src/osapi-task.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-task.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-time.c b/src/os/shared/src/osapi-time.c
index 89b624399..4c2dc6d6c 100644
--- a/src/os/shared/src/osapi-time.c
+++ b/src/os/shared/src/osapi-time.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-time.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-timebase.c b/src/os/shared/src/osapi-timebase.c
index f6ba02f49..ac92d33df 100644
--- a/src/os/shared/src/osapi-timebase.c
+++ b/src/os/shared/src/osapi-timebase.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-timebase.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/shared/src/osapi-version.c b/src/os/shared/src/osapi-version.c
index d20d3101a..0d064f960 100644
--- a/src/os/shared/src/osapi-version.c
+++ b/src/os/shared/src/osapi-version.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-version.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-binsem.c b/src/os/vxworks/src/os-impl-binsem.c
index 4c9a1acd4..8c1e5a14a 100644
--- a/src/os/vxworks/src/os-impl-binsem.c
+++ b/src/os/vxworks/src/os-impl-binsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-binsem.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-common.c b/src/os/vxworks/src/os-impl-common.c
index acf2a2896..2e50b22f6 100644
--- a/src/os/vxworks/src/os-impl-common.c
+++ b/src/os/vxworks/src/os-impl-common.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-common.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-console.c b/src/os/vxworks/src/os-impl-console.c
index 0b880e660..1ebf42e66 100644
--- a/src/os/vxworks/src/os-impl-console.c
+++ b/src/os/vxworks/src/os-impl-console.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-console.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-countsem.c b/src/os/vxworks/src/os-impl-countsem.c
index 3f4ef65e7..d4e23eb97 100644
--- a/src/os/vxworks/src/os-impl-countsem.c
+++ b/src/os/vxworks/src/os-impl-countsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-countsem.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-dirs-globals.c b/src/os/vxworks/src/os-impl-dirs-globals.c
index aa53a3585..2e9349983 100644
--- a/src/os/vxworks/src/os-impl-dirs-globals.c
+++ b/src/os/vxworks/src/os-impl-dirs-globals.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-dirs.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-errors.c b/src/os/vxworks/src/os-impl-errors.c
index e98cf9bf6..08d3db00d 100644
--- a/src/os/vxworks/src/os-impl-errors.c
+++ b/src/os/vxworks/src/os-impl-errors.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-errors.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-files.c b/src/os/vxworks/src/os-impl-files.c
index c839fe469..09f4a1eb0 100644
--- a/src/os/vxworks/src/os-impl-files.c
+++ b/src/os/vxworks/src/os-impl-files.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-files.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-filesys.c b/src/os/vxworks/src/os-impl-filesys.c
index 638279e0e..6cc9a854d 100644
--- a/src/os/vxworks/src/os-impl-filesys.c
+++ b/src/os/vxworks/src/os-impl-filesys.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-filesys.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-heap.c b/src/os/vxworks/src/os-impl-heap.c
index 8931130c0..a4723aff7 100644
--- a/src/os/vxworks/src/os-impl-heap.c
+++ b/src/os/vxworks/src/os-impl-heap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-heap.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-idmap.c b/src/os/vxworks/src/os-impl-idmap.c
index a8da5bd2d..e60e4c186 100644
--- a/src/os/vxworks/src/os-impl-idmap.c
+++ b/src/os/vxworks/src/os-impl-idmap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-idmap.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-loader.c b/src/os/vxworks/src/os-impl-loader.c
index 2e0ef53ce..0f40b87ea 100644
--- a/src/os/vxworks/src/os-impl-loader.c
+++ b/src/os/vxworks/src/os-impl-loader.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-loader.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-mutex.c b/src/os/vxworks/src/os-impl-mutex.c
index 4b0f64271..984b94cb6 100644
--- a/src/os/vxworks/src/os-impl-mutex.c
+++ b/src/os/vxworks/src/os-impl-mutex.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-mutex.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-network.c b/src/os/vxworks/src/os-impl-network.c
index adfc911b0..fe8279d0a 100644
--- a/src/os/vxworks/src/os-impl-network.c
+++ b/src/os/vxworks/src/os-impl-network.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-network.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-no-module.c b/src/os/vxworks/src/os-impl-no-module.c
index bc20f3ccd..c53634927 100644
--- a/src/os/vxworks/src/os-impl-no-module.c
+++ b/src/os/vxworks/src/os-impl-no-module.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-no-module.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-queues.c b/src/os/vxworks/src/os-impl-queues.c
index 99e8a3002..0c7cef77f 100644
--- a/src/os/vxworks/src/os-impl-queues.c
+++ b/src/os/vxworks/src/os-impl-queues.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-queues.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-shell.c b/src/os/vxworks/src/os-impl-shell.c
index 39430e87d..d6f830e33 100644
--- a/src/os/vxworks/src/os-impl-shell.c
+++ b/src/os/vxworks/src/os-impl-shell.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-shell.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-sockets.c b/src/os/vxworks/src/os-impl-sockets.c
index 5b51ecd02..8dfeea37b 100644
--- a/src/os/vxworks/src/os-impl-sockets.c
+++ b/src/os/vxworks/src/os-impl-sockets.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-sockets.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-symtab.c b/src/os/vxworks/src/os-impl-symtab.c
index 35ed770d9..d403aced8 100644
--- a/src/os/vxworks/src/os-impl-symtab.c
+++ b/src/os/vxworks/src/os-impl-symtab.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-symtab.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-tasks.c b/src/os/vxworks/src/os-impl-tasks.c
index 07dae3c5a..6685f53f1 100644
--- a/src/os/vxworks/src/os-impl-tasks.c
+++ b/src/os/vxworks/src/os-impl-tasks.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-tasks.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/os/vxworks/src/os-impl-timebase.c b/src/os/vxworks/src/os-impl-timebase.c
index a68494c6b..e9d617aeb 100644
--- a/src/os/vxworks/src/os-impl-timebase.c
+++ b/src/os/vxworks/src/os-impl-timebase.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-impl-timebase.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-files.c b/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-files.c
index 31456820a..8cd268a01 100644
--- a/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-files.c
+++ b/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-files.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-portable-posix-files.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-io.c b/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-io.c
index 29bdb535d..8ea789d90 100644
--- a/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-io.c
+++ b/src/unit-test-coverage/portable/adaptors/src/ut-adaptor-portable-posix-io.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-portable-posix-io.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/portable/src/coveragetest-bsd-select.c b/src/unit-test-coverage/portable/src/coveragetest-bsd-select.c
index 6329f80b7..01d76cd1c 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-bsd-select.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-bsd-select.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-bsd-select.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  */
diff --git a/src/unit-test-coverage/portable/src/coveragetest-console-bsp.c b/src/unit-test-coverage/portable/src/coveragetest-console-bsp.c
index 7c8e9aba2..7f140e785 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-console-bsp.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-console-bsp.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-console-bsp.c
+ * \file
  * \ingroup  portable
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/portable/src/coveragetest-no-loader.c b/src/unit-test-coverage/portable/src/coveragetest-no-loader.c
index 7d64ed5c1..1d8030b01 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-no-loader.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-no-loader.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-no-loader.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  */
diff --git a/src/unit-test-coverage/portable/src/coveragetest-no-shell.c b/src/unit-test-coverage/portable/src/coveragetest-no-shell.c
index 776612532..fea47b7cb 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-no-shell.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-no-shell.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-no-shell.c
+ * \file
  * \ingroup  portable
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/portable/src/coveragetest-posix-dirs.c b/src/unit-test-coverage/portable/src/coveragetest-posix-dirs.c
index afc7b0e5b..62867764c 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-posix-dirs.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-posix-dirs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-posix-dirs.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  */
diff --git a/src/unit-test-coverage/portable/src/coveragetest-posix-files.c b/src/unit-test-coverage/portable/src/coveragetest-posix-files.c
index ec22b57f2..be758a590 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-posix-files.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-posix-files.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-posix-files.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  */
diff --git a/src/unit-test-coverage/portable/src/coveragetest-posix-gettime.c b/src/unit-test-coverage/portable/src/coveragetest-posix-gettime.c
index f59717757..c2f211644 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-posix-gettime.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-posix-gettime.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-posix-gettime.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  */
diff --git a/src/unit-test-coverage/portable/src/coveragetest-posix-io.c b/src/unit-test-coverage/portable/src/coveragetest-posix-io.c
index 0619d1534..7719b28c9 100644
--- a/src/unit-test-coverage/portable/src/coveragetest-posix-io.c
+++ b/src/unit-test-coverage/portable/src/coveragetest-posix-io.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-posix-io.c
+ * \file
  * \ingroup  portable
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/adaptors/src/ut-adaptor-module.c b/src/unit-test-coverage/shared/adaptors/src/ut-adaptor-module.c
index 1be553798..689722808 100644
--- a/src/unit-test-coverage/shared/adaptors/src/ut-adaptor-module.c
+++ b/src/unit-test-coverage/shared/adaptors/src/ut-adaptor-module.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-module.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-binsem.c b/src/unit-test-coverage/shared/src/coveragetest-binsem.c
index fba1a268a..1e01fa755 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-binsem.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-binsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-binsem.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-clock.c b/src/unit-test-coverage/shared/src/coveragetest-clock.c
index 2490ddbdb..17cc811f1 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-clock.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-clock.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-clock.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-common.c b/src/unit-test-coverage/shared/src/coveragetest-common.c
index b05699a00..e16338c50 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-common.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-common.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-common.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-countsem.c b/src/unit-test-coverage/shared/src/coveragetest-countsem.c
index 04926af0f..1059f4822 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-countsem.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-countsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-countsem.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-dir.c b/src/unit-test-coverage/shared/src/coveragetest-dir.c
index 2ab4b6f79..ac1c12a7b 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-dir.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-dir.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-dir.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-errors.c b/src/unit-test-coverage/shared/src/coveragetest-errors.c
index d31252df4..94695a89e 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-errors.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-errors.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-errors.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-file.c b/src/unit-test-coverage/shared/src/coveragetest-file.c
index 251324fed..270e8b283 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-file.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-file.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-file.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -310,6 +310,10 @@ void Test_OS_FDGetInfo(void)
     OSAPI_TEST_FUNCTION_RC(OS_FDGetInfo(UT_OBJID_1, &file_prop), OS_SUCCESS);
     UtAssert_True(strcmp(file_prop.Path, "ABC") == 0, "file_prop.Path (%s) == ABC", file_prop.Path);
 
+    OS_UT_SetupBasicInfoTest(OS_OBJECT_TYPE_OS_STREAM, UT_INDEX_1, NULL, UT_OBJID_OTHER);
+    OSAPI_TEST_FUNCTION_RC(OS_FDGetInfo(UT_OBJID_1, &file_prop), OS_SUCCESS);
+    UtAssert_STRINGBUF_EQ(file_prop.Path, 1, "", 1);
+
     OSAPI_TEST_FUNCTION_RC(OS_FDGetInfo(UT_OBJID_1, NULL), OS_INVALID_POINTER);
 
     UT_SetDefaultReturnValue(UT_KEY(OS_ObjectIdGetById), OS_ERR_INVALID_ID);
diff --git a/src/unit-test-coverage/shared/src/coveragetest-filesys.c b/src/unit-test-coverage/shared/src/coveragetest-filesys.c
index 55b6218a1..0f220ec1a 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-filesys.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-filesys.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-filesys.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-heap.c b/src/unit-test-coverage/shared/src/coveragetest-heap.c
index 31cfe970d..527e3978c 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-heap.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-heap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-heap.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-idmap.c b/src/unit-test-coverage/shared/src/coveragetest-idmap.c
index c42b4c823..f10e4beb2 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-idmap.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-idmap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-idmap.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-module.c b/src/unit-test-coverage/shared/src/coveragetest-module.c
index 63644fc7e..a4b0a73e2 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-module.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-module.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-module.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-mutex.c b/src/unit-test-coverage/shared/src/coveragetest-mutex.c
index d66265ee4..23e1ba9da 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-mutex.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-mutex.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-mutex.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-network.c b/src/unit-test-coverage/shared/src/coveragetest-network.c
index 5d9b11a1f..1f361cc40 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-network.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-network.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-network.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-printf.c b/src/unit-test-coverage/shared/src/coveragetest-printf.c
index 5278c91f4..195a2d508 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-printf.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-printf.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-printf.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-queue.c b/src/unit-test-coverage/shared/src/coveragetest-queue.c
index 873d768a9..2b9b6623d 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-queue.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-queue.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-queue.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-select.c b/src/unit-test-coverage/shared/src/coveragetest-select.c
index 0d8389aff..5eb2b3bfe 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-select.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-select.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-select.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-shell.c b/src/unit-test-coverage/shared/src/coveragetest-shell.c
index ddd96ef0c..a5bbd63a4 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-shell.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-shell.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-shell.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-sockets.c b/src/unit-test-coverage/shared/src/coveragetest-sockets.c
index 82f447067..92adc5efb 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-sockets.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-sockets.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-sockets.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-task.c b/src/unit-test-coverage/shared/src/coveragetest-task.c
index 4668594df..8d712ea0a 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-task.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-task.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-task.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-time.c b/src/unit-test-coverage/shared/src/coveragetest-time.c
index 00aa2d030..7e1613d3e 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-time.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-time.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-time.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-timebase.c b/src/unit-test-coverage/shared/src/coveragetest-timebase.c
index 6563f8ed8..3580563aa 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-timebase.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-timebase.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-timebase.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/coveragetest-version.c b/src/unit-test-coverage/shared/src/coveragetest-version.c
index 20d2688c9..de053fac2 100644
--- a/src/unit-test-coverage/shared/src/coveragetest-version.c
+++ b/src/unit-test-coverage/shared/src/coveragetest-version.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-version.c
+ * \file
  * \ingroup  shared
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/shared/src/os-shared-coverage-support.c b/src/unit-test-coverage/shared/src/os-shared-coverage-support.c
index a857abb8a..c367e186b 100644
--- a/src/unit-test-coverage/shared/src/os-shared-coverage-support.c
+++ b/src/unit-test-coverage/shared/src/os-shared-coverage-support.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     os-shared-coverage-support.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
@@ -108,7 +108,7 @@ void OS_UT_SetupBasicInfoTest(osal_objtype_t obj_type, osal_index_t test_idx, co
     rptr += test_idx;
     memset(rptr, 0, sizeof(*rptr));
     rptr->creator    = UT_OBJID_OTHER;
-    rptr->name_entry = "ABC";
+    rptr->name_entry = name;
 
     OS_UT_SetupTestTargetIndex(obj_type, test_idx);
 }
diff --git a/src/unit-test-coverage/ut-stubs/CMakeLists.txt b/src/unit-test-coverage/ut-stubs/CMakeLists.txt
index 8cadb7f1d..4593df9eb 100644
--- a/src/unit-test-coverage/ut-stubs/CMakeLists.txt
+++ b/src/unit-test-coverage/ut-stubs/CMakeLists.txt
@@ -172,6 +172,7 @@ add_library(ut_osapi_impl_stubs STATIC EXCLUDE_FROM_ALL
     src/os-shared-queue-impl-stubs.c
     src/os-shared-select-impl-stubs.c
     src/os-shared-shell-impl-stubs.c
+    src/os-shared-sockets-impl-handlers.c
     src/os-shared-sockets-impl-stubs.c
     src/os-shared-task-impl-stubs.c
     src/os-shared-timebase-impl-stubs.c
diff --git a/src/unit-test-coverage/ut-stubs/src/bsp-console-impl-stubs.c b/src/unit-test-coverage/ut-stubs/src/bsp-console-impl-stubs.c
index 23f369b20..3d1c0346d 100644
--- a/src/unit-test-coverage/ut-stubs/src/bsp-console-impl-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/bsp-console-impl-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     bsp-console-impl-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/os-shared-file-impl-handlers.c b/src/unit-test-coverage/ut-stubs/src/os-shared-file-impl-handlers.c
index ec4f1cd23..ed0c8e787 100644
--- a/src/unit-test-coverage/ut-stubs/src/os-shared-file-impl-handlers.c
+++ b/src/unit-test-coverage/ut-stubs/src/os-shared-file-impl-handlers.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-utstub-idmap.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  * Stub implementations for the functions defined in the OSAL API
diff --git a/src/unit-test-coverage/ut-stubs/src/os-shared-filesys-impl-handlers.c b/src/unit-test-coverage/ut-stubs/src/os-shared-filesys-impl-handlers.c
index b49982cf7..083bf5ab6 100644
--- a/src/unit-test-coverage/ut-stubs/src/os-shared-filesys-impl-handlers.c
+++ b/src/unit-test-coverage/ut-stubs/src/os-shared-filesys-impl-handlers.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-utstub-idmap.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  * Stub implementations for the functions defined in the OSAL API
diff --git a/src/unit-test-coverage/ut-stubs/src/os-shared-idmap-handlers.c b/src/unit-test-coverage/ut-stubs/src/os-shared-idmap-handlers.c
index d6c91b80b..63e1f7fc8 100644
--- a/src/unit-test-coverage/ut-stubs/src/os-shared-idmap-handlers.c
+++ b/src/unit-test-coverage/ut-stubs/src/os-shared-idmap-handlers.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-utstub-idmap.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  * Stub implementations for the functions defined in the OSAL API
diff --git a/src/unit-test-coverage/ut-stubs/src/os-shared-network-impl-handlers.c b/src/unit-test-coverage/ut-stubs/src/os-shared-network-impl-handlers.c
index 5b7b8f3c4..75c931560 100644
--- a/src/unit-test-coverage/ut-stubs/src/os-shared-network-impl-handlers.c
+++ b/src/unit-test-coverage/ut-stubs/src/os-shared-network-impl-handlers.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-utstub-idmap.c
+ * \file
  * \author   joseph.p.hickey@nasa.gov
  *
  * Stub implementations for the functions defined in the OSAL API
diff --git a/src/unit-test-coverage/ut-stubs/src/os-shared-sockets-impl-handlers.c b/src/unit-test-coverage/ut-stubs/src/os-shared-sockets-impl-handlers.c
new file mode 100644
index 000000000..186d334aa
--- /dev/null
+++ b/src/unit-test-coverage/ut-stubs/src/os-shared-sockets-impl-handlers.c
@@ -0,0 +1,53 @@
+/*
+ *  NASA Docket No. GSC-18,370-1, and identified as "Operating System Abstraction Layer"
+ *
+ *  Copyright (c) 2019 United States Government as represented by
+ *  the Administrator of the National Aeronautics and Space Administration.
+ *  All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * \file
+ *
+ * Stub implementations for the functions defined in the OSAL API
+ *
+ * The stub implementation can be used for unit testing applications built
+ * on top of OSAL.  The stubs do not do any real function, but allow
+ * the return code to be crafted such that error paths in the application
+ * can be executed.
+ */
+
+#include "osapi-sockets.h" /* OSAL public API for this subsystem */
+#include "os-shared-sockets.h"
+#include "utstubs.h"
+
+/*
+ * -----------------------------------------------------------------
+ * Default handler implementation
+ * -----------------------------------------------------------------
+ */
+void UT_DefaultHandler_OS_SocketAddrGetPort_Impl(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context)
+{
+    uint16 *PortNum = UT_Hook_GetArgValueByName(Context, "PortNum", uint16 *);
+    int32   status;
+
+    UT_Stub_GetInt32StatusCode(Context, &status);
+
+    if (status == OS_SUCCESS &&
+        UT_Stub_CopyToLocal(UT_KEY(OS_SocketAddrGetPort_Impl), PortNum, sizeof(*PortNum)) < sizeof(*PortNum))
+    {
+        *PortNum = 0;
+    }
+}
diff --git a/src/unit-test-coverage/ut-stubs/src/os-shared-sockets-impl-stubs.c b/src/unit-test-coverage/ut-stubs/src/os-shared-sockets-impl-stubs.c
index 6ffd258f0..990932a0d 100644
--- a/src/unit-test-coverage/ut-stubs/src/os-shared-sockets-impl-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/os-shared-sockets-impl-stubs.c
@@ -27,6 +27,8 @@
 #include "os-shared-sockets.h"
 #include "utgenstub.h"
 
+void UT_DefaultHandler_OS_SocketAddrGetPort_Impl(void *, UT_EntryKey_t, const UT_StubContext_t *);
+
 /*
  * ----------------------------------------------------
  * Generated stub function for OS_SetSocketDefaultFlags_Impl()
@@ -88,7 +90,7 @@ int32 OS_SocketAddrGetPort_Impl(uint16 *PortNum, const OS_SockAddr_t *Addr)
     UT_GenStub_AddParam(OS_SocketAddrGetPort_Impl, uint16 *, PortNum);
     UT_GenStub_AddParam(OS_SocketAddrGetPort_Impl, const OS_SockAddr_t *, Addr);
 
-    UT_GenStub_Execute(OS_SocketAddrGetPort_Impl, Basic, NULL);
+    UT_GenStub_Execute(OS_SocketAddrGetPort_Impl, Basic, UT_DefaultHandler_OS_SocketAddrGetPort_Impl);
 
     return UT_GenStub_GetReturnValue(OS_SocketAddrGetPort_Impl, int32);
 }
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-binsem-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-binsem-table-stubs.c
index 3118b32de..897879ecb 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-binsem-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-binsem-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-binsem-table-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-common-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-common-stubs.c
index bba938912..cb42e9f85 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-common-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-common-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-common-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-console-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-console-table-stubs.c
index fb979daf8..d453b4bbd 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-console-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-console-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-console-table-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-countsem-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-countsem-table-stubs.c
index 3c5668f60..914e00b3e 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-countsem-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-countsem-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-countsem-table-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-dir-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-dir-table-stubs.c
index 4593344e2..e12008f24 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-dir-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-dir-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-dir-table-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-error-impl-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-error-impl-table-stubs.c
index b52c51ac7..b7a6447f2 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-error-impl-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-error-impl-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-error-impl-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-filesys-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-filesys-table-stubs.c
index 3974890b2..d26620251 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-filesys-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-filesys-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-filesys-table-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-idmap-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-idmap-table-stubs.c
index 354e78a2c..ea43c7aa8 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-idmap-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-idmap-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-idmap-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-module-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-module-table-stubs.c
index 981bd0b4c..3bc7ceda1 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-module-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-module-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-module-table-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-mutex-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-mutex-table-stubs.c
index ba57a1248..dbf511817 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-mutex-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-mutex-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-mutex-table-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-queue-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-queue-table-stubs.c
index 872daee22..f0128ed61 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-queue-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-queue-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-queue-table-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-stream-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-stream-table-stubs.c
index 3dfd30a41..b11684ee0 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-stream-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-stream-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-stream-table-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-task-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-task-table-stubs.c
index c2aabc9cb..425af146f 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-task-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-task-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-task-table-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-timebase-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-timebase-table-stubs.c
index 005bebfcc..7ec3da397 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-timebase-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-timebase-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-timebase-table-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/osapi-shared-timecb-table-stubs.c b/src/unit-test-coverage/ut-stubs/src/osapi-shared-timecb-table-stubs.c
index 34d1b2229..33c6c2376 100644
--- a/src/unit-test-coverage/ut-stubs/src/osapi-shared-timecb-table-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/osapi-shared-timecb-table-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     osapi-shared-timecb-table-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/sys-select-stubs.c b/src/unit-test-coverage/ut-stubs/src/sys-select-stubs.c
index d726576e5..4de561996 100644
--- a/src/unit-test-coverage/ut-stubs/src/sys-select-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/sys-select-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     bsd-select-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c
index f1448981c..b8c287e02 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-hostLib-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c
index 765168ac8..8ffc54133 100644
--- a/src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c
+++ b/src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-symLib-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-binsem.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-binsem.c
index 10988edc4..cfcf418ed 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-binsem.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-binsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-binsem.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-common.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-common.c
index ede317707..3b70a5406 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-common.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-common.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-common.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-console.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-console.c
index 806093688..e1cd4e6b8 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-console.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-console.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-console.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-countsem.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-countsem.c
index 0997c7a11..7a53c067a 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-countsem.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-countsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-countsem.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirs.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirs.c
index 9df04dd8b..e37c1c30f 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirs.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-dirs.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirtable-stub.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirtable-stub.c
index 406b4c5e8..ae9f405c5 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirtable-stub.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-dirtable-stub.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-filetable-stub.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-files.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-files.c
index be3e13f93..c5c5c241a 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-files.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-files.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-files.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filesys.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filesys.c
index 45ffc5720..265bbf242 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filesys.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filesys.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-filesys.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filetable-stub.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filetable-stub.c
index cf867d685..4adcca00b 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filetable-stub.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-filetable-stub.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-filetable-stub.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-idmap.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-idmap.c
index a80cc6d41..86416a541 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-idmap.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-idmap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-idmap.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-loader.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-loader.c
index 6e35f7e9a..95a14bd74 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-loader.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-loader.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-loader.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-mutex.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-mutex.c
index 8a8fd08b2..263751cc5 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-mutex.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-mutex.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-mutex.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-queues.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-queues.c
index 60aa8ea45..d02496304 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-queues.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-queues.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-queues.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-sockets.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-sockets.c
index d13d0f39e..54e47d770 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-sockets.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-sockets.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-sockets.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-symtab.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-symtab.c
index b71468a85..b3d14fcba 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-symtab.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-symtab.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-symtab.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-tasks.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-tasks.c
index e448ebe44..444833adc 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-tasks.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-tasks.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-tasks.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-timebase.c b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-timebase.c
index 943592520..16b3ba923 100644
--- a/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-timebase.c
+++ b/src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-timebase.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     ut-adaptor-timebase.c
+ * \file
  * \ingroup  adaptors
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-binsem.c b/src/unit-test-coverage/vxworks/src/coveragetest-binsem.c
index ed49bb969..24458a11b 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-binsem.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-binsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-binsem.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-common.c b/src/unit-test-coverage/vxworks/src/coveragetest-common.c
index 01c353439..b35a202d3 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-common.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-common.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-common.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-console.c b/src/unit-test-coverage/vxworks/src/coveragetest-console.c
index 1c7a4a033..17b3baa37 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-console.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-console.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-console.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-countsem.c b/src/unit-test-coverage/vxworks/src/coveragetest-countsem.c
index e09a9ee78..9ab3cc6db 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-countsem.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-countsem.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-countsem.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-dirs-globals.c b/src/unit-test-coverage/vxworks/src/coveragetest-dirs-globals.c
index 7bc42b3ab..a2cc521b3 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-dirs-globals.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-dirs-globals.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-dirs-globals.c
+ * \file
  * \ingroup  vxworks
  * \author   steven.seeger@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-files.c b/src/unit-test-coverage/vxworks/src/coveragetest-files.c
index 18a3a82d7..402b8eadd 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-files.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-files.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-files.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-filesys.c b/src/unit-test-coverage/vxworks/src/coveragetest-filesys.c
index 64c7b3eb6..b0dd76c30 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-filesys.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-filesys.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-filesys.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-heap.c b/src/unit-test-coverage/vxworks/src/coveragetest-heap.c
index b701cea70..3908e17b3 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-heap.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-heap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-heap.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-idmap.c b/src/unit-test-coverage/vxworks/src/coveragetest-idmap.c
index a5da6f09f..00c9024e2 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-idmap.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-idmap.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-idmap.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-loader.c b/src/unit-test-coverage/vxworks/src/coveragetest-loader.c
index bb3e14f8f..80b9f42b4 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-loader.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-loader.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-loader.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-mutex.c b/src/unit-test-coverage/vxworks/src/coveragetest-mutex.c
index c606a95fb..14fa4a483 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-mutex.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-mutex.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-mutex.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-network.c b/src/unit-test-coverage/vxworks/src/coveragetest-network.c
index 52933fa97..867dd0e9e 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-network.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-network.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-network.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-no-module.c b/src/unit-test-coverage/vxworks/src/coveragetest-no-module.c
index 4c6925d5b..fbd5191c5 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-no-module.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-no-module.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-no-module.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-queues.c b/src/unit-test-coverage/vxworks/src/coveragetest-queues.c
index 8a3b6241a..cc4d468b2 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-queues.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-queues.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-queues.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-shell.c b/src/unit-test-coverage/vxworks/src/coveragetest-shell.c
index 4c6d3b1ff..2c2262b78 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-shell.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-shell.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-shell.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-sockets.c b/src/unit-test-coverage/vxworks/src/coveragetest-sockets.c
index f83b11db3..1c3dacd82 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-sockets.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-sockets.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-no-module.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-symtab.c b/src/unit-test-coverage/vxworks/src/coveragetest-symtab.c
index ea5fca3cb..f1c396f4f 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-symtab.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-symtab.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-symtab.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-tasks.c b/src/unit-test-coverage/vxworks/src/coveragetest-tasks.c
index c99965219..5959e1425 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-tasks.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-tasks.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-tasks.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-timebase.c b/src/unit-test-coverage/vxworks/src/coveragetest-timebase.c
index 359c61fd7..9ce46ffe0 100644
--- a/src/unit-test-coverage/vxworks/src/coveragetest-timebase.c
+++ b/src/unit-test-coverage/vxworks/src/coveragetest-timebase.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     coveragetest-timebase.c
+ * \file
  * \ingroup  vxworks
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-binsem-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-binsem-stubs.c
index ab1704489..3ac3edf3b 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-binsem-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-binsem-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-os-impl-binsem-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-common-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-common-stubs.c
index 464843b13..0d329b82c 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-common-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-common-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-os-impl-common-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-countsem-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-countsem-stubs.c
index 2aee6b7e3..bff2a95a3 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-countsem-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-countsem-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-os-impl-countsem-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-dir-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-dir-stubs.c
index 5aea2429f..aafada4c2 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-dir-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-dir-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-os-impl-dir-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-file-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-file-stubs.c
index ccdf80fbb..1ee10abb4 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-file-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-file-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-os-impl-file-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-idmap-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-idmap-stubs.c
index 5c1acef5f..5423232b4 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-idmap-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-idmap-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-os-impl-idmap-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-module-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-module-stubs.c
index f28c9cb54..9c9f4e560 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-module-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-module-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-os-impl-module-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-mutex-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-mutex-stubs.c
index 1314327af..6a1a9be03 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-mutex-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-mutex-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-os-impl-mutex-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-queue-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-queue-stubs.c
index e6b727e49..391db84a4 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-queue-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-queue-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-os-impl-queue-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-sockets-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-sockets-stubs.c
index 0c68f6524..ca5077220 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-sockets-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-sockets-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-os-impl-socket-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-task-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-task-stubs.c
index 4cd1debf8..af8605e6e 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-task-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-task-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-os-impl-task-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-timer-stubs.c b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-timer-stubs.c
index 228ae5921..6c4241e2f 100644
--- a/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-timer-stubs.c
+++ b/src/unit-test-coverage/vxworks/ut-stubs/src/vxworks-os-impl-timer-stubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file     vxworks-os-impl-timer-stubs.c
+ * \file
  * \ingroup  ut-stubs
  * \author   joseph.p.hickey@nasa.gov
  *
diff --git a/src/ut-stubs/utstub-helpers.h b/src/ut-stubs/utstub-helpers.h
index a44cd1c1e..8e1435432 100644
--- a/src/ut-stubs/utstub-helpers.h
+++ b/src/ut-stubs/utstub-helpers.h
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file utstub-helpers.h
+ * \file
  *
  * Internal header file for OSAL UT stub functions
  *
diff --git a/ut_assert/inc/utassert.h b/ut_assert/inc/utassert.h
index be59ca3c3..bd5f250b5 100644
--- a/ut_assert/inc/utassert.h
+++ b/ut_assert/inc/utassert.h
@@ -818,7 +818,7 @@ void UtAssert_Message(uint8 MessageType, const char *File, uint32 Line, const ch
  * \param SubsysName   The subsystem under test (abbreviated name)
  * \param ShortDesc    Short description of the test case
  * \param SegmentNum   Sequence among the overall/global test Segments
- * \param TestDescr    Sequence within the current test Segment
+ * \param SegmentSeq   Sequence within the current test Segment
  */
 void UtAssert_DoReport(const char *File, uint32 LineNum, uint32 SegmentNum, uint32 SegmentSeq, uint8 MessageType,
                        const char *SubsysName, const char *ShortDesc);
@@ -831,7 +831,7 @@ void UtAssert_DoReport(const char *File, uint32 LineNum, uint32 SegmentNum, uint
  * Like the UtAssert_DoReport() function, this is typically done as a message on the console/log however
  * it might be different for embedded targets.
  *
- * \param Appname       The application under test
+ * \param SegmentName   The segment under test
  * \param TestCounters  Counter object for the completed test
  */
 void UtAssert_DoTestSegmentReport(const char *SegmentName, const UtAssert_TestCounter_t *TestCounters);
diff --git a/ut_assert/inc/utbsp.h b/ut_assert/inc/utbsp.h
index 85c88c97a..c27541317 100644
--- a/ut_assert/inc/utbsp.h
+++ b/ut_assert/inc/utbsp.h
@@ -67,7 +67,8 @@ void UT_BSP_Setup(void);
  *
  * This is just a hook for the BSP to be informed of the start-of-test event and may be a no-op.
  *
- * \param Appname Name of current test segment
+ * \param[in] SegmentNumber Number of current test segment
+ * \param[in] SegmentName   Name of current test segment
  */
 void UT_BSP_StartTestSegment(uint32 SegmentNumber, const char *SegmentName);
 
diff --git a/ut_assert/inc/utstubs.h b/ut_assert/inc/utstubs.h
index 0a214cfa1..c100830b8 100644
--- a/ut_assert/inc/utstubs.h
+++ b/ut_assert/inc/utstubs.h
@@ -212,7 +212,7 @@ void UT_SetDataBuffer(UT_EntryKey_t FuncKey, void *DataBuffer, size_t BufferSize
  *
  * \param FuncKey The stub function to reference.
  * \param DataBuffer Set to Pointer to data buffer that is associated with the stub function (output)
- * \param BufferSize Set to Maximum Size of data buffer (output)
+ * \param MaxSize Set to Maximum Size of data buffer (output)
  * \param Position Set to current position in data buffer (output)
  */
 void UT_GetDataBuffer(UT_EntryKey_t FuncKey, void **DataBuffer, size_t *MaxSize, size_t *Position);
@@ -557,9 +557,10 @@ void UT_Stub_RegisterContextWithMetaData(UT_EntryKey_t FuncKey, const char *Name
  *
  * This does not return NULL, such that the returned value can always be dereferenced.
  *
- * \param ContextPtr   The context structure containing arguments
- * \param Name         Argument name to find
- * \param ExpectedSize The size of the expected object type
+ * \param ContextPtr       The context structure containing arguments
+ * \param Name             Argument name to find
+ * \param ExpectedTypeSize The size of the expected object type
+ *
  * \returns Pointer to buffer containing the value.
  */
 const void *UT_Hook_GetArgPtr(const UT_StubContext_t *ContextPtr, const char *Name, size_t ExpectedTypeSize);
@@ -588,8 +589,10 @@ const void *UT_Hook_GetArgPtr(const UT_StubContext_t *ContextPtr, const char *Na
  * \param FunctionName  The printable name of the actual function called, for the debug message.  If
  *    NULL then no debug message will be generated.
  * \param FuncKey       The Key to look up in the table
+ * \param DefaultRc     Default return code
+ * \param ArgList       Argument list
  */
-int32 UT_DefaultStubImplWithArgs(const char *FunctionName, UT_EntryKey_t FuncKey, int32 DefaultRc, va_list va);
+int32 UT_DefaultStubImplWithArgs(const char *FunctionName, UT_EntryKey_t FuncKey, int32 DefaultRc, va_list ArgList);
 
 /**
  * Handles a stub call for a variadic function
@@ -605,8 +608,10 @@ int32 UT_DefaultStubImplWithArgs(const char *FunctionName, UT_EntryKey_t FuncKey
  *
  * \sa UT_DefaultStubImplWithArgs()
  *
- * \param FuncKey       The key of the stub being executed
- * \param FunctionName  The printable name of the actual function called, for the debug message.
+ * \param FuncKey        The key of the stub being executed
+ * \param FunctionName   The printable name of the actual function called, for the debug message.
+ * \param DefaultHandler The default handler
+ * \param VaList         Argument list
  */
 void UT_ExecuteVaHandler(UT_EntryKey_t FuncKey, const char *FunctionName, UT_VaHandlerFunc_t DefaultHandler,
                          va_list VaList);
@@ -637,8 +642,9 @@ int32 UT_DefaultStubImpl(const char *FunctionName, UT_EntryKey_t FuncKey, int32
  *
  * \sa UT_DefaultStubImplWithArgs()
  *
- * \param FuncKey       The key of the stub being executed
- * \param FunctionName  The printable name of the actual function called, for the debug message.
+ * \param FuncKey        The key of the stub being executed
+ * \param FunctionName   The printable name of the actual function called, for the debug message.
+ * \param DefaultHandler The default handler
  */
 void UT_ExecuteBasicHandler(UT_EntryKey_t FuncKey, const char *FunctionName, UT_HandlerFunc_t DefaultHandler);
 
diff --git a/ut_assert/inc/uttest.h b/ut_assert/inc/uttest.h
index aba937de2..a9af45363 100644
--- a/ut_assert/inc/uttest.h
+++ b/ut_assert/inc/uttest.h
@@ -61,8 +61,8 @@ void UtTest_Add(void (*Test)(void), void (*Setup)(void), void (*Teardown)(void),
  * This group of functions are invoked BEFORE normal test routines added with UtTest_Add.
  * Within the group, functions are executed in the order registered.
  *
- * \param Setup    Setup function, called before the test function
- * \param TestName Name of function for logging purposes
+ * \param Setup        Setup function, called before the test function
+ * \param SequenceName Name of sequence for logging purposes
  */
 void UtTest_AddSetup(void (*Setup)(void), const char *SequenceName);
 
@@ -72,8 +72,8 @@ void UtTest_AddSetup(void (*Setup)(void), const char *SequenceName);
  * This group of functions is invoked AFTER normal test routines added with UtTest_Add.
  * Within the group, functions are executed in the order registered.
  *
- * \param Teardown Teardown function, called before the test function
- * \param TestName Name of function for logging purposes
+ * \param Teardown     Teardown function, called before the test function
+ * \param SequenceName Name of sequence for logging purposes
  */
 void UtTest_AddTeardown(void (*Teardown)(void), const char *SequenceName);
 
diff --git a/ut_assert/src/utstubs.c b/ut_assert/src/utstubs.c
index 2d67be29c..07287ba74 100644
--- a/ut_assert/src/utstubs.c
+++ b/ut_assert/src/utstubs.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file utstubs.c
+ * \file
  *
  *  Created on: Feb 25, 2015
  *      Author: joseph.p.hickey@nasa.gov
@@ -1037,24 +1037,24 @@ int32 UT_DefaultStubImpl(const char *FunctionName, UT_EntryKey_t FuncKey, int32
     return Retcode;
 }
 
-void UT_ExecuteBasicHandler(UT_EntryKey_t FuncKey, const char *FunctionName, UT_HandlerFunc_t DefaultHook)
+void UT_ExecuteBasicHandler(UT_EntryKey_t FuncKey, const char *FunctionName, UT_HandlerFunc_t DefaultHandler)
 {
     /* Check if the test case registered a hook, and use the default if not */
-    if (UT_GetStubEntry(FuncKey, UT_ENTRYTYPE_FINAL_HANDLER) == NULL && DefaultHook != NULL)
+    if (UT_GetStubEntry(FuncKey, UT_ENTRYTYPE_FINAL_HANDLER) == NULL && DefaultHandler != NULL)
     {
-        UT_SetHandlerFunction(FuncKey, DefaultHook, NULL);
+        UT_SetHandlerFunction(FuncKey, DefaultHandler, NULL);
     }
 
     UT_DefaultStubImpl(FunctionName, FuncKey, 0, NULL);
 }
 
-void UT_ExecuteVaHandler(UT_EntryKey_t FuncKey, const char *FunctionName, UT_VaHandlerFunc_t DefaultHook,
+void UT_ExecuteVaHandler(UT_EntryKey_t FuncKey, const char *FunctionName, UT_VaHandlerFunc_t DefaultHandler,
                          va_list VaList)
 {
     /* Check if the test case registered a hook, and use the default if not */
-    if (UT_GetStubEntry(FuncKey, UT_ENTRYTYPE_FINAL_HANDLER) == NULL && DefaultHook != NULL)
+    if (UT_GetStubEntry(FuncKey, UT_ENTRYTYPE_FINAL_HANDLER) == NULL && DefaultHandler != NULL)
     {
-        UT_SetVaHandlerFunction(FuncKey, DefaultHook, NULL);
+        UT_SetVaHandlerFunction(FuncKey, DefaultHandler, NULL);
     }
 
     UT_DefaultStubImplWithArgs(FunctionName, FuncKey, 0, VaList);