Index: leahi-dialin/protocols/CAN.py
===================================================================
diff -u -r07db7b5f01ad17d60c190e21574e1ed0552535ff -r0e196bf16c7f95a0ce38726425065ca59f254516
--- leahi-dialin/protocols/CAN.py	(.../CAN.py)	(revision 07db7b5f01ad17d60c190e21574e1ed0552535ff)
+++ leahi-dialin/protocols/CAN.py	(.../CAN.py)	(revision 0e196bf16c7f95a0ce38726425065ca59f254516)
@@ -379,24 +379,28 @@
     specifically in the CAN Channels sheet, should also be applied here.
     """
 
-    hd_alarm_broadcast_ch_id = 0x001
-    dg_alarm_broadcast_ch_id = 0x002
-    ui_alarm_broadcast_ch_id = 0x004
-    hd_to_dg_ch_id = 0x008
-    dg_to_hd_ch_id = 0x010
-    hd_to_ui_ch_id = 0x020
-    hd_sync_broadcast_ch_id = 0x040
-    dg_to_ui_ch_id = 0x070
-    dg_sync_broadcast_ch_id = 0x080
-    ui_to_hd_ch_id = 0x100
-    ui_to_dg_ch_id = 0x110
-    ui_sync_broadcast_ch_id = 0x200
-    dialin_to_hd_ch_id = 0x400
-    hd_to_dialin_ch_id = 0x401
-    dialin_to_dg_ch_id = 0x402
-    dg_to_dialin_ch_id = 0x403
-    dialin_to_ui_ch_id = 0x404
-    ui_to_dialin_ch_id = 0x405
+    td_alarm_broadcast_ch_id = 0x001
+    dd_alarm_broadcast_ch_id = 0x002
+    ro_alarm_broadcast_ch_id = 0x004
+    ui_alarm_broadcast_ch_id = 0x008
+    td_to_dd_ch_id = 0x010
+    dd_to_td_ch_id = 0x011
+    dd_to_ro_ch_id = 0x020
+    ro_to_dd_ch_id = 0x021
+    td_to_ui_ch_id = 0x040
+    ui_to_td_ch_id = 0x041
+    td_sync_broadcast_ch_id = 0x100
+    dd_sync_broadcast_ch_id = 0x101
+    ro_sync_broadcast_ch_id = 0x102
+    ui_sync_broadcast_ch_id = 0x103
+    dialin_to_td_ch_id = 0x400
+    td_to_dialin_ch_id = 0x401
+    dialin_to_dd_ch_id = 0x402
+    dd_to_dialin_ch_id = 0x403
+    dialin_to_ro_ch_id = 0x404
+    ro_to_dialin_ch_id = 0x405
+    dialin_to_ui_ch_id = 0x406
+    ui_to_dialin_ch_id = 0x407
 
 
 class LongDenaliMessageBuilder:
Index: leahi-dialin/td/modules/air_trap.py
===================================================================
diff -u -r4e2e867e7ee1fcf889b286167a3d6bb7f4fefb80 -r0e196bf16c7f95a0ce38726425065ca59f254516
--- leahi-dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 4e2e867e7ee1fcf889b286167a3d6bb7f4fefb80)
+++ leahi-dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 0e196bf16c7f95a0ce38726425065ca59f254516)
@@ -226,7 +226,7 @@
         sts = integer_to_bytearray(valve_state)
         payload = sts + vlv
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
                                               message_id=MsgIds.MSG_ID_TD_2_WAY_VALVE_SET_STATE_REQUEST.value,
                                               payload=payload)
         # Send message
Index: leahi-dialin/td/treatment_delivery.py
===================================================================
diff -u -r4e2e867e7ee1fcf889b286167a3d6bb7f4fefb80 -r0e196bf16c7f95a0ce38726425065ca59f254516
--- leahi-dialin/td/treatment_delivery.py	(.../treatment_delivery.py)	(revision 4e2e867e7ee1fcf889b286167a3d6bb7f4fefb80)
+++ leahi-dialin/td/treatment_delivery.py	(.../treatment_delivery.py)	(revision 0e196bf16c7f95a0ce38726425065ca59f254516)
@@ -82,7 +82,7 @@
         self.callback_id = None
         # register handler for TD operation mode broadcast messages
         if self.can_interface is not None:
-            channel_id = DenaliChannels.TD_sync_broadcast_ch_id
+            channel_id = DenaliChannels.td_sync_broadcast_ch_id
             msg_id = MsgIds.MSG_ID_TD_OP_MODE_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_td_op_mode_sync)