Index: firmware/App/Drivers/PressureSensor.c
===================================================================
diff -u -rce66580e076bffa157868ff7e422556f78a95cac -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602
--- firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision ce66580e076bffa157868ff7e422556f78a95cac)
+++ firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602)
@@ -103,35 +103,35 @@
 void readPressureSensors( void )
 {
     // Update and convert raw pressures to mmHg
-    currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_REG ].data = convertPressureReading( getFPGAPRiRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
-    currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_POST_REG ].data   = convertPressureReading( getFPGAPRoRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
-    currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_COND ].data = convertPressureReading( getFPGAPC2oRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
-    currentPressureReadings[ PRESSURE_SENSOR_PRE_RO_FILTER ].data   = convertPressureReading( getFPGAPPoRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
-    currentPressureReadings[ PRESSURE_SENSOR_POST_RO_FILTER ].data = convertPressureReading( getFPGAPMpRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
-    currentPressureReadings[ PRESSURE_SENSOR_PRE_RO_PUMP ].data = convertPressureReading( getFPGAPPiRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
+    currentPressureReadings[ M1_PRES ].data = convertPressureReading( getFPGAM1RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
+    currentPressureReadings[ M3_PRES ].data   = convertPressureReading( getFPGAM3RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
+    currentPressureReadings[ P8_PRES ].data = convertPressureReading( getFPGAP8RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
+    currentPressureReadings[ P13_PRES ].data   = convertPressureReading( getFPGAP13RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
+    currentPressureReadings[ P17_PRES ].data = convertPressureReading( getFPGAP17RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
+    currentPressureReadings[ X1_PRES ].data = convertPressureReading( getFPGAX1RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI );
 
     // Update and convert raw pressure sensor temperatures to deg C
-    currentPresTempReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_REG ].data = convertPressureTempReading2DegC( getFPGAPRiRawTemperature() );
-    currentPresTempReadings[ PRESSURE_SENSOR_WATER_INLET_POST_REG ].data   = convertPressureTempReading2DegC( getFPGAPRoRawTemperature() );
-    currentPresTempReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_COND ].data = convertPressureTempReading2DegC( getFPGAPC2oRawTemperature() );
-    currentPresTempReadings[ PRESSURE_SENSOR_PRE_RO_FILTER ].data = convertPressureTempReading2DegC( getFPGAPPoRawTemperature() );
-    currentPresTempReadings[ PRESSURE_SENSOR_POST_RO_FILTER ].data = convertPressureTempReading2DegC( getFPGAPMpRawTemperature() );
-    currentPresTempReadings[ PRESSURE_SENSOR_PRE_RO_PUMP ].data = convertPressureTempReading2DegC( getFPGAPPiRawTemperature() );
+    currentPresTempReadings[ M1_PRES ].data = convertPressureTempReading2DegC( getFPGAM1RawTemperature() );
+    currentPresTempReadings[ M3_PRES ].data   = convertPressureTempReading2DegC( getFPGAM3RawTemperature() );
+    currentPresTempReadings[ P8_PRES ].data = convertPressureTempReading2DegC( getFPGAP8RawTemperature() );
+    currentPresTempReadings[ P13_PRES ].data = convertPressureTempReading2DegC( getFPGAP13RawTemperature() );
+    currentPresTempReadings[ P17_PRES ].data = convertPressureTempReading2DegC( getFPGAP17RawTemperature() );
+    currentPresTempReadings[ X1_PRES ].data = convertPressureTempReading2DegC( getFPGAX1RawTemperature() );
 
     // Update read and error counters for each pressure sensor
-    lastPressureReadCounter[ PRESSURE_SENSOR_WATER_INLET_PRE_REG ].data = (U32)getFPGAPRiReadCount();
-    lastPressureReadCounter[ PRESSURE_SENSOR_WATER_INLET_POST_REG ].data = (U32)getFPGAPRoReadCount();
-    lastPressureReadCounter[ PRESSURE_SENSOR_WATER_INLET_PRE_COND ].data = (U32)getFPGAPC2oReadCount();
-    lastPressureReadCounter[ PRESSURE_SENSOR_PRE_RO_FILTER ].data = (U32)getFPGAPPoReadCount();
-    lastPressureReadCounter[ PRESSURE_SENSOR_POST_RO_FILTER ].data = (U32)getFPGAPMpReadCount();
-    lastPressureReadCounter[ PRESSURE_SENSOR_PRE_RO_PUMP ].data = (U32)getFPGAPPiReadCount();
+    lastPressureReadCounter[ M1_PRES ].data = (U32)getFPGAM1ReadCount();
+    lastPressureReadCounter[ M3_PRES ].data = (U32)getFPGAM3ReadCount();
+    lastPressureReadCounter[ P8_PRES ].data = (U32)getFPGAP8ReadCount();
+    lastPressureReadCounter[ P13_PRES ].data = (U32)getFPGAP13ReadCount();
+    lastPressureReadCounter[ P17_PRES ].data = (U32)getFPGAP17ReadCount();
+    lastPressureReadCounter[ X1_PRES ].data = (U32)getFPGAX1ReadCount();
 
-    lastPressureErrorCounter[ PRESSURE_SENSOR_WATER_INLET_PRE_REG ].data = (U32)getFPGAPRiErrorCount();
-    lastPressureErrorCounter[ PRESSURE_SENSOR_WATER_INLET_POST_REG ].data = (U32)getFPGAPRoErrorCount();
-    lastPressureErrorCounter[ PRESSURE_SENSOR_WATER_INLET_PRE_COND ].data = (U32)getFPGAPC2oErrorCount();
-    lastPressureErrorCounter[ PRESSURE_SENSOR_PRE_RO_FILTER ].data = (U32)getFPGAPPoErrorCount();
-    lastPressureErrorCounter[ PRESSURE_SENSOR_POST_RO_FILTER ].data = (U32)getFPGAPMpErrorCount();
-    lastPressureErrorCounter[ PRESSURE_SENSOR_PRE_RO_PUMP ].data = (U32)getFPGAPPiErrorCount();
+    lastPressureErrorCounter[ M1_PRES ].data = (U32)getFPGAM1ErrorCount();
+    lastPressureErrorCounter[ M3_PRES ].data = (U32)getFPGAM3ErrorCount();
+    lastPressureErrorCounter[ P8_PRES ].data = (U32)getFPGAP8ErrorCount();
+    lastPressureErrorCounter[ P13_PRES ].data = (U32)getFPGAP13ErrorCount();
+    lastPressureErrorCounter[ P17_PRES ].data = (U32)getFPGAP17ErrorCount();
+    lastPressureErrorCounter[ X1_PRES ].data = (U32)getFPGAX1ErrorCount();
 
 //    // Monitor pressure sensor health
 //    checkPressureSensors();