Index: leahi_dialin/protocols/CAN.py
===================================================================
diff -u -ra2b122c638fb8a6853a9b94c99444cb887312867 -r7bc77fbed67b88c023d9b659dc7b7b27ec9b8741
--- leahi_dialin/protocols/CAN.py	(.../CAN.py)	(revision a2b122c638fb8a6853a9b94c99444cb887312867)
+++ leahi_dialin/protocols/CAN.py	(.../CAN.py)	(revision 7bc77fbed67b88c023d9b659dc7b7b27ec9b8741)
@@ -277,19 +277,19 @@
             }
         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.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: None,
+                # DenaliChannels.dd_to_ui_ch_id: DenaliChannels.dialin_to_dd_ch_id,
+                DenaliChannels.dd_sync_broadcast_ch_id: None,
+                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
             }