Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r4ed5e33f4bb86748661754208699e66eca184792 -r6158f53357d5d4023df091b6ed1e8f6aa9f30947
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 4ed5e33f4bb86748661754208699e66eca184792)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 6158f53357d5d4023df091b6ed1e8f6aa9f30947)
@@ -89,23 +89,18 @@
     U32 fpgaLCB2;
     U32 fpgaADC2Temp;
 
-    U32 fpgaCD1;
-    U32 fpgaCD2;
+    U32 fpgaCD1Temp; // Conductivity sensor 1 in the mixing area
+    U32 fpgaCD2Temp;
     U32 fpgaTPiTemp;
     U32 fpgaTPoTemp;
-    U32 fpgaRTDTemp; // What is this one?
+    U32 fpgaRTDTemp;
 
-    U32 fpgaTD1Temp; // Conductivity sensor 1
-    U32 fpgaTD2Temp; // Conductivity sensor 2
-
-    U32 fpgaTHDo;
+    U32 fpgaTHDo; // TRo
     U32 fpgaTHDoTemp;
 
     U32 fpgaTDi;
     U32 fpgaTDiTemp; // Dialysate inlet sensor
 
-    U32 fpgaTRoTemp; // Redundant sensor
-
     U32 fpgaCPoEc;
     U32 fpgaCPoTds;
 
@@ -1121,9 +1116,9 @@
  * @param none
  * @return last conductivity sensor 1 outlet temperature reading
  *************************************************************************/
-U32 getFPGATD1Temp( void )
+U32 getFPGACD1Temp( void )
 {
-    return ( fpgaSensorReadings.fpgaTD1Temp & MASK_OFF_U32_MSB );
+    return ( fpgaSensorReadings.fpgaCD1Temp & MASK_OFF_U32_MSB );
 }
 /*********************************************************************//**
  * @brief
@@ -1135,9 +1130,9 @@
  * @param none
  * @return last conductivity sensor 2 outlet temperature reading
  *************************************************************************/
-U32 getFPGATD2Temp( void )
+U32 getFPGATC2Temp( void )
 {
-    return ( fpgaSensorReadings.fpgaTD2Temp & MASK_OFF_U32_MSB );
+    return ( fpgaSensorReadings.fpgaCD2Temp & MASK_OFF_U32_MSB );
 }
 /*********************************************************************//**
  * @brief
@@ -1149,9 +1144,9 @@
  * @param none
  * @return last redundant sensor outlet temperature reading
  *************************************************************************/
-U32 getFPGATRoTemp( void )
+U32 getFPGATHDoTemp( void )
 {
-    return ( fpgaSensorReadings.fpgaTRoTemp & MASK_OFF_U32_MSB );
+    return ( fpgaSensorReadings.fpgaTHDoTemp & MASK_OFF_U32_MSB );
 }
 /*********************************************************************//**
  * @brief