Index: firmware/App/Controllers/ConductivitySensors.h
===================================================================
diff -u -r6f262a859c6d582bc060165a560c47f56b94164e -r5a882c7292cea58e74b5a28d4e85dd60e741b834
--- firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 6f262a859c6d582bc060165a560c47f56b94164e)
+++ firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
@@ -22,8 +22,7 @@
 
 /**
  *  @defgroup ConductivitySensors ConductivitySensors
- *  @brief Conductivity Sensors monitor module.
- *  Monitors and filters conductivity sensor readings.
+ *  @brief Conductivity Sensors monitor module. Monitors and filters conductivity sensor readings.
  *
  *  @addtogroup ConductivitySensors
  *  @{
@@ -34,9 +33,9 @@
 /// Enumeration of conductivity sensors.
 typedef enum ConductivitySensors
 {
-    CONDUCTIVITYSENSORS_CPI_SENSOR = 0,  ///< Inlet water conductivity sensor.
-    CONDUCTIVITYSENSORS_CPO_SENSOR,      ///< Outlet water conductivity sensor.
-    NUM_OF_CONDUCTIVITY_SENSORS          ///< Number of conductivity sensors.
+    CONDUCTIVITYSENSORS_CPI_SENSOR = 0,  ///< Inlet water conductivity sensor
+    CONDUCTIVITYSENSORS_CPO_SENSOR,      ///< Outlet water conductivity sensor
+    NUM_OF_CONDUCTIVITY_SENSORS          ///< Number of conductivity sensors
 } CONDUCTIVITY_SENSORS_T;
 
 // ********** public function prototypes **********
@@ -47,10 +46,10 @@
 void checkInletWaterConductivity( void );
 void checkRORejectionRatio( void );
 
-DATA_ARRAY_GET_PROTOTYPE ( F32, getConductivityValue, sensor );
+DATA_ARRAY_GET_PROTOTYPE ( F32, getConductivityValue, sensorId );
 
-BOOL testSetConductivityOverride( U32 sensor, F32 value );
-BOOL testResetConductivityOverride( U32 sensor );
+BOOL testSetConductivityOverride( U32 sensorId, F32 value );
+BOOL testResetConductivityOverride( U32 sensorId );
 
 BOOL testSetConductivityDataPublishIntervalOverride( U32 interval_ms );
 BOOL testResetConductivityDataPublishIntervalOverride( void );