Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -r53eaeea39c88b1894a6b2d7b5c2733fbf037e0da -r6534bec3cbe1f7938378e173df55d302f3fef70c
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 53eaeea39c88b1894a6b2d7b5c2733fbf037e0da)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 6534bec3cbe1f7938378e173df55d302f3fef70c)
@@ -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 -ra859411f7144e5a3f0a778ac11d63c1fb1b45af8 -r6534bec3cbe1f7938378e173df55d302f3fef70c
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision a859411f7144e5a3f0a778ac11d63c1fb1b45af8)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 6534bec3cbe1f7938378e173df55d302f3fef70c)
@@ -656,7 +656,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