Index: configurations/Messages/Unhandled.conf
===================================================================
diff -u -raf668d1147f2ce9338a4871c55b1cca4ee428385 -rdbefbc2531af9cbd168b27031d510c9720edb92f
--- configurations/Messages/Unhandled.conf	(.../Unhandled.conf)	(revision af668d1147f2ce9338a4871c55b1cca4ee428385)
+++ configurations/Messages/Unhandled.conf	(.../Unhandled.conf)	(revision dbefbc2531af9cbd168b27031d510c9720edb92f)
@@ -53,7 +53,7 @@
 
 [0x0300]
 MSG_ID_ALARM_CLEARED
-U32=alarmID
+U32=alarmName
 
 [0x0400]
 MSG_ID_ALARM_CONDITION_CLEARED
@@ -479,6 +479,7 @@
 F32=bicarbConvFactor
 U32=sodium
 U32=bicarbonate
+F32=substitutionRate
 
 [0x3100]
 MSG_ID_FP_VALVES_STATES_DATA
@@ -568,15 +569,15 @@
 U32=rinsebackState
 U32=txRecircState
 U32=txEndState
-U32=txSalBolusState
+U32=txFluidBolusState
 U32=txHepState
 
 [0x3D00]
-MSG_ID_TD_SALINE_BOLUS_DATA
-U32=tgtSalineVolumeMl
-F32=cumSalineVolumeMl
-F32=bolSalineVolumeMl
-U32=salineBolusState
+MSG_ID_TD_FLUID_BOLUS_DATA
+U32=tgtFluidVolumeMl
+F32=bolFluidVolumeMl
+F32=cumFluidVolumeMl
+BOOL=bolusPermitted
 
 [0x3E00]
 MSG_ID_TD_ULTRAFILTRATION_DATA
@@ -762,7 +763,7 @@
 
 [0x5800]
 MSG_ID_FP_GENP_DEF_DATA
-U32=preGenPermeateDefExecState
+U32=genPermeateDefExecState
 
 [0x5900]
 MSG_ID_FP_PRE_GEN_DEF_DATA
@@ -793,10 +794,14 @@
 U32=totalSpentChamberfillCounter
 
 [0x5F00]
-MSG_ID_UI_SOLUTION_INFUSION_REQUEST
+MSG_ID_UI_FLUID_BOLUS_REQUEST
+U32=cmd
 
 [0x6000]
-MSG_ID_TD_SOLUTION_INFUSION_RESPONSE
+MSG_ID_TD_FLUID_BOLUS_RESPONSE
+U32=accepted
+U32=rejectionReason
+U32=targetVolumeMl
 
 [0x6100]
 MSG_ID_DD_BLOOD_LEAK_DATA