Index: Messages/Unhandled.conf
===================================================================
diff -u -r39a66e159b3ffb5091a6703212eafb80c7aeb0da -r7296e6ac371ddbf6e3b6cd7c5ecd04047c0198b3
--- Messages/Unhandled.conf	(.../Unhandled.conf)	(revision 39a66e159b3ffb5091a6703212eafb80c7aeb0da)
+++ Messages/Unhandled.conf	(.../Unhandled.conf)	(revision 7296e6ac371ddbf6e3b6cd7c5ecd04047c0198b3)
@@ -35,7 +35,6 @@
 
 [0x0100]
 OFF_BUTTON_PRESS
-U08=userRequest
 
 [0x0200]
 ALARM_STATUS
@@ -70,7 +69,7 @@
 U32=presFlow
 
 [0x0600]
-AVAILABLE_1
+CHECK_IN
 
 [0x0700]
 CHECK_IN
@@ -155,13 +154,13 @@
 [0x1300]
 UF_SETTINGS_CHANGE
 BOOL=accepted
-U32=rejectionReason
-F32=ufVolume
-U32=durationInMinutes
+U32=reason
+F32=volume_mL
+U32=time_min
 S32=timeDiff
-F32=ufRate
+F32=ufRate_mL_min
 F32=rateDiff
-F32=oldUFRate
+F32=oldUFRate_mL_min
 
 [0x1400]
 SALINE_BOLUS
@@ -186,7 +185,7 @@
 [0x1800]
 BLOOD_DIAL_RATE_CHANGE
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 U32=bloodRate
 U32=dialRate
 
@@ -201,25 +200,25 @@
 
 [0x1A00]
 TREATMENT_PARAM_CHANGE_RANGES
-U32=minTreatmentTime
-U32=maxTreatmentTime
-F32=minUFVolume
-F32=maxUFVolume
+U32=minTime
+U32=maxTime
+F32=minUFVol
+F32=maxUFVol
 U32=minDialRate
 U32=maxDialRate
 
 [0x1B00]
 TREATMENT_TIME_CHANGE
 BOOL=accepted
-U32=rejectionReason
-U32=duration
-F32=volume
+U32=reason
+U32=time_min
+F32=volume_mL
 
 [0x1C00]
 FW_VERSIONS
 
 [0x1D00]
-VERSION_REPONSE
+VERSION
 U08=major
 U08=minor
 U08=micro
@@ -231,7 +230,7 @@
 U32=compatibilityRev
 
 [0x1E00]
-VERSION_REPONSE
+VERSION
 U08=major
 U08=minor
 U08=micro
@@ -266,7 +265,7 @@
 
 [0x2200]
 FILL
-U32=fillToVolMl
+U32=fillToVolumeMl
 U32=cmd
 F32=targetFlowRateLPM
 
@@ -373,10 +372,10 @@
 [0x2E00]
 UF_SETTINGS_CHANGE_CONFIRMATION
 BOOL=accepted
-U32=rejectionReason
-F32=volume
-U32=duration
-F32=ufRate
+U32=reason
+F32=volume_mL
+U32=time_min
+F32=ufRate_mL_min
 
 [0x2F00]
 SALINE_BOLUS
@@ -475,7 +474,7 @@
 [0x3900]
 INITIATE_TREATMENT
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x3A00]
 VALVES
@@ -501,7 +500,7 @@
 [0x3D00]
 START_PRIME
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x3E00]
 AIR_TRAP
@@ -599,8 +598,8 @@
 
 [0x4C00]
 HEPARIN_PAUSE_RESUME
-BOOL=accepted
-U32=rejectionReason
+U32=accepted
+U32=rejReason
 
 [0x4D00]
 HEPARIN
@@ -698,7 +697,7 @@
 [0x5E00]
 SAMPLE_WATER
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x5F00]
 SAMPLE_WATER_RESULT
@@ -728,15 +727,15 @@
 [0x6500]
 PATIENT_CONNECTION_BEGIN
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x6600]
 PATIENT_CONNECTION_CONFIRM
 
 [0x6700]
 PATIENT_CONNECTION_CONFIRM
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x6800]
 CONSUMABLE_INSTALL_CONFIRM
@@ -794,23 +793,23 @@
 [0x7200]
 START_TREATMENT
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x7300]
 DISPOSABLE_REMOVAL_CONFIRM
 
 [0x7400]
 DISPOSABLE_REMOVAL_CONFIRM
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x7500]
 TREATMENT_LOG
 
 [0x7600]
 TREATMENT_LOG
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 U32=bloodFlowRate_mL_min
 U32=dialysateFlowRate_mL_min
 U32=treatmentDuration_sec
@@ -883,8 +882,8 @@
 
 [0x7C00]
 ALARM_AUDIO_VOLUME_SET
-BOOL=accepted
-U32=rejectionReason
+U32=accepted
+U32=rejReason
 
 [0x7D00]
 ALARM_INFORMATION
@@ -909,7 +908,7 @@
 [0x8000]
 DISINFECT
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x8100]
 CHEM_DISINFECT_CONFIRM
@@ -1002,6 +1001,7 @@
 U32=lastChemDisCompleteDateEpoch
 U32=lastChemDisFlushCompleteDateEpoch
 U32=lastHeatDisCompleteDateEpoch
+U32=lastHeatActiveCoolCompleteDateEpoch
 U32=lastFilterFlushCompleteDateEpoch
 U32=lastResetTimeEpoch
 U16=crc
@@ -1058,9 +1058,9 @@
 
 [0x9800]
 ACTIVE_ALARMS_LIST
-BOOL=accepted
-U32=rejectionReason
-U32=activeAlarmList[=MAX_ALARM_LIST_SIZE=]
+U32=accepted
+U32=reason
+U32=alarmList
 
 [0x9900]
 SERIAL_NUMBER
@@ -1073,7 +1073,7 @@
 [0x9B00]
 SET_STANDBY_DISINFECT_SUB_MODE
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x9C00]
 POST_RESULT
@@ -1120,11 +1120,11 @@
 
 [0xA400]
 EVENT
-U32=event
+U32=e
 U32=dataType1
-EVENT_DATAS_T=data1
+EVENT_DATA_U32_T=uIntOREVENT_DATA_S32_T=sIntOREVENT_DATA_F32_T=fltOREVENT_DATA_BOOL_T=bln
 U32=dataType2
-EVENT_DATAS_T=data2
+EVENT_DATA_U32_T=uIntOREVENT_DATA_S32_T=sIntOREVENT_DATA_F32_T=fltOREVENT_DATA_BOOL_T=bln
 
 [0xA500]
 EVENT
@@ -1170,7 +1170,7 @@
 [0xAD00]
 INSTALLATION_CONFIRM
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0xAE00]
 FILL_MODE
@@ -1242,10 +1242,6 @@
 
 [0xBC00]
 CPLD_STATUS
-U08=wdog
-U08=audio
-U08=fault_led
-U08=clean_led
 
 [0xBD00]
 CPLD_STATUS
@@ -1309,7 +1305,7 @@
 
 [0xC200]
 START_STOP_CHEM_DISINFECT_FLUSH
-BOOL=startingDGChemicalDisinfectFlush
+BOOL=start
 
 [0xC300]
 CHEM_DISINFECT_FLUSH_CONFIRM
@@ -1334,6 +1330,7 @@
 
 [0xC800]
 SEND_CHEM_FLUSH_SAMPLE_PASS_FAIL_TO
+U32=status
 
 ### Test Support Functions ###