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 );
 
 /**@}*/