diff --git a/config/default_cf_extern_typedefs.h b/config/default_cf_extern_typedefs.h
index 0e5cd044..04f5bbf8 100644
--- a/config/default_cf_extern_typedefs.h
+++ b/config/default_cf_extern_typedefs.h
@@ -34,8 +34,8 @@
 #include "cf_eds_typedefs.h"
 
 typedef CF_QueueIdx_Enum_t CF_QueueIdx_t;
-#define CF_QueueIdx_NUM       (1 + CF_QueueIdx_Enum_t_MAX)
-#define CF_GetSet_ValueID_MAX (1 + CF_GetSet_ValueID_Enum_t_MAX)
+#define CF_QueueIdx_NUM       (1 + EdsDataType_CF_QueueIdx_t_MAX)
+#define CF_GetSet_ValueID_MAX (1 + EdsDataType_CF_GetSet_ValueID_t_MAX)
 
 typedef CF_EntityId_Atom_t       CF_EntityId_t;
 typedef CF_TransactionSeq_Atom_t CF_TransactionSeq_t;
@@ -43,8 +43,8 @@ typedef CF_TransactionSeq_Atom_t CF_TransactionSeq_t;
 typedef CF_CFDP_Enum_t           CF_CFDP_Class_t;
 typedef CF_GetSet_ValueID_Enum_t CF_GetSet_ValueID_t;
 
-typedef BASE_TYPES_PathName_String_t CF_PathName_t;
-typedef BASE_TYPES_FileName_String_t CF_FileName_t;
+typedef EdsDataType_BASE_TYPES_PathName_t CF_PathName_t;
+typedef EdsDataType_BASE_TYPES_FileName_t CF_FileName_t;
 
 #define CF_FILENAME_MAX_NAME ((int)sizeof(CF_FileName_t))
 #define CF_FILENAME_MAX_LEN  ((int)sizeof(CF_PathName_t))
diff --git a/fsw/src/cf_eds_dispatch.c b/fsw/src/cf_eds_dispatch.c
index 001b7f4f..436f248f 100644
--- a/fsw/src/cf_eds_dispatch.c
+++ b/fsw/src/cf_eds_dispatch.c
@@ -8,7 +8,7 @@
 
 #include "cfe_msg.h"
 
-static const CF_Application_Component_Telecommand_DispatchTable_t CF_TC_DISPATCH_TABLE = {
+static const EdsDispatchTable_CF_Application_CFE_SB_Telecommand_t CF_TC_DISPATCH_TABLE = {
     .CMD =
         {
 
@@ -48,8 +48,7 @@ void CF_AppPipe(const CFE_SB_Buffer_t *msg)
     CFE_MSG_Size_t    MsgSize;
     CFE_MSG_FcnCode_t MsgFc;
 
-    status = CF_Application_Component_Telecommand_Dispatch(CFE_SB_Telecommand_indication_Command_ID, msg,
-                                                           &CF_TC_DISPATCH_TABLE);
+    status = EdsDispatch_CF_Application_Telecommand(msg, &CF_TC_DISPATCH_TABLE);
 
     if (status != CFE_SUCCESS)
     {
@@ -58,9 +57,8 @@ void CF_AppPipe(const CFE_SB_Buffer_t *msg)
 
         if (status == CFE_STATUS_UNKNOWN_MSG_ID)
         {
-            CFE_EVS_SendEvent(CF_EID_ERR_INVALID_MID, CFE_EVS_EventType_ERROR,
-                              "L%d TO: Invalid Msg ID Rcvd 0x%x status=0x%08x", __LINE__,
-                              (unsigned int)CFE_SB_MsgIdToValue(MsgId), (unsigned int)status);
+            CFE_EVS_SendEvent(CF_MID_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO: Invalid Msg ID Rcvd 0x%x status=0x%08x",
+                              __LINE__, (unsigned int)CFE_SB_MsgIdToValue(MsgId), (unsigned int)status);
         }
         else if (status == CFE_STATUS_WRONG_MSG_LENGTH)
         {