Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -r2205857f59dd884c4af450239381387cfb560c2e -r7b9a8c0cb9986368e1e38fcdb9daaf3cf707dfd2
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 2205857f59dd884c4af450239381387cfb560c2e)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 7b9a8c0cb9986368e1e38fcdb9daaf3cf707dfd2)
@@ -34,10 +34,8 @@
 /// Conductivity data struct.
 typedef struct
 {
-    F32 CPiConductivity;                                  ///< CPi (P9) conductivity sensor value
-    F32 CPoConductivity;                                  ///< CPo (P18) conductivity sensor value
-    F32 CPiTemperature;                                   ///< CPi (P9) temperature value
-    F32 CPoTemperature;                                   ///< CPo (P18) temperature value
+    F32 p9Conductivity;                                   ///< (P9) conductivity sensor value
+    F32 p18Conductivity;                                  ///< (P18) conductivity sensor value
 } CONDUCTIVITY_DATA_T;
 
 // ********** public function prototypes **********