Index: leahi_dialin/fp/modules/fp_test_configs.py
===================================================================
diff -u -r894abd4d8e62d20ba65ca78e443ffb5ea00c07ea -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision 894abd4d8e62d20ba65ca78e443ffb5ea00c07ea)
+++ leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -19,7 +19,7 @@
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.global_vars import GlobalVariables
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.test_config_defs import DDFPTestConfigOptions
+from leahi_dialin.common.test_config_defs import FPTestConfigOptions
 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
@@ -59,7 +59,7 @@
         @param config: (int) Test config to set
         @return: the status of a test config
         """
-        return self.fp_test_configs[DDFPTestConfigOptions(config).name]
+        return self.fp_test_configs[FPTestConfigOptions(config).name]
 
 
     @publish(['msg_id_fp_send_test_config', 'fp_test_configs', 'fp_test_configs_response_timestamp'])
@@ -73,11 +73,11 @@
         payload = message['message']
         index = MsgFieldPositions.START_POS_FIELD_1
 
-        for config in DDFPTestConfigOptions.__members__:
+        for config in FPTestConfigOptions.__members__:
             config_value, index = bytearray_to_integer(payload, index, False)
             if 'NUM_OF_TEST_CONFIGS' not in config:
                 self.fp_test_configs[config] = config_value
-            if DDFPTestConfigOptions.TEST_CONFIG_ENABLE_BETA_1_9_HW.name in config:
+            if FPTestConfigOptions.TEST_CONFIG_ENABLE_BETA_1_9_HW.name in config:
                 GlobalVariables().NEXT_GEN_HW = config_value == 1
 
         self.fp_test_configs_response_timestamp = timestamp
@@ -102,9 +102,9 @@
                                               payload=payload)
 
         if reset == NO_RESET:
-            self.logger.debug("Setting {}".format(DDFPTestConfigOptions(config).name))
+            self.logger.debug("Setting {}".format(FPTestConfigOptions(config).name))
         else:
-            self.logger.debug("Resetting {}".format(DDFPTestConfigOptions(config).name))
+            self.logger.debug("Resetting {}".format(FPTestConfigOptions(config).name))
 
         # Send message
         received_message = self.can_interface.send(message)
@@ -175,7 +175,7 @@
 
         @return: None
         """
-        for config in DDFPTestConfigOptions.__members__:
+        for config in FPTestConfigOptions.__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