Index: firmware/App/Drivers/ConductivitySensors.h
===================================================================
diff -u -re2e51b0219db0132cebb6f65f3dbd803e1f01e30 -ra9983d3e6b07e7c927fab3d16e80b715594fe221
--- firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision e2e51b0219db0132cebb6f65f3dbd803e1f01e30)
+++ firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision a9983d3e6b07e7c927fab3d16e80b715594fe221)
@@ -40,11 +40,13 @@
 /// Enumeration of conductivity sensors.
 typedef enum ConductivitySensors
 {
-    CONDUCTIVITYSENSORS_CD1_SENSOR = 0,                   ///< Inlet water conductivity sensor
-    CONDUCTIVITYSENSORS_CD2_SENSOR,                       ///< Outlet water conductivity sensor
-    CONDUCTIVITYSENSORS_CD3_SENSOR,                       ///< Post-acid concentrate conductivity sensor
-    CONDUCTIVITYSENSORS_CD4_SENSOR,                       ///< Post-bicarbonate concentrate conductivity sensor
-    NUM_OF_CONDUCTIVITY_SENSORS                           ///< Number of conductivity sensors
+    FIRST_COND_SENSOR = 0,                          ///< First conductivity sensor
+    D17_COND = FIRST_COND_SENSOR,                   ///< Bicarb only conductivity sensor - 1
+    D27_COND,                                       ///< Acid and Bicarb mix conductivity sensor - 1
+    D29_COND,                                       ///< Acid and Bicarb mix conductivity sensor - 2
+    D43_COND,                                       ///< Spent dialysate conductivity sensor
+    D74_COND,                                       ///< Bicarb only conductivity sensor - 2
+    NUM_OF_CONDUCTIVITY_SENSORS                     ///< Number of conductivity sensors
 } CONDUCTIVITY_SENSORS_T;
 
 // ********** public function prototypes **********