Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -r0f08c28544b557b2bbd8c04b10cff284f41e4fb9 -r5b9473d9ca6a66d4d03c509fae6051710895b498
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 5b9473d9ca6a66d4d03c509fae6051710895b498)
@@ -27,8 +27,8 @@
 
 @unique
 class FPConductivitySensorsEnum(DialinEnum):
-    P9_CPI = 0         # CPi (P9) conductivity sensor value
-    P18_CPO = 1         # CPo (P18) conductivity sensor value
+    P9_COND = 0         # CPi (P9) conductivity sensor value
+    P18_COND = 1         # CPo (P18) conductivity sensor value
 
 class FPConductivitySensors(AbstractSubSystem):
     """
@@ -51,13 +51,13 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_conductivity_sensors_sync)
 
-        self.p9_cpi_conductivity = 0.0
-        self.p18_cpo_conductivity = 0.0
+        self.p9_cond = 0.0
+        self.p18_cond = 0.0
 
         self.fp_conductivity_timestamp = 0.0
 
     @publish(["fp_conductivity_timestamp",
-              "p9_cpi_conductivity", "p18_cpo_conductivity"])
+              "p9_cond", "p18_cond"])
     def _handler_conductivity_sensors_sync(self, message, timestamp=0.0):
         """
         Handles published FP conductivity sensor data messages.  Conductivity sensor data are captured
@@ -67,9 +67,9 @@
         @return: None
         """
 
-        self.p9_cpi_conductivity = struct.unpack('f', bytearray(
+        self.p9_cond = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.p18_cpo_conductivity = struct.unpack('f', bytearray(
+        self.p18_cond = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
         self.fp_conductivity_timestamp = timestamp
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
Index: leahi_dialin/fp/modules/pressure_sensors.py
===================================================================
diff -u -r0f08c28544b557b2bbd8c04b10cff284f41e4fb9 -r5b9473d9ca6a66d4d03c509fae6051710895b498
--- leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9)
+++ leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 5b9473d9ca6a66d4d03c509fae6051710895b498)
@@ -27,12 +27,12 @@
 
 @unique
 class FPPressureSensorNames(DialinEnum):
-    M1_PRESSURE_SENSOR_WATER_INLET_PRE_REG = 0
-    M3_PRESSURE_SENSOR_WATER_INLET_POST_REG = 1
-    P8_PRESSURE_SENSOR_WATER_INLET_PRE_COND = 2
-    P13_PRESSURE_SENSOR_PRE_RO_FILTER = 3
-    P17_PRESSURE_SENSOR_POST_RO_FILTER = 4
-    X1_PRESSURE_SENSOR_PRE_RO_PUMP = 5
+    M1_PRES = 0
+    M3_PRES = 1
+    P8_PRES = 2
+    P13_PRES = 3
+    P17_PRES = 4
+    X1_PRES = 5
 
 
 class FPPressureSensors(AbstractSubSystem):
@@ -56,34 +56,34 @@
                                                                        self._handler_pressure_sync)
 
         self.fp_pressure_timestamp = 0.0
-        self.m1_water_inlet_pre_reg_pressure = 0.0
-        self.m3_water_inlet_post_reg_pressure = 0.0
-        self.p8_water_inlet_pre_cond_pressure = 0.0
-        self.p13_pre_ro_filter_pressure = 0.0
-        self.p17_post_ro_filter_pressure = 0.0
-        self.x1_pre_ro_pump_pressure = 0.0
-        self.m1_water_inlet_pre_reg_temp = 0.0
-        self.m3_water_inlet_post_reg_temp = 0.0
-        self.p8_water_inlet_pre_cond_temp = 0.0
-        self.p13_pre_ro_filter_temp = 0.0
-        self.p17_post_ro_filter_temp = 0.0
-        self.x1_pre_ro_pump_temp = 0.0
+        self.m1_pres = 0.0
+        self.m3_pres = 0.0
+        self.p8_pres = 0.0
+        self.p13_pres = 0.0
+        self.p17_pres = 0.0
+        self.x1_pres = 0.0
+        self.m1_pres_temp = 0.0
+        self.m3_pres_temp = 0.0
+        self.p8_pres_temp = 0.0
+        self.p13_pres_temp = 0.0
+        self.p17_pres_temp = 0.0
+        self.x1_pres_temp = 0.0
 
 
     @publish([
         "fp_pressure_timestamp",
-        "m1_water_inlet_pre_reg_pressure",
-        "m3_water_inlet_post_reg_pressure",
-        "p8_water_inlet_pre_cond_pressure",
-        "p13_pre_ro_filter_pressure",
-        "p17_post_ro_filter_pressure",
-        "x1_pre_ro_pump_pressure",
-        "m1_water_inlet_pre_reg_temp",
-        "m3_water_inlet_post_reg_temp",
-        "p8_water_inlet_pre_cond_temp",
-        "p13_pre_ro_filter_temp",
-        "p17_post_ro_filter_temp",
-        "x1_pre_ro_pump_temp"
+        "m1_pres",
+        "m3_pres",
+        "p8_pres",
+        "p13_pres",
+        "p17_pres",
+        "x1_pres",
+        "m1_pres_temp",
+        "m3_pres_temp",
+        "p8_pres_temp",
+        "p13_pres_temp",
+        "p17_pres_temp",
+        "x1_pres_temp"
     ])
     def _handler_pressure_sync(self, message, timestamp=0.0):
         """
@@ -120,19 +120,19 @@
         pre_pump_temp = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))
 
-        self.m1_water_inlet_pre_reg_pressure = pre_reg_wi[0]
-        self.m3_water_inlet_post_reg_pressure = post_reg_wi[0]
-        self.p8_water_inlet_pre_cond_pressure = pre_cond_wi[0]
-        self.p13_pre_ro_filter_pressure = pre_ro[0]
-        self.p17_post_ro_filter_pressure = post_ro[0]
-        self.x1_pre_ro_pump_pressure = pre_pump[0]
+        self.m1_pres = pre_reg_wi[0]
+        self.m3_pres = post_reg_wi[0]
+        self.p8_pres = pre_cond_wi[0]
+        self.p13_pres = pre_ro[0]
+        self.p17_pres = post_ro[0]
+        self.x1_pres = pre_pump[0]
 
-        self.m1_water_inlet_pre_reg_pressure = pre_reg_wi_temp[0]
-        self.m3_water_inlet_post_reg_pressure = post_reg_wi_temp[0]
-        self.p8_water_inlet_pre_cond_pressure = pre_cond_wi_temp[0]
-        self.p13_pre_ro_filter_pressure = pre_ro_temp[0]
-        self.p17_post_ro_filter_pressure = post_ro_temp[0]
-        self.x1_pre_ro_pump_temp = pre_pump_temp[0]
+        self.m1_pres_temp = pre_reg_wi_temp[0]
+        self.m3_pres_temp = post_reg_wi_temp[0]
+        self.p8_pres_temp = pre_cond_wi_temp[0]
+        self.p13_pres_temp = pre_ro_temp[0]
+        self.p17_pres_temp = post_ro_temp[0]
+        self.x1_pres_temp = pre_pump_temp[0]
 
         self.fp_pressure_timestamp = timestamp
 
Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -ra6fe9a549d8152617eadf2a70062195615a23c3e -r5b9473d9ca6a66d4d03c509fae6051710895b498
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision a6fe9a549d8152617eadf2a70062195615a23c3e)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 5b9473d9ca6a66d4d03c509fae6051710895b498)
@@ -39,15 +39,15 @@
 
 @unique
 class FPValveNames(DialinEnum):
-    M4_VWI = 0                         # Valve (M4 VWi)
-    P39_VROD = 1                        # Valve (P39 VROd)
-    P6_VFF = 2                         # Valve (P6 VFF)
-    P11_VPI = 3                         # Valve (P11 VPi)
-    P33_VCR = 4                         # Valve (P33 VCr)
-    P34_VCB = 5                         # Valve (P34 VCb)
-    P37_VCD = 6                         # Valve (P37 VCd)
-    M7_VFB = 7                         # Valve (M7 VFB)
-    P20_SPP = 8                         # Valve (P20 SPP)
+    M4_VALV = 0                             # Valve (M4 VWi)
+    P39_VALV = 1                            # Valve (P39 VROd)
+    P6_VALV = 2                             # Valve (P6 VFF)
+    P11_VALV = 3                            # Valve (P11 VPi)
+    P33_VALV = 4                            # Valve (P33 VCr)
+    P34_VALV = 5                            # Valve (P34 VCb)
+    P37_VALV = 6                            # Valve (P37 VCd)
+    M7_VALV = 7                             # Valve (M7 VFB)
+    P20_VALV = 8                            # Valve (P20 SPP)
 
 class FPValves(AbstractSubSystem):
     """