Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r36f5be84c04aebf35dd6b13b03dd979d0a21dcd1 -r6ebf16aefe8865d3ecca50348cabc3f42e676fb5
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 36f5be84c04aebf35dd6b13b03dd979d0a21dcd1)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 6ebf16aefe8865d3ecca50348cabc3f42e676fb5)
@@ -140,10 +140,8 @@
     }
 
     // Initialize the conductivity sensor FPGA alarms
-//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD1_COND_SENSOR, ALARM_ID_DD_CD1_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
-//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD2_COND_SENSOR, ALARM_ID_DD_CD2_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
-//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD3_COND_SENSOR, ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
-//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD4_COND_SENSOR, ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
+//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_CPI_COND_SENSOR, ALARM_ID_RO_CPI_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
+//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_CPO_COND_SENSOR, ALARM_ID_RO_CPO_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
 }
 
 /*********************************************************************//**
Index: firmware/App/Drivers/ConductivitySensors.h
===================================================================
diff -u -rf47296145b6a0adb78df0e325587629171909fd6 -r6ebf16aefe8865d3ecca50348cabc3f42e676fb5
--- firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision f47296145b6a0adb78df0e325587629171909fd6)
+++ firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 6ebf16aefe8865d3ecca50348cabc3f42e676fb5)
@@ -24,7 +24,7 @@
  *  @defgroup ConductivitySensors ConductivitySensors
  *  @brief Conductivity Sensors monitor module. Monitors and filters conductivity sensor readings.
  *  The module uses AD5941 - high precision, low power analog front ends(AFEs) for conductivity measurement
- *  for CD1,CD2, CD3 and CD4.
+ *  for CPi and CPo.
  *
  *  Conductivity Sensor Module
  *  Diality P/N: TBD
Index: firmware/App/Drivers/FlowSensor.c
===================================================================
diff -u -r3edf8084a5028ee0d00a3fba496284e593e4254d -r6ebf16aefe8865d3ecca50348cabc3f42e676fb5
--- firmware/App/Drivers/FlowSensor.c	(.../FlowSensor.c)	(revision 3edf8084a5028ee0d00a3fba496284e593e4254d)
+++ firmware/App/Drivers/FlowSensor.c	(.../FlowSensor.c)	(revision 6ebf16aefe8865d3ecca50348cabc3f42e676fb5)
@@ -86,7 +86,7 @@
 
 /*********************************************************************//**
  * @brief
- * The getFlowRate function gets the current pressure (in mmHg) for a given
+ * The getFlowRate function gets the current flow rate (in mmHg) for a given
  * pressure sensor.
  * @details \b Alarm: ALARM_ID_RO_SOFTWARE_FAULT if given flow sensor is invalid.
  * @details \b Inputs: currentFlowReadings[]
Index: firmware/App/Monitors/Flow.c
===================================================================
diff -u -r3edf8084a5028ee0d00a3fba496284e593e4254d -r6ebf16aefe8865d3ecca50348cabc3f42e676fb5
--- firmware/App/Monitors/Flow.c	(.../Flow.c)	(revision 3edf8084a5028ee0d00a3fba496284e593e4254d)
+++ firmware/App/Monitors/Flow.c	(.../Flow.c)	(revision 6ebf16aefe8865d3ecca50348cabc3f42e676fb5)
@@ -28,12 +28,12 @@
 
 // ********** private definitions **********
 
-#define FLOWS_DATA_PUB_INTERVAL                     ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )                      ///< Interval (ms/task time) at which the flows data is published on the CAN bus.
-#define DATA_PUBLISH_COUNTER_START_COUNT            ( 5 )                                                           ///< Data publish counter start count.
-#define FLOW_SAMPLE_FILTER_MS                       ( 500 )                                                         ///< Filter flow data for given time
-#define FLOW_TEMP_SAMPLE_FILTER_MS                  ( 500 )                                                         ///< Filter flow temperature data for given time
-#define SIZE_OF_FLOW_ROLLING_AVG                    ( FLOW_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )              ///< Filtered flow moving average sample count.
-#define SIZE_OF_FLOW_TEMP_ROLLING_AVG               ( FLOW_TEMP_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )         ///< Filtered flow temprature moving average sample count.
+#define FLOWS_DATA_PUB_INTERVAL            ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )                   ///< Interval (ms/task time) at which the flows data is published on the CAN bus.
+#define DATA_PUBLISH_COUNTER_START_COUNT   ( 5 )                                                        ///< Data publish counter start count.
+#define FLOW_SAMPLE_FILTER_MS              ( 500 )                                                      ///< Filter flow data for given time
+#define FLOW_TEMP_SAMPLE_FILTER_MS         ( 500 )                                                      ///< Filter flow temperature data for given time
+#define SIZE_OF_FLOW_ROLLING_AVG           ( FLOW_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )           ///< Filtered flow moving average sample count.
+#define SIZE_OF_FLOW_TEMP_ROLLING_AVG      ( FLOW_TEMP_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )      ///< Filtered flow temprature moving average sample count.
 
 /// Defined states for the flow monitor state machine.
 typedef enum FlowMonitor_States
@@ -65,10 +65,10 @@
 
 static OVERRIDE_F32_T filteredcurrentFlowReadings[ NUM_OF_FLOW_SENSORS ];                               ///< filtered current flow sensor flow readings (overrideable).
 static OVERRIDE_F32_T filteredcurrentFlowTempReadings[ NUM_OF_FLOW_SENSORS ];                           ///< filtered current flow sensor temperature readings (overrideable).
-//static RO_PRES_SENSORS_CAL_RECORD_T flowsCalRecord;                                                     ///< Flows calibration record.
+//static RO_PRES_SENSORS_CAL_RECORD_T flowsCalRecord;                                                   ///< Flows calibration record.
 
-static FILTER_FLOW_READINGS_T filteredFlowReadings[NUM_OF_FLOW_SENSORS];                            ///< Filtered flow reading for flow sensors.
-static FILTER_FLOW_TEMPERATURE_READINGS_T filteredFlowTempReadings[NUM_OF_FLOW_SENSORS];            ///< Filtered temperature reading for flow sensors.
+static FILTER_FLOW_READINGS_T filteredFlowReadings[NUM_OF_FLOW_SENSORS];                                ///< Filtered flow reading for flow sensors.
+static FILTER_FLOW_TEMPERATURE_READINGS_T filteredFlowTempReadings[NUM_OF_FLOW_SENSORS];                ///< Filtered temperature reading for flow sensors.
 static FLOW_STATE_T flowsState;                                                                         ///< current state of flow monitor state machine.
 static U32 flowsDataPublicationTimerCounter;                                                            ///< used to schedule flow data publication to CAN bus.
 static OVERRIDE_U32_T flowsDataPublishInterval;                                                         ///< Flow data publish interval.
@@ -138,10 +138,10 @@
  *************************************************************************/
 static void filterFlowSensors( void )
 {
-    //Filter pressure sensor reading
+    //Filter flow sensor reading
     filterFlowSensorReadings();
 
-    //Filter pressure sensor temperature reading
+    //Filter flow sensor temperature reading
     filterFlowSensorTemperatureReadings();
 }
 
@@ -309,7 +309,7 @@
  * @param flow the flow rate before applying calibration to it
  * @return calibration applied flow rate
  *************************************************************************/
-//static F32 getCalibrationAppliedFlow( U08 sensorId, F32 pressure )
+//static F32 getCalibrationAppliedFlow( U08 sensorId, F32 flow )
 //{
 //    F32 calFlow = pow( pressure, 4 ) * flowsCalRecord.flowSensors[ (FLOW_SENSORS_T)sensorId ].fourthOrderCoeff +
 //                  pow( pressure, 3 ) * flowsCalRecord.flowSensors[ (FLOW_SENSORS_T)sensorId ].thirdOrderCoeff  +