Index: MsgDefs.h
===================================================================
diff -u -r0a08bfab79f4b4f3438902008a239f10ac4963a9 -r26fe07688d657baea9b1781c20561cc9c63aee0d
--- MsgDefs.h	(.../MsgDefs.h)	(revision 0a08bfab79f4b4f3438902008a239f10ac4963a9)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 26fe07688d657baea9b1781c20561cc9c63aee0d)
@@ -203,11 +203,10 @@
     MSG_ID_UI_ADJUST_PATIENT_DISCONNECT_CONFIRM_REQUEST = 0xAB,                     ///< UI adjust patient disconnect confirm request
     MSG_ID_TD_ADJUST_PATIENT_DISCONNECT_CONFIRM_RESPONSE = 0xAC,                    ///< TD adjust patient disconnect confirm response
     MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAD,                                   ///< TD dry self test progress data
-    MSG_ID_TD_TUBING_SET_BARCODE_SCAN_REQUEST = 0xAE,                               ///< TD tube set authentication request
-    MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAF,                               ///< UI tube set authentication acknowledge request
-    MSG_ID_TD_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xB0,                          ///< TD tube set authentication acknowledge response
-    MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB1,                                             ///< TD broadcast of syringe pump data
-    MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2,                                  ///< TD response to pause/resume Heparin delivery request
+    MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAE,                               ///< UI tube set authentication acknowledge request
+    MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xAF,                          ///< TD tube set authentication acknowledge response
+    MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB0,                                             ///< TD broadcast of syringe pump data
+    MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB1,                                  ///< TD response to pause/resume Heparin delivery request
 
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID