Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r253b31257a3b6877624e8b83ee06c1404c1c3dd5 -r82b841cdb65ac335475e02841b7b568d1f5c77b1
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 253b31257a3b6877624e8b83ee06c1404c1c3dd5)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 82b841cdb65ac335475e02841b7b568d1f5c77b1)
@@ -131,14 +131,14 @@
 #ifndef __TEENSY_CONDUCTIVITY_DRIVER__
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testDDConductivitySensorReadingsOverride },
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testDDConductivitySensorTemperatureReadingsOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,                  &testDDConductivitySensorReadCounterOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST,                 &testDDConductivitySensorErrorCounterOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,                  &testDDConductivitySensorConductivityReadCounterOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST,                 &testDDConductivitySensorConductivityErrorCounterOverride },
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testDDConductivitySensorDataPublishIntervalOverride },
     { MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                     &testFPConductivitySensorDataPublishIntervalOverride },
     { MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST,                                      &testFPConductivitySensorReadingsOverride },
     { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                                 &testFPConductivitySensorTemperatureReadingsOverride },
-    { MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,                           &testFPConductivitySensorReadCounterOverride },
-    { MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST,                          &testFPConductivitySensorErrorCounterOverride },
+    { MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,                           &testFPConductivitySensorConductivityReadCounterOverride },
+    { MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST,                          &testFPConductivitySensorConductivityErrorCounterOverride },
 #endif
     { MSG_ID_DD_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                 &testConcentratePumpDataPublishIntervalOverride },
     { MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST,                     &testConcentratePumpTargetSpeedOverride },