Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rb91d956a773bcf1319f816f36b270b31c68948de -r3749d041224897f9da5a1cfadae7bab81d94437b
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision b91d956a773bcf1319f816f36b270b31c68948de)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 3749d041224897f9da5a1cfadae7bab81d94437b)
@@ -250,7 +250,7 @@
 #ifdef __TEENSY_CONDUCTIVITY_DRIVER__
         F32 rawCond = getTeensyConductivityValue( sensor );
 #else
-        F32 calculatedConductivity = getConductivityValue( sensor );
+        F32 calculatedConductivity = getConductivity( sensor );
 #endif
 
         // TODO - calibrate
@@ -314,7 +314,7 @@
 #ifdef __TEENSY_CONDUCTIVITY_DRIVER__
         F32 calculatedTemperature = getTeensyConductivityTemperatureValue( sensor );
 #else
-        F32 calculatedTemperature = getConductivityTemperatureValue( sensor );
+        F32 calculatedTemperature = getConductivityTemperature( sensor );
 #endif
 
         // TODO - calibrate