Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -rc7dcb245c2378b1c96eeaa02f120f61dff598b11 -r2205857f59dd884c4af450239381387cfb560c2e
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision c7dcb245c2378b1c96eeaa02f120f61dff598b11)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 2205857f59dd884c4af450239381387cfb560c2e)
@@ -7,26 +7,24 @@
 *
 * @file    Conductivity.h
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      10-Sep-2024
+* @author  (last)      Sean Nash
+* @date    (last)      09-Nov-2024
 *
-* @author  (original)  Vinayakam Mani
-* @date    (original)  10-Sep-2024
+* @author  (original)  Sean Nash
+* @date    (original)  09-Nov-2024
 *
 ***************************************************************************/
 
 #ifndef __CONDUCTIVITY_H__
 #define __CONDUCTIVITY_H__
 
-#include "DDCommon.h"
+#include "ROCommon.h"
 #include "ConductivitySensors.h"
 
 /**
  *  @defgroup Conductivity Conductivity
  *  @brief Conductivity Sensors monitor module. Monitors and filters conductivity sensor readings.
  *
- *
- *
  *  @addtogroup Conductivity
  *  @{
  */
@@ -36,14 +34,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 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
 } CONDUCTIVITY_DATA_T;
 
 // ********** public function prototypes **********