Index: PIControllers.c
===================================================================
diff -u -r5af863b0029529a964b953313e8cbf283989ed66 -rf352febbad947e7ae4afbd9a5eaa87e434648f37
--- PIControllers.c	(.../PIControllers.c)	(revision 5af863b0029529a964b953313e8cbf283989ed66)
+++ PIControllers.c	(.../PIControllers.c)	(revision f352febbad947e7ae4afbd9a5eaa87e434648f37)
@@ -63,10 +63,10 @@
 static PI_CONTROLLER_T piControllers[ NUM_OF_PI_CONTROLLERS_IDS ] =
 {   // Kp   Ki  uMax  uMin  ref meas err  esw esum ctrl Ilimit  controller type
 #ifdef _DD_
-    { 0.0, 0.0, 4500, 300, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 10.0, CONTROLLER_BIDIRECTIONAL },   // PI_CONTROLLER_ID_FRESH_DIALYSATE_PUMP
-    { 0.0, 0.0, 4500, 300, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 10.0, CONTROLLER_BIDIRECTIONAL },   // PI_CONTROLLER_ID_SPENT_DIALYSATE_PUMP
-    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,  0.1, CONTROLLER_BIDIRECTIONAL },   // PI_CONTROLLER_ID_PRIMARY_HEATER
-    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,  0.1, CONTROLLER_BIDIRECTIONAL },   // PI_CONTROLLER_ID_TRIMMER_HEATER
+    { 0.0, 0.0, 2700, 350, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 10.0, CONTROLLER_BIDIRECTIONAL },   // PI_CONTROLLER_ID_D12_PUMP
+    { 0.0, 0.0, 2700, 350, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 10.0, CONTROLLER_BIDIRECTIONAL },   // PI_CONTROLLER_ID_D48_PUMP
+    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,  0.1, CONTROLLER_BIDIRECTIONAL },   // PI_CONTROLLER_ID_D5_HEAT
+    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,  0.1, CONTROLLER_BIDIRECTIONAL },   // PI_CONTROLLER_ID_D45_HEAT
 #endif
 #ifdef _RO_
     { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.5,  CONTROLLER_UNIDIRECTIONAL },  // PI_CONTROLLER_ID_RO_PUMP
Index: PIControllers.h
===================================================================
diff -u -r5af863b0029529a964b953313e8cbf283989ed66 -rf352febbad947e7ae4afbd9a5eaa87e434648f37
--- PIControllers.h	(.../PIControllers.h)	(revision 5af863b0029529a964b953313e8cbf283989ed66)
+++ PIControllers.h	(.../PIControllers.h)	(revision f352febbad947e7ae4afbd9a5eaa87e434648f37)
@@ -42,10 +42,10 @@
 typedef enum ControllerList
 {
 #ifdef _DD_
-    PI_CONTROLLER_ID_FRESH_DIALYSATE_PUMP,          ///< Fresh dialysate Pump controller
-    PI_CONTROLLER_ID_SPENT_DIALYSATE_PUMP,          ///< Spent dialysate Pump controller
-    PI_CONTROLLER_ID_PRIMARY_HEATER,                ///< Primary heater controller
-    PI_CONTROLLER_ID_TRIMMER_HEATER,                ///< Trimmer heater controller
+    PI_CONTROLLER_ID_D12_PUMP,                      ///< Fresh dialysate Pump controller
+    PI_CONTROLLER_ID_D48_PUMP,                      ///< Spent dialysate Pump controller
+    PI_CONTROLLER_ID_D5_HEAT,                       ///< Primary heater controller
+    PI_CONTROLLER_ID_D45_HEAT,                      ///< Trimmer heater controller
 #endif
 #ifdef _RO_
     PI_CONTROLLER_ID_RO_PUMP_FLOW = 0,              ///< RO Pump controller to flow
Index: PersistentAlarm.h
===================================================================
diff -u -r245a09a96d22a6e1ea091eec685cb712325c4cd8 -rf352febbad947e7ae4afbd9a5eaa87e434648f37
--- PersistentAlarm.h	(.../PersistentAlarm.h)	(revision 245a09a96d22a6e1ea091eec685cb712325c4cd8)
+++ PersistentAlarm.h	(.../PersistentAlarm.h)	(revision f352febbad947e7ae4afbd9a5eaa87e434648f37)
@@ -42,10 +42,10 @@
     FPGA_PERS_ERROR_TRANSMEMBRANE_PRESSURE,                     ///< Transmembrane pressure sensor.
     FPGA_PERS_ERROR_WATER_INLET_INPUT_PRESSURE,                 ///< Water Inlet Input pressure sensor.
     FPGA_PERS_ERROR_WATER_INLET_OUTPUT_PRESSURE,                ///< Water Inlte Output pressure sensor.
-    FPGA_PERS_ERROR_CD1_COND_SENSOR,                            ///< CD1 Conductivity sensor.
-    FPGA_PERS_ERROR_CD2_COND_SENSOR,                            ///< CD2 Conductivity sensor.
-    FPGA_PERS_ERROR_CD3_COND_SENSOR,                            ///< CD3 Conductivity sensor.
-    FPGA_PERS_ERROR_CD4_COND_SENSOR,                            ///< CD4 Conductivity sensor.
+    FPGA_PERS_ERROR_D17_COND_SENSOR,                            ///< CD1 Conductivity sensor.
+    FPGA_PERS_ERROR_D27_COND_SENSOR,                            ///< CD2 Conductivity sensor.
+    FPGA_PERS_ERROR_D29_COND_SENSOR,                            ///< CD3 Conductivity sensor.
+    FPGA_PERS_ERROR_D43_COND_SENSOR,                            ///< CD4 Conductivity sensor.
     FPGA_PERS_ERROR_RTD_ADC_TEMP_SENSORS,                       ///< Temperature sensors.
     FPGA_PERS_ERROR_BARO_SENSOR,                                ///< Barometric temperature sensor.
     NUM_OF_FPGA_SENSOR_GROUPS                                   ///< Number of FPGA sensor groups.
Index: Utilities.h
===================================================================
diff -u -r34e9d24b76d786a5d3bba641f06e7764439c161e -rf352febbad947e7ae4afbd9a5eaa87e434648f37
--- Utilities.h	(.../Utilities.h)	(revision 34e9d24b76d786a5d3bba641f06e7764439c161e)
+++ Utilities.h	(.../Utilities.h)	(revision f352febbad947e7ae4afbd9a5eaa87e434648f37)
@@ -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