Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r224b86c0847207c168d38fa1713a1e9116642267 -r0d94694b64f936805dd6c2f71fde1840bc9c1311
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 224b86c0847207c168d38fa1713a1e9116642267)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 0d94694b64f936805dd6c2f71fde1840bc9c1311)
@@ -1771,25 +1771,26 @@
 
 /*********************************************************************//**
  * @brief
- * The getFPGAEmstatRxErrCount function gets Emstat conductivity sensor error count.
+ * The getFPGAEmstatCD1CD2RxErrCount function gets Emstat conductivity sensor
+ * error count.
  * @details Inputs: fpgaSensorReadings.fpgaEmstatRxErrorCount
  * @details Outputs: none
  * @return Emstat conductivity sensor receive error count
  *************************************************************************/
-U08 getFPGAEmstatRxErrCount( void )
+U08 getFPGAEmstatCD1CD2RxErrCount( void )
 {
     return fpgaSensorReadings.fpgaCD1CD2EmstatRxErrorCount;
 }
 
 /*********************************************************************//**
  * @brief
- * The getFPGAEmstatRxFifoCount function gets Emstat conductivity sensor receive
- * fifo buffer count.
+ * The getFPGAEmstatCD1CD2RxFifoCount function gets Emstat conductivity
+ * sensor receive fifo buffer count.
  * @details Inputs: fpgaSensorReadings.fpgaEmstatTxFifoCount
  * @details Outputs: none
  * @return Emstat conductivity sensor receive fifo buffer count
  *************************************************************************/
-U16 getFPGAEmstatRxFifoCount( void )
+U16 getFPGAEmstatCD1CD2RxFifoCount( void )
 {
     return fpgaSensorReadings.fpgaCD1CD2EmstatRxFifoCount;
 }
@@ -2217,7 +2218,7 @@
  *************************************************************************/
 U16 getFPGAEmstatCPiCPoRxFifoCount( void )
 {
-    return fpgaSensorReadings.fpgaCD1CD2EmstatRxFifoCount;
+    return fpgaSensorReadings.fpgaCPiCPoEmstatRxFIFOCount;
 }
 
 /*********************************************************************//**
@@ -2230,7 +2231,7 @@
  *************************************************************************/
 U08 getFPGAEmstatCPiCPoRxErrCount( void )
 {
-    return fpgaSensorReadings.fpgaCD1CD2EmstatRxErrorCount;
+    return fpgaSensorReadings.fpgaCPiCPoEmstatRxErrCount;
 }
 
 /**@}*/