Index: firmware/App/Monitors/Pressure.c
===================================================================
diff -u -rb80b204275ef81893a12a1a29e97ae6e18510a21 -rf5baeac6a5f000705cd51e4779a967acf4088981
--- firmware/App/Monitors/Pressure.c	(.../Pressure.c)	(revision b80b204275ef81893a12a1a29e97ae6e18510a21)
+++ firmware/App/Monitors/Pressure.c	(.../Pressure.c)	(revision f5baeac6a5f000705cd51e4779a967acf4088981)
@@ -239,11 +239,11 @@
  *************************************************************************/
 void checkInletWaterPressure( void )
 {
-    F32 pressureIn  = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_INPUT );
-    F32 PressureOut = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_OUTPUT );
+    F32 pressureIn  = getFilteredPressure( M1_PRES );
+    F32 PressureOut = getFilteredPressure( M3_PRES );
 
     //Check Water Inlet Input pressure range
-    if ( VALVE_STATE_OPEN == getValveStateName( VWI ) )
+    if ( VALVE_STATE_OPEN == getValveStateName( M4_VALV ) )
     {
         BOOL isPressureTooLow;
         BOOL isPressureTooHigh;
@@ -267,13 +267,13 @@
     }
     else
     {
-        // VWI is closed - clear all alarms
+        // M4_VALV is closed - clear all alarms
         checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE, FALSE, pressureIn, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG );
         checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE, FALSE, pressureIn, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
     }
 
     //Check Water Inlet Output pressure range
-    if ( VALVE_STATE_OPEN == getValveStateName( VWI ) )
+    if ( VALVE_STATE_OPEN == getValveStateName( M4_VALV ) )
     {
         BOOL isPressureTooLow;
         BOOL isPressureTooHigh;
@@ -297,7 +297,7 @@
     }
     else
     {
-        // VWI is closed - clear all alarms
+        // M4_VALV is closed - clear all alarms
         checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE, FALSE, PressureOut, MIN_INLET_WATER_PRES_OUT_WARNING_LOW_PSIG );
         checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE, FALSE, PressureOut, MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG );
     }
@@ -404,7 +404,7 @@
  *************************************************************************/
 static F32 getConvertedPressure( PRESSURE_SENSORS_T sensor, F32 pressure )
 {
-    F32 baroPressurePSI = getPressure( PRESSURE_SENSOR_BAROMETRIC ) * MMHG_TO_PSI_CONVERSION;
+    F32 baroPressurePSI = getPressure( BARO_PRES ) * MMHG_TO_PSI_CONVERSION;
 
     // calibrated pressure
     //F32 calPressure     = getCalibrationAppliedPressure( sensor, pressure );
@@ -481,20 +481,20 @@
     {
         PRESSURE_TEMP_DATA_T data;
 
-        data.filteredWaterInletInputPressure        = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_INPUT );
-        data.filteredWaterInletOutputPressure       = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_OUTPUT );
-        data.filteredHydraulicsOutletPressure       = getFilteredPressure( PRESSURE_SENSOR_HYDRAULICS_OUTLET );
-        data.filteredBibagPressure                  = getFilteredPressure( PRESSURE_SENSOR_BIBAG );
-        data.filteredSpentdialysatePressure         = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE );
-        data.filteredFreshdialysatePressure         = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE );
-        data.filteredTransmembranePressure          = getFilteredPressure( PRESSURE_SENSOR_TRANSMEMBRANE );
-        data.filteredWaterInletInputTemp            = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_WATER_INLET_INPUT );
-        data.filteredWaterInletOutputTemp           = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_WATER_INLET_OUTPUT );
-        data.filteredHydraulicsOutletTemp           = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_HYDRAULICS_OUTLET );
-        data.filteredBibagTemp                      = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_BIBAG );
-        data.filteredSpentdialysateTemp             = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_SPENT_DIALYSATE );
-        data.filteredFreshdialysateTemp             = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_FRESH_DIALYSATE );
-        data.filteredTransmembraneTemp              = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_TRANSMEMBRANE );
+        data.m1Pressure         = getFilteredPressure( M1_PRES );
+        data.m3Pressure         = getFilteredPressure( M3_PRES );
+        data.d9Pressure         = getFilteredPressure( D9_PRES );
+        data.d66Pressure        = getFilteredPressure( D66_PRES );
+        data.d51Pressure        = getFilteredPressure( D51_PRES );
+        data.d18Pressure        = getFilteredPressure( D18_PRES );
+        data.d41Pressure        = getFilteredPressure( D41_PRES );
+        data.m1PresTemp         = getFilteredPressureSensorTemperature( M1_PRES );
+        data.m3PresTemp         = getFilteredPressureSensorTemperature( M3_PRES );
+        data.d9PresTemp         = getFilteredPressureSensorTemperature( D9_PRES );
+        data.d66PresTemp        = getFilteredPressureSensorTemperature( D66_PRES );
+        data.d51PresTemp        = getFilteredPressureSensorTemperature( D51_PRES );
+        data.d18PresTemp        = getFilteredPressureSensorTemperature( D18_PRES );
+        data.d41PresTemp        = getFilteredPressureSensorTemperature( D41_PRES );
         pressuresDataPublicationTimerCounter        = 0;
 
         broadcastData( MSG_ID_DD_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_DATA_T ) );