Index: leahi_dialin/protocols/CAN.py
===================================================================
diff -u -r151f2ea1e956e89141f6eb66fb0b5f8aac74e6d7 -r0f08c28544b557b2bbd8c04b10cff284f41e4fb9
--- leahi_dialin/protocols/CAN.py	(.../CAN.py)	(revision 151f2ea1e956e89141f6eb66fb0b5f8aac74e6d7)
+++ leahi_dialin/protocols/CAN.py	(.../CAN.py)	(revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9)
@@ -262,26 +262,26 @@
             channel_rx_tx_pairs = {
                 DenaliChannels.td_alarm_broadcast_ch_id: None,
                 DenaliChannels.dd_alarm_broadcast_ch_id: None,
-                DenaliChannels.ro_alarm_broadcast_ch_id: None,
+                DenaliChannels.fp_alarm_broadcast_ch_id: None,
                 DenaliChannels.ui_alarm_broadcast_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.fp_sync_broadcast_ch_id: None,
                 DenaliChannels.ui_to_td_ch_id: None,
                 DenaliChannels.ui_sync_broadcast_ch_id: None,
                 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.fp_to_dialin_ch_id: DenaliChannels.dialin_to_fp_ch_id,
                 DenaliChannels.ui_to_dialin_ch_id: DenaliChannels.dialin_to_ui_ch_id
             }
         else:
             channel_rx_tx_pairs = {
                 DenaliChannels.td_alarm_broadcast_ch_id: None,
                 DenaliChannels.dd_alarm_broadcast_ch_id: None,
-                DenaliChannels.ro_alarm_broadcast_ch_id: None,
+                DenaliChannels.fp_alarm_broadcast_ch_id: None,
                 DenaliChannels.ui_alarm_broadcast_ch_id: None,
                 DenaliChannels.td_to_dd_ch_id: DenaliChannels.dialin_to_td_ch_id,
                 DenaliChannels.dd_to_td_ch_id: DenaliChannels.dialin_to_dd_ch_id,
@@ -384,24 +384,24 @@
 
     td_alarm_broadcast_ch_id = 0x001
     dd_alarm_broadcast_ch_id = 0x002
-    ro_alarm_broadcast_ch_id = 0x004
+    fp_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
+    dd_to_fp_ch_id = 0x020
+    fp_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
+    fp_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_fp_ch_id = 0x404
+    fp_to_dialin_ch_id = 0x405
     dialin_to_ui_ch_id = 0x406
     ui_to_dialin_ch_id = 0x407