Index: leahi_dialin/protocols/CAN.py
===================================================================
diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rbe6aa30cfb37a47935f3c114ecece9ee75809909
--- leahi_dialin/protocols/CAN.py	(.../CAN.py)	(revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f)
+++ leahi_dialin/protocols/CAN.py	(.../CAN.py)	(revision be6aa30cfb37a47935f3c114ecece9ee75809909)
@@ -260,36 +260,39 @@
 
         if passive_mode:
             channel_rx_tx_pairs = {
-                DenaliChannels.hd_alarm_broadcast_ch_id: None,
-                DenaliChannels.dg_alarm_broadcast_ch_id: None,
+                DenaliChannels.td_alarm_broadcast_ch_id: None,
+                DenaliChannels.dd_alarm_broadcast_ch_id: None,
+                DenaliChannels.ro_alarm_broadcast_ch_id: None,
                 DenaliChannels.ui_alarm_broadcast_ch_id: None,
-                DenaliChannels.hd_to_dg_ch_id: None,
-                DenaliChannels.dg_to_hd_ch_id: None,
-                DenaliChannels.hd_to_ui_ch_id: None,
-                DenaliChannels.hd_sync_broadcast_ch_id: None,
-                DenaliChannels.dg_to_ui_ch_id: None,
-                DenaliChannels.dg_sync_broadcast_ch_id: None,
-                DenaliChannels.ui_to_hd_ch_id: None,
+                DenaliChannels.td_to_dd_ch_id: None,
+                DenaliChannels.dd_to_td_ch_id: None,
+                DenaliChannels.td_to_ui_ch_id: None,
+                DenaliChannels.td_sync_broadcast_ch_id: None,
+                DenaliChannels.dd_sync_broadcast_ch_id: None,
+                DenaliChannels.ro_sync_broadcast_ch_id: None,
+                DenaliChannels.ui_to_td_ch_id: None,
                 DenaliChannels.ui_sync_broadcast_ch_id: None,
-                DenaliChannels.hd_to_dialin_ch_id: DenaliChannels.dialin_to_hd_ch_id,
-                DenaliChannels.dg_to_dialin_ch_id: DenaliChannels.dialin_to_dg_ch_id,
+                DenaliChannels.td_to_dialin_ch_id: DenaliChannels.dialin_to_td_ch_id,
+                DenaliChannels.dd_to_dialin_ch_id: DenaliChannels.dialin_to_dd_ch_id,
+                DenaliChannels.ro_to_dialin_ch_id: DenaliChannels.dialin_to_ro_ch_id,
                 DenaliChannels.ui_to_dialin_ch_id: DenaliChannels.dialin_to_ui_ch_id
             }
         else:
             channel_rx_tx_pairs = {
-                DenaliChannels.hd_alarm_broadcast_ch_id: None,
-                DenaliChannels.dg_alarm_broadcast_ch_id: None,
+                DenaliChannels.td_alarm_broadcast_ch_id: None,
+                DenaliChannels.dd_alarm_broadcast_ch_id: None,
+                DenaliChannels.ro_alarm_broadcast_ch_id: None,
                 DenaliChannels.ui_alarm_broadcast_ch_id: None,
-                DenaliChannels.hd_to_dg_ch_id: DenaliChannels.dialin_to_hd_ch_id,
-                DenaliChannels.dg_to_hd_ch_id: DenaliChannels.dialin_to_dg_ch_id,
-                DenaliChannels.hd_to_ui_ch_id: DenaliChannels.dialin_to_hd_ch_id,
-                DenaliChannels.hd_sync_broadcast_ch_id: None,
-                DenaliChannels.dg_to_ui_ch_id: DenaliChannels.dialin_to_dg_ch_id,
-                DenaliChannels.dg_sync_broadcast_ch_id: None,
-                DenaliChannels.ui_to_hd_ch_id: DenaliChannels.dialin_to_ui_ch_id,
+                DenaliChannels.td_to_dd_ch_id: DenaliChannels.dialin_to_td_ch_id,
+                DenaliChannels.dd_to_td_ch_id: DenaliChannels.dialin_to_dd_ch_id,
+                DenaliChannels.td_to_ui_ch_id: DenaliChannels.dialin_to_td_ch_id,
+                DenaliChannels.td_sync_broadcast_ch_id: DenaliChannels.dialin_to_td_ch_id,
+                DenaliChannels.dd_sync_broadcast_ch_id: DenaliChannels.dialin_to_dd_ch_id,
+                DenaliChannels.ro_sync_broadcast_ch_id: DenaliChannels.dialin_to_ro_ch_id,
+                DenaliChannels.ui_to_td_ch_id: DenaliChannels.dialin_to_ui_ch_id,
                 DenaliChannels.ui_sync_broadcast_ch_id: DenaliChannels.dialin_to_ui_ch_id,
-                DenaliChannels.hd_to_dialin_ch_id: DenaliChannels.dialin_to_hd_ch_id,
-                DenaliChannels.dg_to_dialin_ch_id: DenaliChannels.dialin_to_dg_ch_id,
+                DenaliChannels.td_to_dialin_ch_id: DenaliChannels.dialin_to_td_ch_id,
+                DenaliChannels.dd_to_dialin_ch_id: DenaliChannels.dialin_to_dd_ch_id,
                 DenaliChannels.ui_to_dialin_ch_id: DenaliChannels.dialin_to_ui_ch_id
             }
 
@@ -694,8 +697,8 @@
         @return: true, if the channel is the ui channel.
         """
         if channel_id in {
-            DenaliChannels.ui_to_hd_ch_id,
-            DenaliChannels.ui_to_dg_ch_id,
+            DenaliChannels.ui_to_td_ch_id,
+            # DenaliChannels.ui_to_dd_ch_id,
             DenaliChannels.ui_to_dialin_ch_id,
             DenaliChannels.ui_sync_broadcast_ch_id,
             DenaliChannels.ui_alarm_broadcast_ch_id