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