Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r6ebf16aefe8865d3ecca50348cabc3f42e676fb5 -r7b9a8c0cb9986368e1e38fcdb9daaf3cf707dfd2
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 6ebf16aefe8865d3ecca50348cabc3f42e676fb5)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 7b9a8c0cb9986368e1e38fcdb9daaf3cf707dfd2)
@@ -160,19 +160,19 @@
 void readConductivitySensors( void )
 {
     // Read raw conductivity
-    currentConductivityReadings[ CONDUCTIVITYSENSORS_CPI_SENSOR ].data = (F32)getFPGACPiConductivity();
-    currentConductivityReadings[ CONDUCTIVITYSENSORS_CPO_SENSOR ].data = (F32)getFPGACPoConductivity();
+    currentConductivityReadings[ P9_COND ].data = (F32)getFPGAP9Conductivity();
+    currentConductivityReadings[ P18_COND ].data = (F32)getFPGAP18Conductivity();
 
     // Read temperature associated to conductivity sensor
-    currentTemperatureReadings[ CONDUCTIVITYSENSORS_CPI_SENSOR ].data = (F32)getFPGACPiTemperature();
-    currentTemperatureReadings[ CONDUCTIVITYSENSORS_CPO_SENSOR ].data = (F32)getFPGACPoTemperature();
+    currentTemperatureReadings[ P9_COND ].data = (F32)getFPGAP9Temperature();
+    currentTemperatureReadings[ P18_COND ].data = (F32)getFPGAP18Temperature();
 
     // Update read and error counters for each conductivity sensor
-    lastConductivityReadCounter[ CONDUCTIVITYSENSORS_CPI_SENSOR ].data = (U32)getFPGACPiReadCount();
-    lastConductivityReadCounter[ CONDUCTIVITYSENSORS_CPO_SENSOR ].data = (U32)getFPGACPoReadCount();
+    lastConductivityReadCounter[ P9_COND ].data = (U32)getFPGAP9ReadCount();
+    lastConductivityReadCounter[ P18_COND ].data = (U32)getFPGAP18ReadCount();
 
-    lastConductivityErrorCounter[ CONDUCTIVITYSENSORS_CPI_SENSOR ].data = (U32)getFPGACPiErrorCount();
-    lastConductivityErrorCounter[ CONDUCTIVITYSENSORS_CPO_SENSOR ].data = (U32)getFPGACPoErrorCount();
+    lastConductivityErrorCounter[ P9_COND ].data = (U32)getFPGAP9ErrorCount();
+    lastConductivityErrorCounter[ P18_COND ].data = (U32)getFPGAP18ErrorCount();
 
     // Monitor conductivity sensor health
 //    checkConductivitySensors();
@@ -459,28 +459,28 @@
  *************************************************************************/
 void handleConductivitySensorsReset( void )
 {
-    if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CPI_SENSOR ].resetRequested )
+    if ( TRUE == conductivitySensorControl[ P9_COND ].resetRequested )
     {
-        // CPi reset
-        setFPGACPiReset();
-        conductivitySensorControl[ CONDUCTIVITYSENSORS_CPI_SENSOR ].resetRequested = FALSE;
+        // P9 reset
+        setFPGAP9Reset();
+        conductivitySensorControl[ P9_COND ].resetRequested = FALSE;
     }
     else
     {
-        // clear CPi reset
-        clearFPGACPiReset();
+        // clear P9 reset
+        clearFPGAP9Reset();
     }
 
-    if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CPO_SENSOR ].resetRequested )
+    if ( TRUE == conductivitySensorControl[ P18_COND ].resetRequested )
     {
-        // CPo reset
-        setFPGACPoReset();
-        conductivitySensorControl[ CONDUCTIVITYSENSORS_CPO_SENSOR ].resetRequested = FALSE;
+        // P18 reset
+        setFPGAP18Reset();
+        conductivitySensorControl[ P18_COND ].resetRequested = FALSE;
     }
     else
     {
-        // clear CPo reset
-        clearFPGACPoReset();
+        // clear P18 reset
+        clearFPGAP18Reset();
     }
 }
 
@@ -497,28 +497,28 @@
  *************************************************************************/
 void handleConductivitySensorsInitProcedure( void )
 {
-    if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CPI_SENSOR ].initEnable )
+    if ( TRUE == conductivitySensorControl[ P9_COND ].initEnable )
     {
-        // CPi initialization
-        setFPGACPiInitEnable();
-        conductivitySensorControl[ CONDUCTIVITYSENSORS_CPI_SENSOR ].initEnable = FALSE;
+        // P9 initialization
+        setFPGAP9InitEnable();
+        conductivitySensorControl[ P9_COND ].initEnable = FALSE;
     }
     else
     {
-        // clear CPi Init command
-        clearFPGACPiInitEnable();
+        // clear P9 Init command
+        clearFPGAP9InitEnable();
     }
 
-    if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CPO_SENSOR ].initEnable )
+    if ( TRUE == conductivitySensorControl[ P18_COND ].initEnable )
     {
-        // CPo initialization
-        setFPGACPoInitEnable();
-        conductivitySensorControl[ CONDUCTIVITYSENSORS_CPO_SENSOR ].initEnable = FALSE;
+        // P18 initialization
+        setFPGAP18InitEnable();
+        conductivitySensorControl[ P18_COND ].initEnable = FALSE;
     }
     else
     {
-        // clear CPo Init command
-        clearFPGACPoInitEnable();
+        // clear P18 Init command
+        clearFPGAP18InitEnable();
     }
 }
 
@@ -575,17 +575,17 @@
     {
         conductivitySensorControl[ sensorID ].writeComplete = FALSE;
         conductivitySensorControl[ sensorID ].writeInProgress = TRUE;
-        if ( CONDUCTIVITYSENSORS_CPI_SENSOR == sensorID )
+        if ( P9_COND == sensorID )
         {
-            setFPGACPiAddress( conductivitySensorControl[ sensorID ].writeAddress );
-            setFPGACPiData( conductivitySensorControl[ sensorID ].writeData );
-            setFPGACPiWriteEnable();
+            setFPGAP9Address( conductivitySensorControl[ sensorID ].writeAddress );
+            setFPGAP9Data( conductivitySensorControl[ sensorID ].writeData );
+            setFPGAP9WriteEnable();
         }
         else
         {
-            setFPGACPoAddress( conductivitySensorControl[ sensorID ].writeAddress );
-            setFPGACPoData( conductivitySensorControl[ sensorID ].writeData );
-            setFPGACPoWriteEnable();
+            setFPGAP18Address( conductivitySensorControl[ sensorID ].writeAddress );
+            setFPGAP18Data( conductivitySensorControl[ sensorID ].writeData );
+            setFPGAP18WriteEnable();
         }
         state = CONDUCTIVITY_WRITE_COMPLETE;
     }
@@ -610,13 +610,13 @@
     {
         conductivitySensorControl[ sensorID  ].writeComplete = TRUE;
         conductivitySensorControl[ sensorID  ].writeEnable = FALSE;
-        if ( CONDUCTIVITYSENSORS_CPI_SENSOR == sensorID )
+        if ( P9_COND == sensorID )
         {
-            clearFPGACPiWriteEnable();
+            clearFPGAP9WriteEnable();
         }
         else
         {
-            clearFPGACPoWriteEnable();
+            clearFPGAP18WriteEnable();
         }
         state = CONDUCTIVITY_WRITE_INITIATE;
     }
@@ -677,15 +677,15 @@
     {
         conductivitySensorControl[ sensorID ].readComplete = FALSE;
         conductivitySensorControl[ sensorID ].readInProgress = TRUE;
-        if ( CONDUCTIVITYSENSORS_CPI_SENSOR == sensorID )
+        if ( P9_COND == sensorID )
         {
-            setFPGACPiAddress( conductivitySensorControl[ sensorID ].readAddress );
-            setFPGACPiReadEnable();
+            setFPGAP9Address( conductivitySensorControl[ sensorID ].readAddress );
+            setFPGAP9ReadEnable();
         }
         else
         {
-            setFPGACPoAddress( conductivitySensorControl[ sensorID ].readAddress );
-            setFPGACPoReadEnable();
+            setFPGAP18Address( conductivitySensorControl[ sensorID ].readAddress );
+            setFPGAP18ReadEnable();
         }
         state = CONDUCTIVITY_READ_COMPLETE;
     }
@@ -708,15 +708,15 @@
 
     if ( TRUE == conductivitySensorControl[ sensorID ].readInProgress )
     {
-        if ( CONDUCTIVITYSENSORS_CPI_SENSOR == sensorID )
+        if ( P9_COND == sensorID )
         {
-            conductivitySensorControl[ sensorID  ].readData = getFPGACPiData();
-            clearFPGACPiReadEnable();
+            conductivitySensorControl[ sensorID  ].readData = getFPGAP9Data();
+            clearFPGAP9ReadEnable();
         }
         else
         {
-            conductivitySensorControl[ sensorID  ].readData = getFPGACPoData();
-            clearFPGACPoReadEnable();
+            conductivitySensorControl[ sensorID  ].readData = getFPGAP18Data();
+            clearFPGAP18ReadEnable();
         }
         conductivitySensorControl[ sensorID  ].readComplete = TRUE;
         conductivitySensorControl[ sensorID  ].readEnable = FALSE;