Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -r5b9473d9ca6a66d4d03c509fae6051710895b498 -r68422d08c4141999a13496343264483a32314d37
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 5b9473d9ca6a66d4d03c509fae6051710895b498)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 68422d08c4141999a13496343264483a32314d37)
@@ -47,7 +47,7 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.fp_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_RO_CONDUCTIVITY_DATA.value
+            msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_conductivity_sensors_sync)
 
@@ -79,7 +79,7 @@
         Constructs and sends the FP conductivity sensor data broadcast interval override command
         Constraints:
             Must be logged into FP.
-            Given interval must be non-zero and a multiple of the RO general task interval (50 ms).
+            Given interval must be non-zero and a multiple of the FP general task interval (50 ms).
 
         @param ms:  integer - interval (in ms) to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
@@ -94,7 +94,7 @@
         payload = reset_byte_array + ms_byte_array
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("override FP conductivity sensor broadcast interval")
@@ -135,7 +135,7 @@
         payload = reset_byte_array + cond_byte_array + sensor_byte_array
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         if reset == RESET:
@@ -172,7 +172,7 @@
         payload = reset_byte_array + read_byte_array + sensor_byte_array
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         if reset == RESET:
@@ -209,7 +209,7 @@
         payload = reset_byte_array + error_byte_array + sensor_byte_array
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         if reset == RESET: