Index: leahi_dialin/common/test_config_defs.py
===================================================================
diff -u -r3b5cc3a0277570a12df2ec7d5f6a6b54ce70f40b -re27f157082335696e336c9d9952392bc62e3c8c8
--- leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 3b5cc3a0277570a12df2ec7d5f6a6b54ce70f40b)
+++ leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision e27f157082335696e336c9d9952392bc62e3c8c8)
@@ -19,20 +19,16 @@
 
 
 @unique
-class DDTestConfigOptions(DialinEnum):
-    TEST_CONFIG_DISABLE_BC_PRES_ALARM =  0                      # Test configuration to disable Balancing Chamber pressure alarms
-    TEST_CONFIG_ENABLE_NEXT_GEN_HW = 1                          # Test configuration to switch to HW in development
-    TEST_CONFIG_USE_DIENER_1000_PUMP = 2                        # Test configuration to use Diener 1000 concentracte pump instead of Diener 2000
-    TEST_CONFIG_DISABLE_CHAMBER_H_FILL = 3                      # Test configuration to disable Chamber H fill in case if D46 sensor is disabled
-    TEST_CONFIG_DISABLE_CHAMBER_F_FILL = 4                      # Test configuration to disable Chamber F fill in case if D63 and D98 sensor is disabled
+class DDFPTestConfigOptions(DialinEnum):
+    TEST_CONFIG_DISABLE_BC_PRES_ALARM =  0                      # (DD) Test configuration to disable Balancing Chamber pressure alarms
+    TEST_CONFIG_ENABLE_BETA_1_9_HW = 1                          # (DD & FP) Test configuration to switch to HW in development
+    TEST_CONFIG_USE_DIENER_1000_PUMP = 2                        # (DD) Test configuration to use Diener 1000 concentracte pump instead of Diener 2000
+    TEST_CONFIG_DISABLE_CHAMBER_H_FILL = 3                      # (DD) Test configuration to disable Chamber H fill in case if D46 sensor is disabled
+    TEST_CONFIG_DISABLE_CHAMBER_F_FILL = 4                      # (DD) Test configuration to disable Chamber F fill in case if D63 and D98 sensor is disabled
     NUM_OF_TEST_CONFIGS = 5                                     # Number of Test Configs
 
-@unique
-class FPTestConfigOptions(DialinEnum):
-    TEST_CONFIG_ENABLE_NEXT_GEN_HW = 0                          # Test configuration to switch to HW in development
-    NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs
 
 @unique
 class TDTestConfigOptions(DialinEnum):
-    TEST_CONFIG_ENABLE_NEXT_GEN_HW = 0                          # Test configuration to switch to HW in development
+    TEST_CONFIG_ENABLE_BETA_1_9_HW = 0                          # Test configuration to switch to HW in development
     NUM_OF_TEST_CONFIGS = 1                                     # Number of Test Configs
Index: leahi_dialin/dd/modules/dd_test_configs.py
===================================================================
diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -re27f157082335696e336c9d9952392bc62e3c8c8
--- leahi_dialin/dd/modules/dd_test_configs.py	(.../dd_test_configs.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
+++ leahi_dialin/dd/modules/dd_test_configs.py	(.../dd_test_configs.py)	(revision e27f157082335696e336c9d9952392bc62e3c8c8)
@@ -17,7 +17,7 @@
 from logging import Logger
 
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.test_config_defs import DDTestConfigOptions
+from leahi_dialin.common.test_config_defs import DDFPTestConfigOptions
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from .constants import NO_RESET
 from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_integer
@@ -57,7 +57,7 @@
         @param config: (int) Test config to set
         @return: the status of a test config
         """
-        return self.dd_test_configs[DDTestConfigOptions(config).name]
+        return self.dd_test_configs[DDFPTestConfigOptions(config).name]
 
     def cmd_set_test_config(self, config: int, reset: int = NO_RESET):
         """
@@ -78,9 +78,9 @@
                                               payload=payload)
 
         if reset == NO_RESET:
-            self.logger.debug("Setting {}".format(DDTestConfigOptions(config).name))
+            self.logger.debug("Setting {}".format(DDFPTestConfigOptions(config).name))
         else:
-            self.logger.debug("Resetting {}".format(DDTestConfigOptions(config).name))
+            self.logger.debug("Resetting {}".format(DDFPTestConfigOptions(config).name))
 
         # Send message
         received_message = self.can_interface.send(message)
@@ -156,7 +156,7 @@
         payload = message['message']
         index = MsgFieldPositions.START_POS_FIELD_1
 
-        for config in DDTestConfigOptions.__members__:
+        for config in DDFPTestConfigOptions.__members__:
             if 'NUM_OF_TEST_CONFIGS' not in config:
                 config_value, index = bytearray_to_integer(payload, index, False)
                 self.dd_test_configs[config] = config_value
@@ -169,7 +169,7 @@
 
         @return: None
         """
-        for config in DDTestConfigOptions.__members__:
+        for config in DDFPTestConfigOptions.__members__:
             # Loop through the list of the test configuration and set the values to 0xFFFFFFFF
             if 'NUM_OF_TEST_CONFIGS' not in config:
                 self.dd_test_configs[config] = 0xFFFFFFFF
\ No newline at end of file
Index: leahi_dialin/fp/modules/fp_test_configs.py
===================================================================
diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -re27f157082335696e336c9d9952392bc62e3c8c8
--- leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
+++ leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision e27f157082335696e336c9d9952392bc62e3c8c8)
@@ -17,7 +17,7 @@
 from logging import Logger
 
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.test_config_defs import FPTestConfigOptions
+from leahi_dialin.common.test_config_defs import DDFPTestConfigOptions
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from .constants import NO_RESET
 from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_integer
@@ -57,7 +57,7 @@
         @param config: (int) Test config to set
         @return: the status of a test config
         """
-        return self.fp_test_configs[FPTestConfigOptions(config).name]
+        return self.fp_test_configs[DDFPTestConfigOptions(config).name]
 
 
     def cmd_set_test_config(self, config: int, reset: int = NO_RESET):
@@ -79,9 +79,9 @@
                                               payload=payload)
 
         if reset == NO_RESET:
-            self.logger.debug("Setting {}".format(FPTestConfigOptions(config).name))
+            self.logger.debug("Setting {}".format(DDFPTestConfigOptions(config).name))
         else:
-            self.logger.debug("Resetting {}".format(FPTestConfigOptions(config).name))
+            self.logger.debug("Resetting {}".format(DDFPTestConfigOptions(config).name))
 
         # Send message
         received_message = self.can_interface.send(message)
@@ -157,7 +157,7 @@
         payload = message['message']
         index = MsgFieldPositions.START_POS_FIELD_1
 
-        for config in FPTestConfigOptions.__members__:
+        for config in DDFPTestConfigOptions.__members__:
             if 'NUM_OF_TEST_CONFIGS' not in config:
                 config_value, index = bytearray_to_integer(payload, index, False)
                 self.fp_test_configs[config] = config_value
@@ -170,7 +170,7 @@
 
         @return: None
         """
-        for config in FPTestConfigOptions.__members__:
+        for config in DDFPTestConfigOptions.__members__:
             # Loop through the list of the test configuration and set the values to 0xFFFFFFFF
             if 'NUM_OF_TEST_CONFIGS' not in config:
-                self.fp_test_configs[config] = 0xFFFFFFFF
\ No newline at end of file
+                self.fp_test_configs[config] = 0xFFFFFFFF