Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r7f5fb62247b517554f7a9e13a5ef47caf1d5609f -r52aa7af16b98730ba59fc2577dbe8f73b5959775
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 7f5fb62247b517554f7a9e13a5ef47caf1d5609f)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 52aa7af16b98730ba59fc2577dbe8f73b5959775)
@@ -128,7 +128,7 @@
     NUM_OF_BAL_CHAMBER_SW = 2                              # Number of balancing chamber states
 
 @unique
-class BloodLeakStates(DialinEnum):
+class DDBloodLeakStates(DialinEnum):
     """
     DD blood leak embedded mode state machine states
     """
@@ -142,7 +142,7 @@
     NUM_OF_BLOOD_LEAK_STATES = 7
 
 @unique
-class ConcentratePumpsEnum(DialinEnum):
+class DDConcentratePumpsEnum(DialinEnum):
     D11_CP1_ACID = 0                    # Acid Concentrate Pump
     D10_CP2_BICARB = 1                  # Bicarbonate Concentrate Pump
     D76_UF = 2                          # Ultrafiltration Concentrate Pump
@@ -169,7 +169,7 @@
     NUM_OF_D10_D11_CONCENTRATE_PUMP_ATTRIBUTES = 9      # Number of Acid (D11) and Bicarbonate (D10) Concentrate Pump Attributes
 
 @unique
-class ConductivitySensorsEnum(DialinEnum):
+class DDConductivitySensorsEnum(DialinEnum):
     D17_COND = 0                        # Closed Loop Control of Dosing for D74 Conductivity Sensor
     D27_COND = 1                        # Closed Loop Control of Dosing for D29 Conductivity Sensor
     D29_COND = 2                        # Water, Bicarbonate, and Acid Collective Conductivity Sensor
@@ -178,13 +178,13 @@
     NUM_OF_CONDUCTIVITY_SENSORS = 5     # Number of Conductivity Sensors
 
 @unique
-class DialysatePumpsEnum(DialinEnum):
+class DDDialysatePumpsEnum(DialinEnum):
     D12_PUMP = 0                        # Fresh Dialysate Pump
     D48_PUMP = 1                        # Spent Dialysate Pump
     NUM_OF_DIALYSATE_PUMPS = 2          # Number of Dialysate Pumps
 
 @unique
-class DialysatePumpAttributesEnum(DialinEnum):
+class DDDialysatePumpAttributesEnum(DialinEnum):
     TARGET_RPM = 0                              # Target RPM Dialysate Pump Attribute
     MEASURED_SPEED = 1                          # Measured Speed Dialysate Pump Attribute
     CURRENT_SPEED = 2                           # Current Speed Dialysate Pump Attribute
@@ -205,26 +205,26 @@
     NUM_OF_DIALYSATE_PUMP_STATES = 3                # Number of Dialysate Pump States
 
 @unique
-class HeatersStartStop(DialinEnum):
+class DDHeatersStartStop(DialinEnum):
     STOP = 0
     START = 1
 
 @unique
-class HeatersState(DialinEnum):
+class DDHeatersState(DialinEnum):
     HEATER_EXEC_STATE_OFF = 0                           # Heater Execution Off State
     HEATER_EXEC_STATE_RAMP_TO_TARGET = 1                # Heater Execution Ramp to Target State
     HEATER_EXEC_STATE_CONTROL_TO_TARGET = 2             # Heater Execution Control to Target State
     HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET = 3   # Heater Execution Control to Disinfection State
     NUM_OF_HEATERS_STATE = 4
 
 @unique
-class HeatersNames(DialinEnum):
+class DDHeatersNames(DialinEnum):
     D5_HEAT = 0                     # Primary heater
     D45_HEAT = 1                    # Trimmer heater
     NUM_OF_DD_HEATERS = 2           # Number of Heaters
 
 @unique
-class HeatersAttributesEnum(DialinEnum):
+class DDHeatersAttributesEnum(DialinEnum):
     HEAT_DUTY_CYCLE = 0                 # Heat Duty Cycle Attribute for Heaters
     HEAT_TARGET_TEMP = 1                # Target Temperature Attribute for Heaters
     HEAT_STATE = 2                      # State to command Attribute for Heaters
@@ -256,7 +256,7 @@
     NUM_OF_PISTON_PUMP_ATTRIBUTES = 3       # Number of Piston Pump Attributes
 
 @unique
-class PressureNames(DialinEnum):
+class DDPressureNames(DialinEnum):
     # Pressure Sensor IDs
     M1_PRES = 0                         # Water Inlet pressure before regulator (PRi)
     M3_PRES = 1                         # Water Inlet pressure after regulator (PRo)
@@ -269,7 +269,7 @@
     NUM_OF_PRESSURE_SENSORS = 8         # Number of pressure sensors
 
 @unique
-class PressureAttributesEnum (DialinEnum):
+class DDPressureAttributesEnum (DialinEnum):
     PRES = 0                                # Pressure Attribute for Pressure Sensors
     TEMP = 1                                # Temperature Attribute for Pressure Sensors
     NUM_OF_PRES_SENSOR_ATTRIBUTES = 2       # Number of Pressure Sensor Attributes