Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -r325e67dab10f6666702bf0f1256015b31e58de4f
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 325e67dab10f6666702bf0f1256015b31e58de4f)
@@ -732,32 +732,32 @@
 
         if ( D17_COND == sensorID )
         {
-            setFPGACD12Address( conductivitySensorControl[ sensorID ].writeAddress );
-            setFPGACD12Data( conductivitySensorControl[ sensorID ].writeData );
+            setFPGAD17D74Address( conductivitySensorControl[ sensorID ].writeAddress );
+            setFPGAD17D74Data( conductivitySensorControl[ sensorID ].writeData );
             setFPGAD17CondWriteEnable();
         }
         else if ( D27_COND == sensorID )
         {
-            setFPGACD12Address( conductivitySensorControl[ sensorID ].writeAddress );
-            setFPGACD12Data( conductivitySensorControl[ sensorID ].writeData );
+            setFPGAD27D29Address( conductivitySensorControl[ sensorID ].writeAddress );
+            setFPGAD27D29Data( conductivitySensorControl[ sensorID ].writeData );
             setFPGAD27CondWriteEnable();
         }
         else if ( D29_COND == sensorID )
         {
-            setFPGACD34Address( conductivitySensorControl[ sensorID ].writeAddress );
-            setFPGACD34Data( conductivitySensorControl[ sensorID ].writeData );
+            setFPGAD27D29Address( conductivitySensorControl[ sensorID ].writeAddress );
+            setFPGAD27D29Data( conductivitySensorControl[ sensorID ].writeData );
             setFPGAD29CondWriteEnable();
         }
         else if ( D43_COND == sensorID )
         {
-            setFPGACD34Address( conductivitySensorControl[ sensorID ].writeAddress );
-            setFPGACD34Data( conductivitySensorControl[ sensorID ].writeData );
+            setFPGAD43Address( conductivitySensorControl[ sensorID ].writeAddress );
+            setFPGAD43Data( conductivitySensorControl[ sensorID ].writeData );
             setFPGAD43CondWriteEnable();
         }
         else if ( D74_COND == sensorID )
         {
-            setFPGACD5Address( conductivitySensorControl[ sensorID ].writeAddress );
-            setFPGACD5Data( conductivitySensorControl[ sensorID ].writeData );
+            setFPGAD17D74Address( conductivitySensorControl[ sensorID ].writeAddress );
+            setFPGAD17D74Data( conductivitySensorControl[ sensorID ].writeData );
             setFPGAD74CondWriteEnable();
         }
         else if ( P9_COND == sensorID )
@@ -889,27 +889,27 @@
 
         if ( D17_COND == sensorID )
         {
-            setFPGACD12Address( conductivitySensorControl[ sensorID ].readAddress );
+            setFPGAD17D74Address( conductivitySensorControl[ sensorID ].readAddress );
             setFPGAD17CondReadEnable();
         }
         else if ( D27_COND == sensorID )
         {
-            setFPGACD12Address( conductivitySensorControl[ sensorID ].readAddress );
+            setFPGAD27D29Address( conductivitySensorControl[ sensorID ].readAddress );
             setFPGAD27CondReadEnable();
         }
         else if ( D29_COND == sensorID )
         {
-            setFPGACD34Address( conductivitySensorControl[ sensorID ].readAddress );
+            setFPGAD27D29Address( conductivitySensorControl[ sensorID ].readAddress );
             setFPGAD29CondReadEnable();
         }
         else if ( D43_COND == sensorID )
         {
-            setFPGACD34Address( conductivitySensorControl[ sensorID ].readAddress );
+            setFPGAD43Address( conductivitySensorControl[ sensorID ].readAddress );
             setFPGAD43CondReadEnable();
         }
         else if ( D74_COND == sensorID )
         {
-            setFPGACD5Address( conductivitySensorControl[ sensorID ].readAddress );
+            setFPGAD17D74Address( conductivitySensorControl[ sensorID ].readAddress );
             setFPGAD74CondReadEnable();
         }
         else if ( P9_COND == sensorID )