diff --git a/docs/src/cfe_api.dox b/docs/src/cfe_api.dox
index 5cda61674..0c058a2f3 100644
--- a/docs/src/cfe_api.dox
+++ b/docs/src/cfe_api.dox
@@ -225,14 +225,11 @@
#CFE_SB_ReleaseMessageBuffer - \copybrief CFE_SB_ReleaseMessageBuffer
#CFE_SB_TransmitBuffer - \copybrief CFE_SB_TransmitBuffer
- \ref CFEAPISBSetMessage
+ \ref CFEAPISBMessageCharacteristics
- #CFE_SB_SetUserDataLength - \copybrief CFE_SB_SetUserDataLength
- #CFE_SB_TimeStampMsg - \copybrief CFE_SB_TimeStampMsg
- #CFE_SB_MessageStringSet - \copybrief CFE_SB_MessageStringSet
-
- \ref CFEAPIGetMessage
-
- #CFE_SB_GetUserData - \copybrief CFE_SB_GetUserData
- #CFE_SB_GetUserDataLength - \copybrief CFE_SB_GetUserDataLength
- #CFE_SB_MessageStringGet - \copybrief CFE_SB_MessageStringGet
diff --git a/modules/core_api/fsw/inc/cfe_sb.h b/modules/core_api/fsw/inc/cfe_sb.h
index 92f83c82c..0d0bca144 100644
--- a/modules/core_api/fsw/inc/cfe_sb.h
+++ b/modules/core_api/fsw/inc/cfe_sb.h
@@ -569,7 +569,7 @@ CFE_Status_t CFE_SB_TransmitBuffer(CFE_SB_Buffer_t *BufPtr, bool IncrementSequen
/** @} */
-/** @defgroup CFEAPISBSetMessage cFE Setting Message Characteristics APIs
+/** @defgroup CFEAPISBMessageCharacteristics cFE Message Characteristics APIs
* @{
*/
@@ -647,11 +647,6 @@ void CFE_SB_TimeStampMsg(CFE_MSG_Message_t *MsgPtr);
*/
int32 CFE_SB_MessageStringSet(char *DestStringPtr, const char *SourceStringPtr, size_t DestMaxSize,
size_t SourceMaxSize);
-/** @} */
-
-/** @defgroup CFEAPIGetMessage cFE Getting Message Characteristics APIs
- * @{
- */
/*****************************************************************************/
/**