diff --git a/cmake/sample_defs/cpu1_platform_cfg.h b/cmake/sample_defs/cpu1_platform_cfg.h
index 05097082c..7e434f100 100644
--- a/cmake/sample_defs/cpu1_platform_cfg.h
+++ b/cmake/sample_defs/cpu1_platform_cfg.h
@@ -887,7 +887,7 @@
 **       reconstructed by the ground system.
 **
 **  \par Limits
-**       There is a lower limit of 32 and an upper limit of #CFE_SB_MAX_SB_MSG_SIZE.
+**       There is a lower limit of 32 and an upper limit of #CFE_MISSION_SB_MAX_SB_MSG_SIZE.
 */
 #define CFE_PLATFORM_ES_MAX_SHELL_PKT    64
 
diff --git a/docs/cFE Application Developers Guide.md b/docs/cFE Application Developers Guide.md
index 3b34e230b..32f05ebfb 100644
--- a/docs/cFE Application Developers Guide.md	
+++ b/docs/cFE Application Developers Guide.md	
@@ -1121,14 +1121,14 @@ TypeCRC identifies which of the standard CRC polynomials to be used.  Currently,
 there are the following types available:
 
 ```
-CFE_ES_CRC_8 – an 8-bit additive checksum calculation that returns a 32-bit value
-CFE_ES_CRC_16 – a 16-bit additive checksum calculation that returns a 32-bit value
-CFE_ES_CRC_32 – a 32-bit additive checksum calculation that returns a 32-bit value
-CFE_ES_DEFAULT_CRC – the mission specified default CRC calculation
+CFE_MISSION_ES_CRC_8 – an 8-bit additive checksum calculation that returns a 32-bit value
+CFE_MISSION_ES_CRC_16 – a 16-bit additive checksum calculation that returns a 32-bit value
+CFE_MISSION_ES_CRC_32 – a 32-bit additive checksum calculation that returns a 32-bit value
+CFE_MISSION_ES_DEFAULT_CRC – the mission specified default CRC calculation
 ```
 
 Unless there is a specific interface with a specified CRC calculation,
-Applications must use the CFE_ES_DEFAULT_CRC type.
+Applications must use the CFE_MISSION_ES_DEFAULT_CRC type.
 
 #### 5.11 File System Functions
 
@@ -1215,7 +1215,7 @@ FILE: xx_app.c
 
 void XX_AppMain(void)
 {
-    uint32 RunStatus = CFE_ES_APP_RUN;
+    uint32 RunStatus = CFE_ES_RunStatus_APP_RUN;
     CFE_SB_MsgPtr_t MsgPtr;
     int32  Result = CFE_SUCCESS;
 
@@ -1238,7 +1238,7 @@ void XX_AppMain(void)
     */
     if (Result != CFE_SUCCESS)
     {
-        RunStatus = CFE_ES_APP_ERROR;
+        RunStatus = CFE_ES_RunStatus_APP_ERROR;
     }
 
     /*
@@ -1262,7 +1262,7 @@ void XX_AppMain(void)
         }
         else
         {
-            RunStatus = CFE_ES_APP_ERROR;
+            RunStatus = CFE_ES_RunStatus_APP_ERROR;
         }
     }
 
diff --git a/docs/src/cfe_api.dox b/docs/src/cfe_api.dox
index 7a5113cb7..000e7c982 100644
--- a/docs/src/cfe_api.dox
+++ b/docs/src/cfe_api.dox
@@ -106,12 +106,6 @@
 	  <LI> #CFE_FS_WriteHeader - \copybrief CFE_FS_WriteHeader
 	  <LI> #CFE_FS_SetTimestamp - \copybrief CFE_FS_SetTimestamp
     </UL>
-    <LI> \ref CFEAPIFSCompress
-    <UL>
-	  <LI> #CFE_FS_IsGzFile - \copybrief CFE_FS_IsGzFile
-	  <LI> #CFE_FS_Decompress - \copybrief CFE_FS_Decompress
-          <LI> #CFE_FS_GetUncompressedFile - \copybrief CFE_FS_GetUncompressedFile
-    </UL>
     <LI> \ref CFEAPIFSUtil
     <UL>
 	  <LI> #CFE_FS_ExtractFilenameFromPath - \copybrief CFE_FS_ExtractFilenameFromPath
@@ -169,7 +163,6 @@
       <LI> #CFE_SB_GetTotalMsgLength - \copybrief CFE_SB_GetTotalMsgLength
       <LI> #CFE_SB_GetMsgTime - \copybrief CFE_SB_GetMsgTime
       <LI> #CFE_SB_GetCmdCode - \copybrief CFE_SB_GetCmdCode
-      <LI> #CFE_SB_GetLastSenderId - \copybrief CFE_SB_GetLastSenderId
       <LI> #CFE_SB_MessageStringGet - \copybrief CFE_SB_MessageStringGet
     </UL>
     <LI> \ref CFEAPISBChecksum
@@ -247,8 +240,6 @@
       <LI> #CFE_TIME_MET2SCTime - \copybrief CFE_TIME_MET2SCTime
       <LI> #CFE_TIME_Sub2MicroSecs - \copybrief CFE_TIME_Sub2MicroSecs
       <LI> #CFE_TIME_Micro2SubSecs - \copybrief CFE_TIME_Micro2SubSecs
-      <LI> #CFE_TIME_CFE2FSSeconds - \copybrief CFE_TIME_CFE2FSSeconds
-      <LI> #CFE_TIME_FS2CFESeconds - \copybrief CFE_TIME_FS2CFESeconds
     </UL>
     <LI> \ref CFEAPITIMEExternSource
     <UL>
diff --git a/docs/src/cfe_es.dox b/docs/src/cfe_es.dox
index a2e817a8a..a4bf36fe6 100644
--- a/docs/src/cfe_es.dox
+++ b/docs/src/cfe_es.dox
@@ -166,10 +166,10 @@
 
   Immediately after the cFE completes its initialization, the ES Application first 
   looks for the volatile startup script. The location in the file system is defined 
-  by the cFE platform configuration parameter named #CFE_ES_VOLATILE_STARTUP_FILE. 
+  by the cFE platform configuration parameter named #CFE_PLATFORM_ES_VOLATILE_STARTUP_FILE. 
   This configuration parameter contains a path as well as a filename. If the file 
   is found, ES begins to startup the applications that are listed in the file. If 
-  ES does not find the file, it attempts to open the #CFE_ES_NONVOL_STARTUP_FILE.
+  ES does not find the file, it attempts to open the #CFE_PLATFORM_ES_NONVOL_STARTUP_FILE.
    
   If ES finds the volatile startup script, the attempt to open the nonvolatile startup 
   script is bypassed.
@@ -219,8 +219,8 @@
 
   The Reset Type is sent to the ground in the ES housekeeping packet and tells 
   how the current running version of the cFE was invoked. The possible Reset 
-  Types expected in the telemetry field are #CFE_ES_POWERON_RESET and 
-  #CFE_ES_PROCESSOR_RESET. There is a third Reset Type defined in the ES 
+  Types expected in the telemetry field are #CFE_PSP_RST_TYPE_POWERON and 
+  #CFE_PSP_RST_TYPE_PROCESSOR. There is a third Reset Type defined in the ES 
   code as #CFE_ES_APP_RESTART which applies only to restarting an individual 
   application and is covered in more detail in the section titled Application 
   and Child Task.
@@ -228,9 +228,9 @@
   The Reset Subtype is also sent in the ES housekeeping packet and gives more 
   detail about the type of reset that started the execution of the current 
   running version of the cFE. The possible Reset Subtypes are 
-  #CFE_ES_POWER_CYCLE, #CFE_ES_PUSH_BUTTON, #CFE_ES_HW_SPECIAL_COMMAND,
-  #CFE_ES_HW_WATCHDOG, #CFE_ES_RESET_COMMAND, #CFE_ES_EXCEPTION,
-  #CFE_ES_UNDEFINED_RESET, #CFE_ES_HWDEBUG_RESET, #CFE_ES_BANKSWITCH_RESET.
+  #CFE_PSP_RST_SUBTYPE_POWER_CYCLE, #CFE_PSP_RST_SUBTYPE_PUSH_BUTTON, #CFE_PSP_RST_SUBTYPE_HW_SPECIAL_COMMAND,
+  #CFE_PSP_RST_SUBTYPE_HW_WATCHDOG, #CFE_PSP_RST_SUBTYPE_RESET_COMMAND, #CFE_PSP_RST_SUBTYPE_EXCEPTION,
+  #CFE_PSP_RST_SUBTYPE_UNDEFINED_RESET, #CFE_PSP_RST_SUBTYPE_HWDEBUG_RESET, #CFE_PSP_RST_SUBTYPE_BANKSWITCH_RESET.
 
   Next: \ref cfeesugresetlog <BR>
   Prev: \ref cfeesugswreset <BR>
@@ -245,17 +245,17 @@
   command must be sent. This command will write the log to a binary file. 
   The path and filename may be specified in the command. If the filename 
   command field contains an empty string, the configuration parameter 
-  #CFE_ES_DEFAULT_ER_LOG_FILE is used to specify the path and filename.  
+  #CFE_PLATFORM_ES_DEFAULT_ER_LOG_FILE is used to specify the path and filename.  
   Use the ground system to get the file and display the contents.  There 
   is also a command to clear the ER log, #CFE_ES_CLEAR_ER_LOG_CC.
 
   The size of the ER log is defined by the platform configuration parameter 
-  #CFE_ES_ER_LOG_ENTRIES This log is preserved after a processor reset and 
+  #CFE_PLATFORM_ES_ER_LOG_ENTRIES This log is preserved after a processor reset and 
   held in the ES reset area.  
 
   A count of the number of entries in the log is present in the ES 
   housekeeping telemetry. This count can be used with the configuration 
-  parameter #CFE_ES_ER_LOG_ENTRIES to calculate the fullness of the log.
+  parameter #CFE_PLATFORM_ES_ER_LOG_ENTRIES to calculate the fullness of the log.
 
   The information contained in a single log entry is defined by the 
   structure CFE_ES_ERLog_t.
@@ -496,7 +496,7 @@
   collection. When the stop command is received, the ES task writes 
   all the data from the buffer to a file. The file can then be 
   imported to analysis tools for viewing. The size of the
-  buffer is configurable through the #CFE_ES_PERF_DATA_BUFFER_SIZE
+  buffer is configurable through the #CFE_PLATFORM_ES_PERF_DATA_BUFFER_SIZE
   platform configuration parameter.
 
   Additional information follows:<BR>
@@ -555,7 +555,7 @@
   The #CFE_ES_STOP_PERF_DATA_CC command is used to stop the data collection 
   process and write the buffer data to a file. The path and filename may be 
   specified in the command. If the filename command field contains an empty 
-  string, the configuration parameter #CFE_ES_DEFAULT_PERF_DUMP_FILENAME is 
+  string, the configuration parameter #CFE_PLATFORM_ES_DEFAULT_PERF_DUMP_FILENAME is 
   used to specify the path and filename.  The number of entries written to 
   the file is determined by the 'data count' variable, which is sent in the 
   ES housekeeping telemetry packet. To ensure cpu hogging does not occur 
@@ -734,7 +734,7 @@
   
   This command will cause Executive Services to extract pertinent statistics
   from the data used to manage the Memory Pool and telemeter them to the ground
-  in the \link #CFE_ES_PoolStatsTlm_t Memory Pool Statistics Telemetry Packet.
+  in the \link #CFE_ES_MemStatsTlm_t Memory Pool Statistics Telemetry Packet.
   \endlink
   
   In order to obtain the statistics associated with a memory pool, the operator
@@ -746,7 +746,7 @@
   Services (EVS) and Table Services (TBL).  Each of these cFE Core Applications
   report their memory pool handles in telemetry.
   
-  The \link #CFE_ES_PoolStatsTlm_t Memory Pool Statistics Telemetry Packet
+  The \link #CFE_ES_MemStatsTlm_t Memory Pool Statistics Telemetry Packet
   \endlink contains the following information:
   
   <UL>
@@ -785,12 +785,12 @@
   be sent. This command will write the log to a binary file. The path and
   filename may be specified in the command. If the filename command field
   contains an empty string, the configuration parameter
-  #CFE_ES_DEFAULT_SYSLOG_FILE is used to specify the path and filename.  Use the
+  #CFE_PLATFORM_ES_DEFAULT_SYSLOG_FILE is used to specify the path and filename.  Use the
   ground system to get the file and display the contents.  The
   #CFE_ES_CLEAR_SYSLOG_CC is used to clear the System log.
 
   The size of the System log is defined by the platform configuration parameter
-  #CFE_ES_SYSTEM_LOG_SIZE. This log is preserved after a processor reset and
+  #CFE_PLATFORM_ES_SYSTEM_LOG_SIZE. This log is preserved after a processor reset and
   held in the ES reset area.  
 
   A count of the number of entries in the log is present in the ES housekeeping
diff --git a/docs/src/cfe_evs.dox b/docs/src/cfe_evs.dox
index b819dd835..c15a0efea 100644
--- a/docs/src/cfe_evs.dox
+++ b/docs/src/cfe_evs.dox
@@ -142,7 +142,7 @@
   message, ALL event messages of the specified type are affected.  Typically, event 
   meesages of type DEBUG are disabled on-orbit.  Note that EVS provides the capability 
   to affect multiple types within one command using a bit mask.  Note also that the 
-  configuration parameter #CFE_EVS_DEFAULT_TYPE_FLAG in the cfe_platform_cfg.h file 
+  configuration parameter #CFE_PLATFORM_EVS_DEFAULT_TYPE_FLAG in the cfe_platform_cfg.h file 
   specifies which event message types are enabled/disabled by default.  
 
   <CENTER><H2> Event Message Control - By Application </H2></CENTER>
@@ -170,7 +170,7 @@
   the events that it wants to register for filtering along with the 
   \ref cfeevsugmsgfilter (only the Binary Filtering Scheme 
   exists currently).   Note that applications are limited in the number of events that 
-  they can register for filtering (see #CFE_EVS_MAX_EVENT_FILTERS in cfe_platform_cfg.h 
+  they can register for filtering (see #CFE_PLATFORM_EVS_MAX_EVENT_FILTERS in cfe_platform_cfg.h 
   for the mission defined limit).  The filtering method uses a mask to determine if the 
   message is forwarded to the software bus, making it available in telemetry (see 
   \ref cfeevsugmsgfilter for a description on filtering).  Commands are available to 
@@ -340,7 +340,7 @@
      <LI> Active Flag - If equal to FALSE (0), all events from this Application are Filtered <BR>
      <LI> Event Count - Total number of events issued by this Application.  Note that this value
      stop incrementing at 65535. <BR>
-     <BR>The following information for each Filtered Event (up to #CFE_EVS_MAX_EVENT_FILTERS): <BR><BR>
+     <BR>The following information for each Filtered Event (up to #CFE_PLATFORM_EVS_MAX_EVENT_FILTERS): <BR><BR>
      <LI> Event ID - Event ID for event whose filter has been defined <BR>
      <LI> Mask - Binary Filter mask value (see \ref cfeevsugmsgfilter for an explanation) <BR>
      <LI> Count - Current number of times this Event ID has been issued by this Application <BR>
diff --git a/docs/src/cfe_glossary.dox b/docs/src/cfe_glossary.dox
index 2461a3785..6f2bf0c88 100644
--- a/docs/src/cfe_glossary.dox
+++ b/docs/src/cfe_glossary.dox
@@ -71,8 +71,8 @@
      <TR>
         <TD> \anchor cfeadg_eventtype Event Type
         <TD> A numeric literal used to identify the type of an Application event.
-             An event type may be #CFE_EVS_DEBUG, #CFE_EVS_INFORMATION, 
-             #CFE_EVS_ERROR, or #CFE_EVS_CRITICAL.
+             An event type may be #CFE_EVS_EventType_DEBUG, #CFE_EVS_EventType_INFORMATION, 
+             #CFE_EVS_EventType_ERROR, or #CFE_EVS_EventType_CRITICAL.
      <TR>
         <TD> \anchor cfeadg_eventmessage Event Message
         <TD> A data item used to notify the user and/or an external 
diff --git a/docs/src/cfe_sb.dox b/docs/src/cfe_sb.dox
index 6a89c305f..b2c8466d3 100644
--- a/docs/src/cfe_sb.dox
+++ b/docs/src/cfe_sb.dox
@@ -127,7 +127,7 @@
   in the subscription is sometimes referred to as the destination of the message.
   There are a maximum number of destinations for a particular message. This
   value is specified by the platform configuration parameter
-  #CFE_SB_MAX_DEST_PER_PKT.
+  #CFE_PLATFORM_SB_MAX_DEST_PER_PKT.
 
   As subscriptions are received, the destinations are added to the head of a
   linked list. During the sending of a message, the list is traversed beginning
@@ -158,10 +158,10 @@
 
   The software bus statically allocates a block of memory for message buffers and
   subscription blocks. The size of this memory block is defined by the platform configuration
-  parameter #CFE_SB_BUF_MEMORY_BYTES. The memory is managed by the cFE ES memory
+  parameter #CFE_PLATFORM_SB_BUF_MEMORY_BYTES. The memory is managed by the cFE ES memory
   pool and is used only by the software bus. The ES memory pool allows an application to define
   the block sizes for the pool at compile time. These sizes are defined by the platform
-  configuration parameters prefixed with CFE_SB_MEM_BLOCK_SIZE (for example, #CFE_SB_MEM_BLOCK_SIZE_01).
+  configuration parameters prefixed with CFE_SB_MEM_BLOCK_SIZE (for example, #CFE_PLATFORM_SB_MEM_BLOCK_SIZE_01).
   It is recommended that a project tailor these values for the mission, based on the software
   bus packet sizes.
 
@@ -179,7 +179,7 @@
   The software bus provides a set of figures regarding memory capacity, current memory
   utilization and high water marks relevant to the SB memory pool. This information may be
   requested by sending the command to dump the SB statistics packet. In addition, the
-  current memory utilization value and the 'unmarked memory' value (#CFE_SB_BUF_MEMORY_BYTES
+  current memory utilization value and the 'unmarked memory' value (#CFE_PLATFORM_SB_BUF_MEMORY_BYTES
   minus peak memory in use)  are sent in software bus housekeeping telemetry. The unmarked
   memory value  should be monitored regularly to ensure that the value (in bytes) does not
   continue to decline or approach zero. If this value were to approach zero, there is a
@@ -336,7 +336,7 @@
   If this error occurs during nominal conditions, it could be an indication that the
   'message limit' is not set correctly. The message limit is given at the time of the
   subscription and given as a parameter in the subscribe API. With the #CFE_SB_Subscribe
-  API, the SB uses a default message limit value specified by #CFE_SB_DEFAULT_MSG_LIMIT.
+  API, the SB uses a default message limit value specified by #CFE_PLATFORM_SB_DEFAULT_MSG_LIMIT.
   This constant is currently set to a value of four. If the default value is insufficient,
   the message limit value can be specified in the #CFE_SB_SubscribeEx API.
 
@@ -478,7 +478,7 @@
 
   The simplest way to prevent this behavior is to ensure that there is margin when sizing the
   SB memory pool. To check the margin, monitor the "Peak Memory in Use" vs. the configuration
-  parameter #CFE_SB_BUF_MEMORY_BYTES which indicates the amount allocated.
+  parameter #CFE_PLATFORM_SB_BUF_MEMORY_BYTES which indicates the amount allocated.
 
   Next: \ref cfesbugfaq <BR>
   Prev: \ref cfesbugqos <BR>
diff --git a/docs/src/cfe_tbl.dox b/docs/src/cfe_tbl.dox
index 7f91046db..d528283d9 100644
--- a/docs/src/cfe_tbl.dox
+++ b/docs/src/cfe_tbl.dox
@@ -162,7 +162,7 @@
   single buffered tables represent the most memory resource efficient method of being managed.
 
   The number of single buffered tables that can have inactive table images being manipulated at one
-  time is specified by a TBL Services configuration parameter (#CFE_TBL_MAX_SIMULTANEOUS_LOADS) found
+  time is specified by a TBL Services configuration parameter (#CFE_PLATFORM_TBL_MAX_SIMULTANEOUS_LOADS) found
   in the cfe_platform_cfg.h file associated with the processor in question.  This parameter identifies
   the number of shared table buffers that are available.
 
@@ -194,7 +194,7 @@
   Applications which have unusually large tables may decide to conserve memory resources by making
   them double buffered.  This is because the shared buffers used by single buffered tables must be
   sized to match the largest table.  If there is one table that is unusually large, there is little
-  reason to allocate up to #CFE_TBL_MAX_SIMULTANEOUS_LOADS number of buffers that size.  A double
+  reason to allocate up to #CFE_PLATFORM_TBL_MAX_SIMULTANEOUS_LOADS number of buffers that size.  A double
   buffered table will only allocate ONE extra buffer of that size.
   
   Performance minded Applications that are required to perform processing with tight timing deadlines
@@ -324,7 +324,7 @@
   Table Services produces two different telemetry packets.  The first packet, referred to as the Table
   Services Housekeeping Packet, is routinely produced by Table Services upon receipt of the Housekeeping
   Request message that is typically sent to all Applications by an on board scheduler.  The contents and
-  format of this packet are described in detail at #CFE_TBL_HkPacket_t.
+  format of this packet are described in detail at #CFE_TBL_HousekeepingTlm_t.
     
   Next: \ref cfetblugprocreset <BR>
   Prev: \ref cfetblugregistry <BR>
diff --git a/docs/src/cfe_time.dox b/docs/src/cfe_time.dox
index b60e37f70..aa5ed060b 100644
--- a/docs/src/cfe_time.dox
+++ b/docs/src/cfe_time.dox
@@ -256,21 +256,21 @@
   one</B>, of the following time format definitions:
 
   \verbatim
-  #define CFE_TIME_CFG_DEFAULT_TAI  TRUE
-  #define CFE_TIME_CFG_DEFAULT_UTC  FALSE
+  #define CFE_MISSION_TIME_CFG_DEFAULT_TAI  TRUE
+  #define CFE_MISSION_TIME_CFG_DEFAULT_UTC  FALSE
   \endverbatim
 
   or
   
   \verbatim
-  #define CFE_TIME_CFG_DEFAULT_TAI  FALSE
-  #define CFE_TIME_CFG_DEFAULT_UTC  TRUE
+  #define CFE_MISSION_TIME_CFG_DEFAULT_TAI  FALSE
+  #define CFE_MISSION_TIME_CFG_DEFAULT_UTC  TRUE
   \endverbatim
 
   The choice of time format is a mission specific decision and is not directly 
   affected by the hardware configuration.
   
-  \sa #CFE_TIME_CFG_DEFAULT_TAI, #CFE_TIME_CFG_DEFAULT_UTC <BR>
+  \sa #CFE_MISSION_TIME_CFG_DEFAULT_TAI, #CFE_MISSION_TIME_CFG_DEFAULT_UTC <BR>
 
 
   Next: \ref cfetimeugfaketone <BR>
@@ -288,12 +288,12 @@
   signal.
 
   \verbatim
-  #define CFE_TIME_CFG_FAKE_TONE  TRUE
+  #define CFE_MISSION_TIME_CFG_FAKE_TONE  TRUE
   \endverbatim
 
   Hypothetical hardware configuration number one (described above) would enable the fake tone signal.
 
-  \sa #CFE_TIME_CFG_FAKE_TONE
+  \sa #CFE_MISSION_TIME_CFG_FAKE_TONE
   
   Next: \ref cfetimeugtoneorder <BR>
   Prev: \ref cfetimeugformsel <BR>
@@ -312,14 +312,14 @@
   of the following:
 
   \verbatim
-  #define CFE_TIME_AT_TONE_WAS
-  #define CFE_TIME_AT_TONE_WILL_BE
+  #define CFE_MISSION_TIME_AT_TONE_WAS
+  #define CFE_MISSION_TIME_AT_TONE_WILL_BE
   \endverbatim
 
   Hypothetical hardware configuration number three (described \ref cfetimeugconfig above) would 
   enable "time at the tone was".
 
-  \sa #CFE_TIME_AT_TONE_WAS, #CFE_TIME_AT_TONE_WILL_BE
+  \sa #CFE_MISSION_TIME_AT_TONE_WAS, #CFE_MISSION_TIME_AT_TONE_WILL_BE
 
   
   Next: \ref cfetimeugtonewindow <BR>
@@ -337,15 +337,15 @@
   Both must be defined, units are micro-seconds.
 
   \verbatim
-  #define CFE_TIME_MIN_ELAPSED  0
-  #define CFE_TIME_MAX_ELAPSED  100000
+  #define CFE_MISSION_TIME_MIN_ELAPSED  0
+  #define CFE_MISSION_TIME_MAX_ELAPSED  100000
   \endverbatim
 
   Hypothetical hardware configuration number three (described above) might use 
   these values which describe a window that begins immediately after the tone 
   and lasts for one tenth of a second.
 
-  \sa #CFE_TIME_MIN_ELAPSED, #CFE_TIME_MAX_ELAPSED
+  \sa #CFE_MISSION_TIME_MIN_ELAPSED, #CFE_MISSION_TIME_MAX_ELAPSED
 
   
   Next: \ref cfetimeugserver <BR>
@@ -365,18 +365,18 @@
   header file:
 
   \verbatim
-  #define CFE_TIME_CFG_SERVER   TRUE
-  #define CFE_TIME_CFG_CLIENT   FALSE
+  #define CFE_PLATFORM_TIME_CFG_SERVER   TRUE
+  #define CFE_PLATFORM_TIME_CFG_CLIENT   FALSE
   \endverbatim
 
   or
   
   \verbatim
-  #define CFE_TIME_CFG_SERVER   FALSE
-  #define CFE_TIME_CFG_CLIENT   TRUE
+  #define CFE_PLATFORM_TIME_CFG_SERVER   FALSE
+  #define CFE_PLATFORM_TIME_CFG_CLIENT   TRUE
   \endverbatim
 
-  \sa #CFE_TIME_CFG_SERVER, #CFE_TIME_CFG_CLIENT
+  \sa #CFE_PLATFORM_TIME_CFG_SERVER, #CFE_PLATFORM_TIME_CFG_CLIENT
 
   
   Next: \ref cfetimeugendian <BR>
@@ -439,7 +439,7 @@
   Set the following definition to TRUE only for TIME servers using an external time data source.
 
   \verbatim
-  #define CFE_TIME_CFG_SOURCE  TRUE
+  #define CFE_PLATFORM_TIME_CFG_SOURCE  TRUE
   \endverbatim
 
   The remainder of this section pertains only to TIME servers configured to accept 
@@ -455,14 +455,14 @@
   the following to TRUE, for example:
 
   \verbatim
-  #define CFE_TIME_CFG_SRC_MET   TRUE
-  #define CFE_TIME_CFG_SRC_GPS   FALSE
-  #define CFE_TIME_CFG_SRC_TIME  FALSE
+  #define CFE_PLATFORM_TIME_CFG_SRC_MET   TRUE
+  #define CFE_PLATFORM_TIME_CFG_SRC_GPS   FALSE
+  #define CFE_PLATFORM_TIME_CFG_SRC_TIME  FALSE
   \endverbatim
 
   configuration definitions for the particular source.  
 
-  If the cfe_platform_cfg.h file contains "#define CFE_TIME_CFG_SOURCE  TRUE" then time is 
+  If the cfe_platform_cfg.h file contains "#define CFE_PLATFORM_TIME_CFG_SOURCE  TRUE" then time is 
   configured to allow switching between internal and external time sources  
   (see #CFE_TIME_SET_SOURCE_CC).  If this configuration parameter is set to FALSE then 
   the command to set the source will be rejected.
@@ -471,9 +471,9 @@
   parameters must also be set TRUE in order to specify the external time source, for example:
 
   \verbatim
-  #define CFE_TIME_CFG_SRC_MET   TRUE
-  #define CFE_TIME_CFG_SRC_GPS   FALSE
-  #define CFE_TIME_CFG_SRC_TIME  FALSE
+  #define CFE_PLATFORM_TIME_CFG_SRC_MET   TRUE
+  #define CFE_PLATFORM_TIME_CFG_SRC_GPS   FALSE
+  #define CFE_PLATFORM_TIME_CFG_SRC_TIME  FALSE
   \endverbatim
 
   Note that Internal MET source depends on available hardware.  It may be the local 
@@ -483,7 +483,7 @@
   time will be overwritten.
 
 
-  \sa #CFE_TIME_CFG_SRC_MET, #CFE_TIME_CFG_SRC_GPS, #CFE_TIME_CFG_SRC_TIME
+  \sa #CFE_PLATFORM_TIME_CFG_SRC_MET, #CFE_PLATFORM_TIME_CFG_SRC_GPS, #CFE_PLATFORM_TIME_CFG_SRC_TIME
   
   Next: \ref cfetimeugsignal <BR>
   Prev: \ref cfetimeugvirtualmet <BR>
@@ -498,12 +498,12 @@
   command to select the active tone signal.
 
   \verbatim
-  #define CFE_TIME_CFG_SIGNAL  TRUE
+  #define CFE_PLATFORM_TIME_CFG_SIGNAL  TRUE
   \endverbatim
 
   Note: this feature requires additional custom software to make the physical signal switch.
 
-  \sa #CFE_TIME_CFG_SIGNAL
+  \sa #CFE_PLATFORM_TIME_CFG_SIGNAL
   
   Next: \ref cfetimeugparadigm <BR>
   Prev: \ref cfetimeugsource <BR>
@@ -553,7 +553,7 @@
   API function that prints spacecraft time as a date and time text string.  The cFE "get time" 
   functions are independent of the ground epoch.
 
-  The mission configuration parameters, #CFE_TIME_CFG_DEFAULT_TAI and #CFE_TIME_CFG_DEFAULT_UTC 
+  The mission configuration parameters, #CFE_MISSION_TIME_CFG_DEFAULT_TAI and #CFE_MISSION_TIME_CFG_DEFAULT_UTC 
   specify the default time format.  Applications are encouraged to use the #CFE_TIME_GetTime API, 
   which returns time in the format specified by this configuration parameter.
 
diff --git a/docs/src/mnem_maps/cfe_evs_tlm_mnem_map b/docs/src/mnem_maps/cfe_evs_tlm_mnem_map
index ff3c012af..32f1928ca 100644
--- a/docs/src/mnem_maps/cfe_evs_tlm_mnem_map
+++ b/docs/src/mnem_maps/cfe_evs_tlm_mnem_map
@@ -29,16 +29,16 @@ EVS_HK_SPARE1=$sc_$cpu_EVS_HK_SPARE1 \
 EVS_HK_SPARE2=$sc_$cpu_EVS_HK_SPARE2 \
 EVS_HK_SPARE3=$sc_$cpu_EVS_HK_SPARE3 \
 EVS_MEMPOOLHDL=$sc_$cpu_EVS_MemPoolHdl \
-EVS_APP=$sc_$cpu_EVS_APP[CFE_ES_MAX_APPLICATIONS] \
-EVS_APPID=$sc_$cpu_EVS_APP[CFE_ES_MAX_APPLICATIONS].APPID \
-EVS_APPMSGSENTC=$sc_$cpu_EVS_APP[CFE_ES_MAX_APPLICATIONS].APPMSGSENTC \
-EVS_APPENASTAT=$sc_$cpu_EVS_APP[CFE_ES_MAX_APPLICATIONS].APPENASTAT \
-EVS_SPARE2ALIGN3=$sc_$cpu_EVS_APP[CFE_ES_MAX_APPLICATIONS].SPARE2ALIGN3 \
+EVS_APP=$sc_$cpu_EVS_APP[CFE_PLATFORM_ES_MAX_APPLICATIONS] \
+EVS_APPID=$sc_$cpu_EVS_APP[CFE_PLATFORM_ES_MAX_APPLICATIONS].APPID \
+EVS_APPMSGSENTC=$sc_$cpu_EVS_APP[CFE_PLATFORM_ES_MAX_APPLICATIONS].APPMSGSENTC \
+EVS_APPENASTAT=$sc_$cpu_EVS_APP[CFE_PLATFORM_ES_MAX_APPLICATIONS].APPENASTAT \
+EVS_SPARE2ALIGN3=$sc_$cpu_EVS_APP[CFE_PLATFORM_ES_MAX_APPLICATIONS].SPARE2ALIGN3 \
 EVS_APPNAME=$sc_$cpu_EVS_APPNAME[OS_MAX_API_NAME] \
 EVS_EVENTID=$sc_$cpu_EVS_EVENTID \
 EVS_EVENTTYPE=$sc_$cpu_EVS_EVENTTYPE \
 EVS_SCID=$sc_$cpu_EVS_SCID \
 EVS_PROCESSORID=$sc_$cpu_EVS_PROCESSORID \
-EVS_EVENT=$sc_$cpu_EVS_EVENT[CFE_EVS_MAX_MESSAGE_LENGTH] \
+EVS_EVENT=$sc_$cpu_EVS_EVENT[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH] \
 EVS_SPARE1=$sc_$cpu_EVS_SPARE1 \
 EVS_SPARE2=$sc_$cpu_EVS_SPARE2
diff --git a/docs/src/mnem_maps/cfe_sb_tlm_mnem_map b/docs/src/mnem_maps/cfe_sb_tlm_mnem_map
index 34ba65824..b8192ffb1 100644
--- a/docs/src/mnem_maps/cfe_sb_tlm_mnem_map
+++ b/docs/src/mnem_maps/cfe_sb_tlm_mnem_map
@@ -31,11 +31,11 @@ SB_MSGLIMEC=$sc_$cpu_SB_MsgLimEC \
 SB_MEMPOOLHANDLE=$sc_$cpu_SB_MemPoolHdl \
 SB_MEMINUSE=$sc_$cpu_SB_MemInUse \
 SB_UNMARKEDMEM=$sc_$cpu_SB_UnMarkedMem \
-SB_PDPIPEID=$sc_$cpu_SB_Stat.SB_SMPDS[CFE_SB_MAX_PIPES].SB_PDPIPEID \
-SB_PDSPARE=$sc_$cpu_SB_Stat.SB_SMPDS[CFE_SB_MAX_PIPES].SB_PDSPARE \
-SB_PDDEPTH=$sc_$cpu_SB_Stat.SB_SMPDS[CFE_SB_MAX_PIPES].SB_PDDEPTH \
-SB_PDINUSE=$sc_$cpu_SB_Stat.SB_SMPDS[CFE_SB_MAX_PIPES].SB_PDINUSE \
-SB_PDPKINUSE=$sc_$cpu_SB_Stat.SB_SMPDS[CFE_SB_MAX_PIPES].SB_PDPKINUSE \
+SB_PDPIPEID=$sc_$cpu_SB_Stat.SB_SMPDS[CFE_PLATFORM_SB_MAX_PIPES].SB_PDPIPEID \
+SB_PDSPARE=$sc_$cpu_SB_Stat.SB_SMPDS[CFE_PLATFORM_SB_MAX_PIPES].SB_PDSPARE \
+SB_PDDEPTH=$sc_$cpu_SB_Stat.SB_SMPDS[CFE_PLATFORM_SB_MAX_PIPES].SB_PDDEPTH \
+SB_PDINUSE=$sc_$cpu_SB_Stat.SB_SMPDS[CFE_PLATFORM_SB_MAX_PIPES].SB_PDINUSE \
+SB_PDPKINUSE=$sc_$cpu_SB_Stat.SB_SMPDS[CFE_PLATFORM_SB_MAX_PIPES].SB_PDPKINUSE \
 SB_SMMIDIU=$sc_$cpu_SB_Stat.SB_SMMIDIU \
 SB_SMPMIDIU=$sc_$cpu_SB_Stat.SB_SMPMIDIU \
 SB_SMMMIDALW=$sc_$cpu_SB_Stat.SB_SMMMIDALW \
@@ -54,4 +54,4 @@ SB_SMMELEA=$sc_$cpu_SB_Stat.SB_SMMELEA \
 SB_SMSBBIU=$sc_$cpu_SB_Stat.SB_SMSBBIU \
 SB_SMPSBBIU=$sc_$cpu_SB_Stat.SB_SMPSBBIU \
 SB_SMMPDALW=$sc_$cpu_SB_Stat.SB_SMMPDALW \
-SB_SMPDS=$sc_$cpu_SB_Stat.SB_SMPDS[CFE_SB_MAX_PIPES]
+SB_SMPDS=$sc_$cpu_SB_Stat.SB_SMPDS[CFE_PLATFORM_SB_MAX_PIPES]
diff --git a/fsw/cfe-core/eds/cfe_sb.xml b/fsw/cfe-core/eds/cfe_sb.xml
index 1a0077d70..d9f122e02 100644
--- a/fsw/cfe-core/eds/cfe_sb.xml
+++ b/fsw/cfe-core/eds/cfe_sb.xml
@@ -228,7 +228,7 @@
               \cfetlmmnemonic  \SB_SMPMIDIU
             </LongDescription>
           </Entry>
-          <Entry name="MaxMsgIdsAllowed" type="BASE_TYPES/uint32" shortDescription="cFE Cfg Param \link #CFE_SB_MAX_MSG_IDS \endlink">
+          <Entry name="MaxMsgIdsAllowed" type="BASE_TYPES/uint32" shortDescription="cFE Cfg Param \link #CFE_PLATFORM_SB_MAX_MSG_IDS \endlink">
             <LongDescription>
               \cfetlmmnemonic  \SB_SMMMIDALW
             </LongDescription>
@@ -243,7 +243,7 @@
               \cfetlmmnemonic  \SB_SMPPIU
             </LongDescription>
           </Entry>
-          <Entry name="MaxPipesAllowed" type="BASE_TYPES/uint32" shortDescription="cFE Cfg Param \link #CFE_SB_MAX_PIPES \endlink">
+          <Entry name="MaxPipesAllowed" type="BASE_TYPES/uint32" shortDescription="cFE Cfg Param \link #CFE_PLATFORM_SB_MAX_PIPES \endlink">
             <LongDescription>
               \cfetlmmnemonic  \SB_SMMPALW
             </LongDescription>
@@ -258,7 +258,7 @@
               \cfetlmmnemonic  \SB_SMPBMIU
             </LongDescription>
           </Entry>
-          <Entry name="MaxMemAllowed" type="BASE_TYPES/uint32" shortDescription="cFE Cfg Param \link #CFE_SB_BUF_MEMORY_BYTES \endlink">
+          <Entry name="MaxMemAllowed" type="BASE_TYPES/uint32" shortDescription="cFE Cfg Param \link #CFE_PLATFORM_SB_BUF_MEMORY_BYTES \endlink">
             <LongDescription>
               \cfetlmmnemonic  \SB_SMMBMALW
             </LongDescription>
@@ -276,8 +276,8 @@
           <Entry name="MaxSubscriptionsAllowed" type="BASE_TYPES/uint32">
             <LongDescription>
               \cfetlmmnemonic  \SB_SMMSALW
-              \brief  product of \link #CFE_SB_MAX_MSG_IDS \endlink
-              and \link #CFE_SB_MAX_DEST_PER_PKT \endlink
+              \brief  product of \link #CFE_PLATFORM_SB_MAX_MSG_IDS \endlink
+              and \link #CFE_PLATFORM_SB_MAX_DEST_PER_PKT \endlink
             </LongDescription>
           </Entry>
           <Entry name="SBBuffersInUse" type="BASE_TYPES/uint32" shortDescription="Number of SB message buffers currently in use">
@@ -290,7 +290,7 @@
               \cfetlmmnemonic  \SB_SMPSBBIU
             </LongDescription>
           </Entry>
-          <Entry name="MaxPipeDepthAllowed" type="BASE_TYPES/uint32" shortDescription="cFE Cfg Param \link #CFE_SB_MAX_PIPE_DEPTH \endlink">
+          <Entry name="MaxPipeDepthAllowed" type="BASE_TYPES/uint32" shortDescription="cFE Cfg Param \link #CFE_PLATFORM_SB_MAX_PIPE_DEPTH \endlink">
             <LongDescription>
               \cfetlmmnemonic  \SB_SMMPDALW
             </LongDescription>
@@ -530,7 +530,7 @@
           If this command field contains an empty string (NULL terminator as
           the first character) the default file path and name is used.
           The default file path and name is defined in the platform
-          configuration file as #CFE_SB_DEFAULT_ROUTING_FILENAME.
+          configuration file as #CFE_PLATFORM_SB_DEFAULT_ROUTING_FILENAME.
           \cfecmdmnemonic  \SB_WRITEROUTING2FILE
 
           \par  Command Structure
@@ -675,7 +675,7 @@
           If this command field contains an empty string (NULL terminator as
           the first character) the default file path and name is used.
           The default file path and name is defined in the platform
-          configuration file as #CFE_SB_DEFAULT_PIPE_FILENAME.
+          configuration file as #CFE_PLATFORM_SB_DEFAULT_PIPE_FILENAME.
           \cfecmdmnemonic  \SB_WRITEPIPE2FILE
 
           \par  Command Structure
@@ -726,7 +726,7 @@
           in the command. If this command field contains an empty string
           (NULL terminator as the first character) the default file path and
           name is used. The default file path and name is defined in the
-          platform configuration file as #CFE_SB_DEFAULT_MAP_FILENAME.
+          platform configuration file as #CFE_PLATFORM_SB_DEFAULT_MAP_FILENAME.
           \cfecmdmnemonic  \SB_WRITEMAP2FILE
 
           \par  Command Structure
diff --git a/fsw/cfe-core/eds/cfe_time.xml b/fsw/cfe-core/eds/cfe_time.xml
index c8998f4fa..bc3c03019 100644
--- a/fsw/cfe-core/eds/cfe_time.xml
+++ b/fsw/cfe-core/eds/cfe_time.xml
@@ -602,7 +602,7 @@
           - Operating in FLYWHEEL mode is not considered a choice related
           to clock source, but rather an element of the clock state.  See below
           for a description of the #CFE_TIME_SET_STATE_CC command.
-          - This command is only valid when the #CFE_TIME_CFG_SOURCE configuration
+          - This command is only valid when the #CFE_PLATFORM_TIME_CFG_SOURCE configuration
           parameter in the cfe_platform_cfg.h file has been set to true.
           \cfecmdmnemonic  \TIME_SETSOURCE
 
@@ -1202,7 +1202,7 @@
           hardware configuration.
           
           Notes:
-          - This command is only valid when the #CFE_TIME_CFG_SIGNAL configuration
+          - This command is only valid when the #CFE_PLATFORM_TIME_CFG_SIGNAL configuration
           parameter in the cfe_platform_cfg.h file has been set to true.
           \cfecmdmnemonic  \TIME_SETSIGNAL
 
diff --git a/fsw/cfe-core/src/es/cfe_es_api.c b/fsw/cfe-core/src/es/cfe_es_api.c
index e499c9e88..345d78f45 100644
--- a/fsw/cfe-core/src/es/cfe_es_api.c
+++ b/fsw/cfe-core/src/es/cfe_es_api.c
@@ -1645,11 +1645,7 @@ int32 CFE_ES_GetGenCounterIDByName(uint32 *CounterIdPtr, const char *CounterName
 } /* End of CFE_ES_GetGenCounterIDByName() */
 
 
-/***************************************************************************************
-** Private API functions
-*/
-
-/**
+/*
  * A conversion function to obtain an index value correlating to an AppID
  * This is a zero based value that can be used for indexing into a table.
  */
@@ -1668,7 +1664,7 @@ int32 CFE_ES_AppID_ToIndex(uint32 AppId, uint32 *Idx)
     return CFE_SUCCESS;
 }
 
-/**
+/*
  * A conversion function to obtain an index value correlating to an TaskID
  * This is a zero based value that can be used for indexing into a table.
  * 
@@ -1685,6 +1681,10 @@ int32 CFE_ES_TaskID_ToIndex(uint32 TaskID, uint32 *Idx)
     return CFE_SUCCESS;
 }
 
+/***************************************************************************************
+** Private API functions
+*/
+
 /*
  * Note - this gets the table entry pointer but does not dereference or
  * otherwise check/validate said pointer, as that would have to be done while
diff --git a/fsw/cfe-core/src/es/cfe_es_global.h b/fsw/cfe-core/src/es/cfe_es_global.h
index 6ef1dd5b3..3c14a7807 100644
--- a/fsw/cfe-core/src/es/cfe_es_global.h
+++ b/fsw/cfe-core/src/es/cfe_es_global.h
@@ -339,6 +339,7 @@ static inline void CFE_ES_TaskRecordSetFree(CFE_ES_TaskRecord_t *TaskRecPtr)
  * locked prior to invoking this function.
  *
  * @param[in]   TaskRecPtr   pointer to task table entry
+ * @param[in]   TaskID       The expected task ID to verify
  * @returns true if the entry matches the given task ID
  */
 static inline bool CFE_ES_TaskRecordIsMatch(const CFE_ES_TaskRecord_t *TaskRecPtr, uint32 TaskID)
diff --git a/fsw/cfe-core/src/es/cfe_es_log.h b/fsw/cfe-core/src/es/cfe_es_log.h
index f02bc902a..b417f8be7 100644
--- a/fsw/cfe-core/src/es/cfe_es_log.h
+++ b/fsw/cfe-core/src/es/cfe_es_log.h
@@ -345,7 +345,7 @@ void CFE_ES_PerfLogDump(void);
  *
  * \param EntryType Whether the event is relevant to the CORE or an APPLICATION (#CFE_ES_LogEntryType_Enum_t)
  * \param ResetType The type of the last reset
- * \param ResetSubType The subtype of the last reset
+ * \param ResetSubtype The subtype of the last reset
  * \param Description A summary of the event
  *
  * \return CFE_SUCCESS if successful, or an appropriate error code from cfe_error.h
diff --git a/fsw/cfe-core/src/es/cfe_es_start.c b/fsw/cfe-core/src/es/cfe_es_start.c
index 0e2105e3b..c64d45f5a 100644
--- a/fsw/cfe-core/src/es/cfe_es_start.c
+++ b/fsw/cfe-core/src/es/cfe_es_start.c
@@ -351,10 +351,10 @@ void CFE_ES_SetupResetVariables(uint32 StartType, uint32 StartSubtype, uint32 Bo
    ** Determine how the system was started. The choices are:
    **   CFE_ES_POWER_ON_RESET, or CFE_PSP_RST_TYPE_PROCESSOR
    ** The subtypes include:
-   **   CFE_PSP_RST_SUBTYPE_POWER_CYCLE, CFE_ES_PUSH_BUTTON, CFE_PSP_RST_SUBTYPE_HW_SPECIAL_COMMAND,
-   **   CFE_ES_HW_WATCHDOG, CFE_PSP_RST_TYPE_COMMAND, or CFE_ES_EXCEPTION.
+   **   CFE_PSP_RST_SUBTYPE_POWER_CYCLE, CFE_PSP_RST_SUBTYPE_PUSH_BUTTON, CFE_PSP_RST_SUBTYPE_HW_SPECIAL_COMMAND,
+   **   CFE_PSP_RST_SUBTYPE_HW_WATCHDOG, CFE_PSP_RST_TYPE_COMMAND, or CFE_PSP_RST_SUBTYPE_EXCEPTION.
    ** Some of these reset types are logged before the system is restarted.
-   **  ( CFE_PSP_RST_TYPE_COMMAND, CFE_ES_EXCEPTION ) while others occur
+   **  ( CFE_PSP_RST_TYPE_COMMAND, CFE_PSP_RST_SUBTYPE_EXCEPTION ) while others occur
    **  without the knowledge of the software and must be logged here.
    */
    if ( StartType == CFE_PSP_RST_TYPE_POWERON )
diff --git a/fsw/cfe-core/src/inc/cfe_es.h b/fsw/cfe-core/src/inc/cfe_es.h
index 2b9d3c7fa..1d2328131 100644
--- a/fsw/cfe-core/src/inc/cfe_es.h
+++ b/fsw/cfe-core/src/inc/cfe_es.h
@@ -126,7 +126,7 @@ typedef cpuaddr CFE_ES_MemHandle_t;
  *
  * @sa CFE_ES_ResourceID_FromInteger()
  *
- * @param   id[in]    Resource ID to convert
+ * @param[in]   id    Resource ID to convert
  * @returns Integer value corresponding to ID
  */
 static inline unsigned long CFE_ES_ResourceID_ToInteger(uint32 id)
@@ -145,7 +145,7 @@ static inline unsigned long CFE_ES_ResourceID_ToInteger(uint32 id)
  *
  * @sa CFE_ES_ResourceID_ToInteger()
  *
- * @param   Value[in]    Integer value to convert
+ * @param[in]   Value    Integer value to convert
  * @returns ID value corresponding to integer
  */
 static inline uint32 CFE_ES_ResourceID_FromInteger(unsigned long Value)
@@ -170,12 +170,11 @@ static inline uint32 CFE_ES_ResourceID_FromInteger(unsigned long Value)
  * back to the original AppID value.  The caller should retain the original ID
  * for future use.
  *
- * @param   AppID[in]   Application ID to convert
- * @param   Idx[out]    Buffer where the calculated index will be stored
+ * @param[in]   AppID  Application ID to convert
+ * @param[out]  Idx    Buffer where the calculated index will be stored
  *
  * @return Execution status, see @ref CFEReturnCodes
  * @retval #CFE_SUCCESS                 @copybrief CFE_SUCCESS
- * @retval #CFE_ES_RESOURCE_ID_INVALID  @copybrief CFE_ES_RESOURCE_ID_INVALID
  */
 int32 CFE_ES_AppID_ToIndex(uint32 AppID, uint32 *Idx);
 
@@ -195,12 +194,11 @@ int32 CFE_ES_AppID_ToIndex(uint32 AppID, uint32 *Idx);
  * back to the original TaskID value.  The caller should retain the original ID
  * for future use.
  *
- * @param   TaskID[in]  Task ID to convert
- * @param   Idx[out]    Buffer where the calculated index will be stored
+ * @param[in]   TaskID  Task ID to convert
+ * @param[out]  Idx     Buffer where the calculated index will be stored
  *
  * @return Execution status, see @ref CFEReturnCodes
  * @retval #CFE_SUCCESS                 @copybrief CFE_SUCCESS
- * @retval #CFE_ES_RESOURCE_ID_INVALID  @copybrief CFE_ES_RESOURCE_ID_INVALID
  */
 int32 CFE_ES_TaskID_ToIndex(uint32 TaskID, uint32 *Idx);
 
diff --git a/fsw/cfe-core/src/inc/cfe_es_events.h b/fsw/cfe-core/src/inc/cfe_es_events.h
index 03da2eb37..eaef707ba 100644
--- a/fsw/cfe-core/src/inc/cfe_es_events.h
+++ b/fsw/cfe-core/src/inc/cfe_es_events.h
@@ -101,20 +101,6 @@
 **/
 #define CFE_ES_RESET_INF_EID      4
 
-/** \brief <tt> 'Invoked shell command \%s' </tt>
-**  \event <tt> 'Invoked shell command \%s' </tt> 
-**
-**  \par Type: INFORMATION
-**
-**  \par Cause:
-**
-**  This event message is always automatically issued in response
-**  to a cFE Executive Services \link #CFE_ES_SHELL_CC Shell Command \endlink
-**
-**  The \c 's' string contains the actual shell command string issued.
-**/
-#define CFE_ES_SHELL_INF_EID      5
-
 /** \brief <tt> 'Started \%s from \%s, AppID = \%d' </tt>
 **  \event <tt> 'Started \%s from \%s, AppID = \%d' </tt> 
 **
@@ -432,22 +418,6 @@
 **/
 #define CFE_ES_BOOT_ERR_EID      24    /* command specific "error" */
 
-/** \brief <tt> 'Failed to invoke shell command \%s, rc = \%08X' </tt>
-**  \event <tt> 'Failed to invoke shell command \%s, rc = \%08X' </tt> 
-**
-**  \par Type: ERROR
-**
-**  \par Cause:
-**
-**  This event message is generated whenever the cFE Executive Services receives an OS Shell
-**  command, via the \link #CFE_ES_SHELL_CC Executive Services Shell Command \endlink, and
-**  the underlying OS returns an error code.
-**
-**  The 's' field in the message identifies the shell command string that was issued
-**  and the \c rc field displays the shell's return code, in hex.
-**/
-#define CFE_ES_SHELL_ERR_EID     25
-
 /** \brief <tt> 'Failed to start \%s from \%s, RC = \%08X' </tt>
 **  \event <tt> 'Failed to start \%s from \%s, RC = \%08X' </tt>
 **
diff --git a/fsw/cfe-core/src/inc/cfe_fs_extern_typedefs.h b/fsw/cfe-core/src/inc/cfe_fs_extern_typedefs.h
index 3e14e4499..de637d188 100644
--- a/fsw/cfe-core/src/inc/cfe_fs_extern_typedefs.h
+++ b/fsw/cfe-core/src/inc/cfe_fs_extern_typedefs.h
@@ -103,8 +103,7 @@ enum CFE_FS_SubType
     *
     *
     * Executive Services Shell Response Data File which is generated in response to a
-    * \link #CFE_ES_SHELL_CC \ES_SHELL \endlink
-    * command.
+    * shell command.
     *
     */
    CFE_FS_SubType_ES_SHELL                            = 5,
diff --git a/fsw/cfe-core/src/inc/cfe_sb_msg.h b/fsw/cfe-core/src/inc/cfe_sb_msg.h
index b840c1108..bab0a356b 100644
--- a/fsw/cfe-core/src/inc/cfe_sb_msg.h
+++ b/fsw/cfe-core/src/inc/cfe_sb_msg.h
@@ -651,7 +651,7 @@ typedef struct {
                                                 \brief Max number of SB message buffers in use */
 
     uint32              MaxPipeDepthAllowed;/**< \cfetlmmnemonic \SB_SMMPDALW
-                                                 \brief cFE Cfg Param \link #CFE_SB_MAX_PIPE_DEPTH \endlink */
+                                                 \brief cFE Cfg Param \link #CFE_PLATFORM_SB_MAX_PIPE_DEPTH \endlink */
     CFE_SB_PipeDepthStats_t PipeDepthStats[CFE_MISSION_SB_MAX_PIPES];/**< \cfetlmmnemonic \SB_SMPDS
                                                                   \brief Pipe Depth Statistics #CFE_SB_PipeDepthStats_t*/
 } CFE_SB_StatsTlm_Payload_t;
diff --git a/fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c b/fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c
index 25595d7ea..6242ea151 100644
--- a/fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c
+++ b/fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c
@@ -99,8 +99,8 @@
 **  Purpose:
 **    Convert the full message Id to the mission defined MsgKey format
 **    No conversion is needed for the default implementation as it
-**    is limited to less than 16 bits by CFE_SB_HIGHEST_VALID_MSGID
-**     If CFE_SB_HIGHEST_VALID_MSGID is greater than 16 bits this function
+**    is limited to less than 16 bits by CFE_PLATFORM_SB_HIGHEST_VALID_MSGID
+**     If CFE_PLATFORM_SB_HIGHEST_VALID_MSGID is greater than 16 bits this function
 **    may need modification to ensure SB internal data structures are a
 **    reasonable size.
 **