diff --git a/modules/es/config/default_cfe_es_msgdefs.h b/modules/es/config/default_cfe_es_msgdefs.h
index aae254ff0..f0da2e3d5 100644
--- a/modules/es/config/default_cfe_es_msgdefs.h
+++ b/modules/es/config/default_cfe_es_msgdefs.h
@@ -143,6 +143,20 @@ typedef struct CFE_ES_DeleteCDSCmd_Payload
         CdsName[CFE_MISSION_ES_CDS_MAX_FULL_NAME_LEN]; /**< \brief ASCII text string containing name of CDS to delete */
 } CFE_ES_DeleteCDSCmd_Payload_t;
 
+/**
+ * @brief Labels for values to use in #CFE_ES_StartPerfCmd_Payload.TriggerMode
+ * @sa CFE_ES_StartPerfCmd_Payload
+*/
+enum CFE_ES_PerfMode
+{
+    CFE_ES_PERF_TRIGGER_START = 0,
+    CFE_ES_PERF_TRIGGER_CENTER,
+    CFE_ES_PERF_TRIGGER_END,
+    CFE_ES_PERF_MAX_MODES
+};
+
+typedef uint32 CFE_ES_PerfMode_Enum_t;
+
 /**
 ** \brief Start Performance Analyzer Command Payload
 **
@@ -151,7 +165,7 @@ typedef struct CFE_ES_DeleteCDSCmd_Payload
 **/
 typedef struct CFE_ES_StartPerfCmd_Payload
 {
-    uint32 TriggerMode; /**< \brief Desired trigger position (Start, Center, End). Values defined by #CFE_ES_PerfMode. */
+    CFE_ES_PerfMode_Enum_t TriggerMode; /**< \brief Desired trigger position (Start, Center, End). Values defined by #CFE_ES_PerfMode. */
 } CFE_ES_StartPerfCmd_Payload_t;
 
 /**
diff --git a/modules/es/fsw/src/cfe_es_perf.h b/modules/es/fsw/src/cfe_es_perf.h
index f0244ff98..26c3c719f 100644
--- a/modules/es/fsw/src/cfe_es_perf.h
+++ b/modules/es/fsw/src/cfe_es_perf.h
@@ -49,25 +49,13 @@
 /**
  * @brief Internal states for Performance Analyzer
  */
-enum CFE_ES_PerfState
+typedef enum CFE_ES_PerfState
 {
     CFE_ES_PERF_IDLE = 0,
     CFE_ES_PERF_WAITING_FOR_TRIGGER,
     CFE_ES_PERF_TRIGGERED,
     CFE_ES_PERF_MAX_STATES
-};
-
-/**
- * @brief Labels for values to use in #CFE_ES_StartPerfCmd_Payload.TriggerMode
- * @sa CFE_ES_StartPerfCmd_Payload
-*/
-enum CFE_ES_PerfMode
-{
-    CFE_ES_PERF_TRIGGER_START = 0,
-    CFE_ES_PERF_TRIGGER_CENTER,
-    CFE_ES_PERF_TRIGGER_END,
-    CFE_ES_PERF_MAX_MODES
-};
+} CFE_ES_PerfState_t;
 
 /**
  * @brief Perflog Dump Background Job states