Index: MessagePayloads.h
===================================================================
diff -u -rc42c1c0afbc344f0806f5d6a505f38ef17eb735f -r5477852164955f5840473e8dcaa7573610294503
--- MessagePayloads.h	(.../MessagePayloads.h)	(revision c42c1c0afbc344f0806f5d6a505f38ef17eb735f)
+++ MessagePayloads.h	(.../MessagePayloads.h)	(revision 5477852164955f5840473e8dcaa7573610294503)
@@ -46,7 +46,7 @@
     F32  bicarbConvFactor;                              ///< Conversion factor of bicarbonate.
     U32  sodium;                                        ///< Set sodium being used to make dialysate.
     U32  bicarbonate;                                   ///< Set bicarbonate being used to make dialysate.
-    F32  hdfRate;                                       ///< Set HDF rate ( mL/min).
+    F32  substitutionrate;                              ///< Set HDF rate ( mL/min).
 } DIALYSATE_DELIVERY_REQ_PAYLOAD_T;
 
 /// Payload record structure for requesting pre generate dialysate.
Index: TestSupport.c
===================================================================
diff -u -r33ece5dbfd9eab92d302f0717ead4a313f574037 -r5477852164955f5840473e8dcaa7573610294503
--- TestSupport.c	(.../TestSupport.c)	(revision 33ece5dbfd9eab92d302f0717ead4a313f574037)
+++ TestSupport.c	(.../TestSupport.c)	(revision 5477852164955f5840473e8dcaa7573610294503)
@@ -539,13 +539,6 @@
                 // If beta 2.0 config is enabled by mistake when beta 1.0 config is active
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_STATE, config )
             }
-            else
-            {
-                // Initialize the blood leak driver since the FPGA registers are changed
-                initBloodLeak();
-                // initialize FPGA registers to Beta 2.0
-                initFPGAPerHW( TRUE );
-            }
         }
 #endif
     }
@@ -571,15 +564,6 @@
     {
         testConfig[ config ] = TEST_CONFIG_DISABLE_KEY;
         status               = TRUE;
-#ifdef _DD_
-        if ( config == TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW )
-        {
-            // Initialize the blood leak driver since the FPGA registers are changed
-            initBloodLeak();
-            // initialize FPGA registers to Beta 1.9 or below
-            initFPGAPerHW( FALSE );
-        }
-#endif
     }
 
     return status;