Index: Utilities.h
===================================================================
diff -u -r4997cacd5a1501b7da1c8a3ba71f9594ad23a603 -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57
--- Utilities.h	(.../Utilities.h)	(revision 4997cacd5a1501b7da1c8a3ba71f9594ad23a603)
+++ Utilities.h	(.../Utilities.h)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
@@ -25,7 +25,7 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "FPCommon.h"
 #endif
 
 /**
@@ -58,9 +58,9 @@
     TIME_WINDOWED_COUNT_BATT_COMM_ERROR,                    ///< Battery communication error
 #endif
 #ifdef _DD_
-    TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES,                         ///< FPGA communication failure (NAK, CRC, timeout)
-    TIME_WINDOWED_COUNT_FPGA_FRESH_DIALYSATE_PUMP_HALL_SENSOR_ERROR,///< FPGA fresh dialysate pump hall sensor failure
-    TIME_WINDOWED_COUNT_FPGA_SPENT_DIALYSATE_PUMP_HALL_SENSOR_ERROR,///< FPGA spent dialysate pump hall sensor failure
+    TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES,                 ///< FPGA communication failure (NAK, CRC, timeout)
+    TIME_WINDOWED_COUNT_FPGA_D12_PUMP_HALL_SENSOR_ERROR,    ///< FPGA fresh dialysate pump hall sensor failure
+    TIME_WINDOWED_COUNT_FPGA_D48_PUMP_HALL_SENSOR_ERROR,    ///< FPGA spent dialysate pump hall sensor failure
 #endif
 #ifdef _RO_
     TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR,     ///< FPGA Conductivity sensor error
@@ -114,8 +114,6 @@
 U08 crc8( const U08 *address, U32 len );
 U08 crc4( U16* buffer, U32 byteCount );
 
-S16 signExtend16( U16 value, U32 signBit );
-
 U32 u32DiffWithWrap( U32 start, U32 end );
 S32 u32BiDiffWithWrap( U32 start, U32 end );
 U16 u16DiffWithWrap( U16 start, U16 end );