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