Index: Messages/Unhandled.conf
===================================================================
diff -u -r8216765a858a256f05dcf3e3ed4719135bb854bc -r59be3f1ee61198df0a8e36e81498cc33466c1dba
--- Messages/Unhandled.conf	(.../Unhandled.conf)	(revision 8216765a858a256f05dcf3e3ed4719135bb854bc)
+++ Messages/Unhandled.conf	(.../Unhandled.conf)	(revision 59be3f1ee61198df0a8e36e81498cc33466c1dba)
@@ -35,15 +35,9 @@
 
 [0x0100]
 OFF_BUTTON_PRESS
-U08=userRequest
 
 [0x0200]
 ALARM_STATUS
-U32=alarmState
-U32=alarmTop
-U32=escalatesIn
-U32=silenceExpiresIn
-U16=alarmsFlags
 
 [0x0300]
 ALARM_TRIGGERED
@@ -119,26 +113,13 @@
 
 [0x0D00]
 TREATMENT_TIME
-U32=treatmentTimePrescribedinSec
-U32=treatmentTimeElapsedinSec
-U32=treatmentTimeRemaininginSec
 
 [0x0E00]
 POWER_OFF_WARNING
 U32=powerOffWarning
 
 [0x0F00]
 TREATMENT
-U32=treatmentSubMode
-U32=uFState
-U32=salineBolusState
-U32=heparinState
-U32=rinsebackState
-U32=txRecircState
-U32=bldPrimeState
-U32=txEndState
-U32=txStopState
-U32=dialysisState
 
 [0x1000]
 UF_PAUSE_RESUME
@@ -155,13 +136,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
@@ -171,8 +152,6 @@
 
 [0x1500]
 CONFIRM_UF_SETTINGS_CHANGE
-F32=volume_mL
-U32=adjustType
 
 [0x1600]
 TREATMENT_TIME_CHANGE
@@ -186,7 +165,7 @@
 [0x1800]
 BLOOD_DIAL_RATE_CHANGE
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 U32=bloodRate
 U32=dialRate
 
@@ -201,25 +180,16 @@
 
 [0x1A00]
 TREATMENT_PARAM_CHANGE_RANGES
-U32=minTreatmentTime
-U32=maxTreatmentTime
-F32=minUFVolume
-F32=maxUFVolume
-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
 U08=major
 U08=minor
 U08=micro
@@ -230,6 +200,9 @@
 U08=fpgaLab
 U32=compatibilityRev
 
+[0x1D00]
+VERSION_REPONSE
+
 [0x1E00]
 VERSION_REPONSE
 U08=major
@@ -266,16 +239,16 @@
 
 [0x2200]
 FILL
-U32=fillToVolMl
+U32=fillToVolumeMl
 U32=cmd
-F32=targetFlowRateLPM
+F32=targetFlowLPM
 
 [0x2300]
 DRAIN
-U32=drainToVolumeML
-BOOL=tareLoadCells
+U32=targetVolume
+BOOL=tareLoadCell
 BOOL=rinseConcentrateLines
-BOOL=cmd
+U32=cmd
 
 [0x2400]
 DRAIN_PUMP
@@ -289,12 +262,12 @@
 
 [0x2500]
 OP_MODE
-U32=opMode
-U32=subMode
+U32=payloadPtr
+U32=payloadPtr
 
 [0x2600]
 STARTING_STOPPING_TREATMENT
-BOOL=start
+BOOL=startingTreatment
 
 [0x2700]
 OP_MODE
@@ -321,7 +294,7 @@
 
 [0x2900]
 SAMPLE_WATER
-U32=cmd
+U32=sampleWaterCmd
 
 [0x2A00]
 VALVES_S
@@ -330,7 +303,7 @@
 
 [0x2B00]
 START_STOP_TRIMMER_HEATER
-BOOL=start
+BOOL=startHeater
 
 [0x2C00]
 HEATERS
@@ -373,10 +346,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
@@ -386,7 +359,7 @@
 
 [0x3000]
 START_STOP_HEAT_DISINFECT
-BOOL=start
+U32=startingDGHeatDisinfect
 
 [0x3100]
 CONDUCTIVITY
@@ -406,7 +379,6 @@
 
 [0x3200]
 ALARM_SILENCE
-U32=cmd
 
 [0x3300]
 ACCELEROMETER
@@ -434,24 +406,6 @@
 
 [0x3500]
 NEW_TREATMENT_PARAMS
-U32=bloodFlowRate_mL_min
-U32=dialysateFlowRate_mL_min
-U32=treatmentDuration_min
-U32=heparinPreStop_min
-U32=salineBolusVolume_mL
-U32=acidConcentrate
-U32=bicarbConcentrate
-U32=dialyzerType
-U32=heparinType
-U32=bloodPressureMeasurementInterval_min
-U32=rinsebackFlowRate_mL_min
-S32=arterialPressureLowLimit_mmHg
-S32=arterialPressureHighLimit_mmHg
-S32=venousPressureLowLimit_mmHg
-S32=venousPressureHighLimit_mmHg
-F32=heparinDispenseRate_mL_hr
-F32=heparinBolusVolume_mL
-F32=dialysateTemperature_degC
 
 [0x3600]
 NEW_TREATMENT_PARAMS
@@ -475,7 +429,7 @@
 [0x3900]
 INITIATE_TREATMENT
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x3A00]
 VALVES
@@ -493,15 +447,14 @@
 
 [0x3B00]
 CONFIRM_TREATMENT_PARAMS
-BOOL=confirmed
 
 [0x3C00]
 START_PRIME
 
 [0x3D00]
 START_PRIME
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x3E00]
 AIR_TRAP
@@ -514,7 +467,6 @@
 
 [0x4000]
 ALARM__ACTION
-U32=action
 
 [0x4100]
 UF_PAUSE_RESUME
@@ -599,21 +551,17 @@
 
 [0x4C00]
 HEPARIN_PAUSE_RESUME
-BOOL=accepted
-U32=rejectionReason
+U32=accepted
+U32=rejReason
 
 [0x4D00]
 HEPARIN
-F32=syringePumpVolumeDelivered
-F32=syringePumpVolumeRequired
 
 [0x4E00]
 SET_ALARM_AUDIO_VOLUME_LEVEL
-U32=payload
 
 [0x4F00]
 SET_UF_VOLUME_PARAMETER
-F32=uFVolumeMl
 
 [0x5000]
 SET_UF_VOLUME_PARAMETER
@@ -629,7 +577,6 @@
 
 [0x5200]
 RINSEBACK
-U32=cmd
 
 [0x5300]
 RINSEBACK
@@ -638,7 +585,6 @@
 
 [0x5400]
 RECIRC
-U32=cmd
 
 [0x5500]
 RECIRC
@@ -656,7 +602,6 @@
 
 [0x5700]
 TX_END
-U32=cmd
 
 [0x5800]
 TX_END
@@ -665,40 +610,24 @@
 
 [0x5900]
 BLOOD_PRIME_PROGRESS
-F32=targetBloodPrimeVolumeMl
-F32=deliveredBloodPrimeVolumeMl
 
 [0x5A00]
 RECIRC_PROGRESS
-U32=timeout
-U32=countdown
 
 [0x5B00]
 CHANGE_VALVE_SETTING
-U32=valveSettingCmd
+U32=valveSettingID
 
 [0x5C00]
 PRE_TREATMENT
-U32=preTreatmentSubMode
-U32=sampleWaterState
-U32=consumableSelfTestsState
-U32=noCartSelfTestsState
-U32=installState
-U32=drySelfTestsState
-U32=primeState
-U32=recircState
-U32=patientConnectionState
-U32=wetSelfTestsState
-U32=preTreatmentRsrvrState
 
 [0x5D00]
 SAMPLE_WATER
-U32=cmd
 
 [0x5E00]
 SAMPLE_WATER
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x5F00]
 SAMPLE_WATER_RESULT
@@ -711,32 +640,28 @@
 
 [0x6100]
 NO_CART_SELF_TEST_PROGRESS
-U32=timeout
-U32=countdown
 
 [0x6200]
 INSTALLATION_CONFIRM
 
 [0x6300]
 DRY_SELF_TEST_PROGRESS
-U32=timeout
-U32=countdown
 
 [0x6400]
 PATIENT_CONNECTION_BEGIN
 
 [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
@@ -757,7 +682,6 @@
 
 [0x6A00]
 FLD_LEAK
-U32=fluidLeakState
 
 [0x6B00]
 FLD_LEAK
@@ -794,23 +718,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
@@ -848,16 +772,14 @@
 
 [0x7700]
 POST_TREATMENT
-U32=currentPostTreatmentState
-U32=currentPostTxDrainState
 
 [0x7800]
 START_STOP_CHEM_DISINFECT
 BOOL=start
 
 [0x7900]
 START_STOP_FLUSH
-BOOL=start
+U32=startingDGFlush
 
 [0x7A00]
 FLUSH
@@ -883,17 +805,11 @@
 
 [0x7C00]
 ALARM_AUDIO_VOLUME_SET
-BOOL=accepted
-U32=rejectionReason
+U32=accepted
+U32=rejReason
 
 [0x7D00]
 ALARM_INFORMATION
-U32=audioVolume
-F32=audioCurrHG
-F32=audioCurrLG
-F32=backupAudioCurr
-BOOL=safetyShutdown
-U08=uiAlarmButtonBlocks[NUM_OF_ALARM_BUTTON_BLOCKERS]
 
 [0x7E00]
 DISINFECT_STANDBY
@@ -909,7 +825,7 @@
 [0x8000]
 DISINFECT
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x8100]
 CHEM_DISINFECT_CONFIRM
@@ -972,10 +888,6 @@
 
 [0x8900]
 SERVICE_INFO
-U32=payloadPtr
-U32=payloadPtr
-U32=payloadPtr
-U32=payloadPtr
 
 [0x8A00]
 SERVICE_SCHEDULE
@@ -1058,13 +970,12 @@
 
 [0x9800]
 ACTIVE_ALARMS_LIST
-BOOL=accepted
-U32=rejectionReason
-U32=activeAlarmList[=MAX_ALARM_LIST_SIZE=]
+U32=accepted
+U32=reason
+=alarmList
 
 [0x9900]
 SERIAL_NUMBER
-U08=system.topLevelSN
 
 [0x9A00]
 SET_STANDBY_DISINFECT_SUB_MODE
@@ -1073,7 +984,7 @@
 [0x9B00]
 SET_STANDBY_DISINFECT_SUB_MODE
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0x9C00]
 POST_RESULT
@@ -1091,15 +1002,9 @@
 
 [0x9F00]
 VERSION_INFO
-U08=major
-U08=minor
-U08=micro
-U16=build
-U32=compatibility
 
 [0xA000]
 USAGE_INFO
-U32=payloadPtr
 
 [0xA100]
 SWITCHES
@@ -1120,11 +1025,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
@@ -1154,6 +1059,9 @@
 
 [0xA900]
 CONCENTRATE_MIXING_RATIOS
+F32=payloadPtr
+F32=payloadPtr
+U32=payloadPtr
 
 [0xAA00]
 CONCENTRATE_MIXING_RATIOS
@@ -1170,7 +1078,7 @@
 [0xAD00]
 INSTALLATION_CONFIRM
 BOOL=accepted
-U32=rejectionReason
+U32=reason
 
 [0xAE00]
 FILL_MODE
@@ -1225,20 +1133,27 @@
 
 [0xB800]
 USAGE_INFO
+F32=roWaterGenTotalL
+F32=roWaterGenSinceLastServiceL
+U32=lastBasicFlushCompleteDateEpoch
+U32=lastChemDisStartDateEpoch
+U32=lastChemDisCompleteDateEpoch
+U32=lastChemDisFlushCompleteDateEpoch
+U32=lastHeatDisCompleteDateEpoch
+U32=lastFilterFlushCompleteDateEpoch
+U32=lastResetTimeEpoch
+U16=crc
 
 [0xB900]
 SERVICE_RECORD
+U32=payloadPtr
+U32=payloadPtr
 
 [0xBA00]
 CONFIRMATION
-U32=temp_request
-U32=temp_request
-U32=reject_reason
 
 [0xBB00]
 CONFIRMATION_RESULT
-U32=request_id
-U32=status
 
 [0xBC00]
 CPLD_STATUS