Index: leahi_dialin/fp/modules/flow_sensors.py
===================================================================
diff -u -rd28c8c54ba1f74adf348d1db6f5bfe034628c812 -r5b9473d9ca6a66d4d03c509fae6051710895b498
--- leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision d28c8c54ba1f74adf348d1db6f5bfe034628c812)
+++ leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision 5b9473d9ca6a66d4d03c509fae6051710895b498)
@@ -27,8 +27,8 @@
 
 @unique
 class FPFlowSensorNames(DialinEnum):
-    P7_FLOW_SENSOR_WATER_INLET = 0     # Water inlet flow sensor (FMS P7)
-    P16_FLOW_SENSOR_RO_OUTLET = 1       # RO outlet flow sensor (FMP P16)
+    P7_FLOW = 0         # Water inlet flow sensor (FMS P7)
+    P16_FLOW = 1        # RO outlet flow sensor (FMP P16)
 
 
 class FPFlowSensors(AbstractSubSystem):
@@ -54,30 +54,30 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_flow_sensor_sync)
 
 
-        self.p7_flowFMS = 0.0
-        self.p16_flowFMP = 0.0
-        self.p7_tempFMS = 0.0
-        self.p16_tempFMP = 0.0
+        self.p7_flow = 0.0
+        self.p16_flow = 0.0
+        self.p7_temp = 0.0
+        self.p16_temp = 0.0
 
         self.fp_flow_timestamp = 0
 
     @publish(["fp_flows_timestamp",
-                "p7_flowFMS", "p16_flowFMP",
-                "p7_tempFMS", "p16_tempFMP"])
+                "p7_flow", "p16_flow",
+                "p7_temp", "p16_temp"])
     def _handler_flow_sensor_sync(self, message, timestamp=0.0):
         """
         Handles published flow sensor message
 
         @param message:  published flow sensor data message
         @returns none
         """
-        self.p7_flowFMS = struct.unpack('f', bytearray(
+        self.p7_flow = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.p16_flowFMP = struct.unpack('f', bytearray(
+        self.p16_flow = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.p7_tempFMS = struct.unpack('f', bytearray(
+        self.p7_temp = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.p16_tempFMP = struct.unpack('f', bytearray(
+        self.p16_temp = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
         self.fp_flows_timestamp = timestamp