Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1566855e6eec33be7b5cfb3d2ba1d1de8cee16e5 -r336cb4935bf768db17bd6b7a02668510289b712e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1566855e6eec33be7b5cfb3d2ba1d1de8cee16e5)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 336cb4935bf768db17bd6b7a02668510289b712e)
@@ -300,7 +300,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_OFF_BUTTON_PRESS;
+    msg.hdr.msgID = MSG_ID_OFF_BUTTON_PRESS_REQUEST;
     msg.hdr.payloadLen = sizeof( UI_OFF_BUTTON_RESPONSE_PAYLOAD_T );
 
     memcpy(&msg.payload, &cmd, sizeof( UI_OFF_BUTTON_RESPONSE_PAYLOAD_T ) );
@@ -1420,7 +1420,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_SWITCH_RESERVOIR_CMD;
+    msg.hdr.msgID = MSG_ID_DG_SWITCH_RESERVOIR_CMD_REQUEST;
     msg.hdr.payloadLen = sizeof( DG_SWITCH_RSRVRS_CMD_T );
 
     memcpy( payloadPtr, cmd, sizeof( DG_SWITCH_RSRVRS_CMD_T ) );
@@ -1448,7 +1448,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_CHANGE_VALVE_SETTING_CMD;
+    msg.hdr.msgID = MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST;
     msg.hdr.payloadLen = sizeof( U32 );
 
     memcpy( payloadPtr, &valveSettingCmd, sizeof( U32 ) );
@@ -1478,7 +1478,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_FILL_CMD;
+    msg.hdr.msgID = MSG_ID_DG_FILL_CMD_REQUEST;
     msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( F32 );
 
     memcpy( payloadPtr, &fillToVolumeMl, sizeof( U32 ) );
@@ -1510,7 +1510,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_DRAIN_CMD;
+    msg.hdr.msgID = MSG_ID_DG_DRAIN_CMD_REQUEST;
     msg.hdr.payloadLen = sizeof( DRAIN_RESERVOIR_CMD_PAYLOAD_T );
 
     memcpy( payloadPtr, drainCmdPtr, sizeof( DRAIN_RESERVOIR_CMD_PAYLOAD_T ) );
@@ -1538,7 +1538,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_STARTING_STOPPING_TREATMENT_CMD;
+    msg.hdr.msgID = MSG_ID_STARTING_STOPPING_TREATMENT_CMD_REQUEST;
     msg.hdr.payloadLen = sizeof( BOOL );
 
     memcpy( payloadPtr, &start, sizeof( BOOL ) );
@@ -1567,7 +1567,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD;
+    msg.hdr.msgID = MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD_REQUEST;
     msg.hdr.payloadLen = sizeof( BOOL );
 
     memcpy( payloadPtr, &start, sizeof( BOOL ) );
@@ -1594,7 +1594,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_SAMPLE_WATER_CMD;
+    msg.hdr.msgID = MSG_ID_DG_SAMPLE_WATER_CMD_REQUEST;
     msg.hdr.payloadLen = sizeof( U32 );
 
     memcpy( msg.payload, &cmd, sizeof( U32 ) );
@@ -1715,7 +1715,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_START_STOP_FLUSH_CMD;
+    msg.hdr.msgID = MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST;
     msg.hdr.payloadLen = sizeof( BOOL );
 
     memcpy( msg.payload, &start, sizeof( BOOL ) );
@@ -1744,7 +1744,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD;
+    msg.hdr.msgID = MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST;
     msg.hdr.payloadLen = sizeof( BOOL );
 
     memcpy( msg.payload, &start, sizeof( BOOL ) );
@@ -1818,7 +1818,7 @@
     payload.alarmsFlags |= ( almStatus.noMinimize                   ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE)        : 0 );
     payload.alarmsFlags |= ( almStatus.topAlarmConditionDetected    ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION)      : 0 );
 
-    result = broadcastData( MSG_ID_ALARM_STATUS, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&payload, sizeof( ALARM_COMP_STATUS_PAYLOAD_T ) );
+    result = broadcastData( MSG_ID_ALARM_STATUS_DATA, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&payload, sizeof( ALARM_COMP_STATUS_PAYLOAD_T ) );
 
     return result;
 }
@@ -1957,7 +1957,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS;
+    msg.hdr.msgID = MSG_ID_HD_DG_CONCENTRATE_MIXING_RATIOS_REQUEST;
     msg.hdr.payloadLen = 0;
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
@@ -3113,7 +3113,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_REQUEST_FW_VERSIONS;
+    msg.hdr.msgID = MSG_ID_FW_VERSIONS_REQUEST;
     msg.hdr.payloadLen = sizeof( UI_VERSIONS_T );  // usually UI sends this request w/ UI version info - we will leave that blank
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
@@ -3318,7 +3318,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_REQUEST_UI_CONFIRMATION;
+    msg.hdr.msgID = MSG_ID_HD_UI_CONFIRMATION_REQUEST;
     // The payload length is U32 Request ID, U32 Type, U32 Reject Reason
     msg.hdr.payloadLen = 3 * sizeof( U32 );
 
@@ -7246,7 +7246,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_REQUEST_DG_ALARMS;
+    msg.hdr.msgID = MSG_ID_HD_DG_ALARMS_REQUEST;
     msg.hdr.payloadLen = 0;
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
@@ -7271,7 +7271,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID      = MSG_ID_HD_REQUEST_DG_USAGE_INFO;
+    msg.hdr.msgID      = MSG_ID_HD_DG_USAGE_INFO_REQUEST;
     msg.hdr.payloadLen = 0;
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
@@ -7296,7 +7296,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID      = MSG_ID_HD_REQUEST_DG_SERVICE_RECORD;
+    msg.hdr.msgID      = MSG_ID_HD_DG_SERVICE_RECORD_REQUEST;
     msg.hdr.payloadLen = 0;
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
@@ -7593,7 +7593,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_REQUEST_DG_SERVICE_MODE;
+    msg.hdr.msgID = MSG_ID_HD_DG_SERVICE_MODE_REQUEST;
     msg.hdr.payloadLen = 0;
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer