Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -r7983907af837390c90979b1ac727f3f55f0b7ae2 -r7392f6b2662bbdb91ea4dfcdb788abf64619e10a
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 7983907af837390c90979b1ac727f3f55f0b7ae2)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 7392f6b2662bbdb91ea4dfcdb788abf64619e10a)
@@ -85,8 +85,8 @@
 BOOL testFPConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message );
 BOOL testRORejectionRatioDataPublishIntervalOverride( MESSAGE_T *message );
 BOOL testRORejectionRatioFilteredOverride( MESSAGE_T *message );
-BOOL testConductivitySensorConductivityReadingsOverride( MESSAGE_T *message );
-BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message );
+BOOL testConductivitySensorReadingsOverride( MESSAGE_T *message );
+BOOL testConductivitySensorTemperatureOverride( MESSAGE_T *message );
 
 /**@}*/
 
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r3749d041224897f9da5a1cfadae7bab81d94437b -r7392f6b2662bbdb91ea4dfcdb788abf64619e10a
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 3749d041224897f9da5a1cfadae7bab81d94437b)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 7392f6b2662bbdb91ea4dfcdb788abf64619e10a)
@@ -652,7 +652,7 @@
 void initFPGADD( void )
 {
     // Initialize fpga driver for beta 2 hardware
-    initFPGA( (U08*)&fpgaHeader, (U08*)&fpgaSensorReadings, (U08*)&fpgaActuatorSetPoints,
+    initFPGA( (U08*)&fpgaHeader, (U08*)&fpgaBeta19SensorReadings, (U08*)&fpgaBeta19ActuatorSetPoints,
               sizeof(FPGA_HEADER_T), sizeof(DD_FPGA_SENSORS_T), sizeof(FPGA_ACTUATORS_T) );;
 
     // initialize fpga data structures