Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -re228885d4b066320c69bbec2553b5e7fc62ec2cb -r313982ccc772f1bbe182877dff7e00381b04e0f4
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision e228885d4b066320c69bbec2553b5e7fc62ec2cb)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 313982ccc772f1bbe182877dff7e00381b04e0f4)
@@ -36,14 +36,10 @@
 /// Conductivity data struct.
 typedef struct
 {
-    F32 cd1;                                              ///< CD1 conductivity sensor value
-    F32 cd2;                                              ///< CD2 conductivity sensor value
-    F32 cd3;                                              ///< CD3 conductivity sensor value
-    F32 cd4;                                              ///< CD4 conductivity sensor value
-    F32 td1;                                              ///< TD1 temperature value
-    F32 td2;                                              ///< TD2 temperature value
-    F32 td3;                                              ///< TD3 temperature value
-    F32 td4;                                              ///< TD4 temperature value
+    F32 d17Cond;                                              ///< CD1 conductivity sensor value
+    F32 d27Cond;                                              ///< CD2 conductivity sensor value
+    F32 d29Cond;                                              ///< CD3 conductivity sensor value
+    F32 d43Cond;                                              ///< CD4 conductivity sensor value
 } CONDUCTIVITY_DATA_T;
 
 // ********** public function prototypes **********