Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r5f8fef12f850bb73e1f8e7d7372a404e9db07fa4 -r78ca8321ca7429b492dcbaa373262094ceadd901
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 5f8fef12f850bb73e1f8e7d7372a404e9db07fa4)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 78ca8321ca7429b492dcbaa373262094ceadd901)
@@ -455,7 +455,7 @@
     D92_PUMP            = 0                                     # HDF Substitution pump
     NUM_OF_SUB_PUMPS    = 1                                     # Number of substituion pumps
 
-DDPistonPumpNames._str_list = {
+DDSubstitutionPumpNames._str_list = {
     # Official Name :       Accepted strings
     'D92_PUMP': ['d92', 'sub pump'],
     'NUM_OF_SUB_PUMPS': [],
@@ -1005,7 +1005,7 @@
     MEASURED_SPEED                      = 3                     # Measured Speed Substitution Pump Attribute
     NUM_OF_DIALYSATE_PUMP_ATTRIBUTES    = 4                     # Number of Substitution Pump Attributes
 
-DDDialysatePumpAttributes._str_list = {
+DDSubstitutionPumpAttributes._str_list = {
     # Official Name :       Accepted strings
     'TARGET_SPEED': ['target rp,'],
     'CURRENT_SPEED': ['current speed'],
Index: leahi_dialin/dd/modules/substitution_pump.py
===================================================================
diff -u -r5f8fef12f850bb73e1f8e7d7372a404e9db07fa4 -r78ca8321ca7429b492dcbaa373262094ceadd901
--- leahi_dialin/dd/modules/substitution_pump.py	(.../substitution_pump.py)	(revision 5f8fef12f850bb73e1f8e7d7372a404e9db07fa4)
+++ leahi_dialin/dd/modules/substitution_pump.py	(.../substitution_pump.py)	(revision 78ca8321ca7429b492dcbaa373262094ceadd901)
@@ -53,10 +53,12 @@
 
         #: The substitution pump data in dictionary format
         self.dd_substitution_pumps = {
-            dd_enum_repository.DDSubstitutionPumpAttributes.TARGET_SPEED.name: 0.0,
-            dd_enum_repository.DDSubstitutionPumpAttributes.CURRENT_SPEED.name: 0.0,
-            dd_enum_repository.DDSubstitutionPumpAttributes.STATE.name: 0,
-            dd_enum_repository.DDSubstitutionPumpAttributes.MEASURED_SPEED.name: 0.0,
+            dd_enum_repository.DDSubstitutionPumpNames.D92_PUMP.name: {
+                dd_enum_repository.DDSubstitutionPumpAttributes.TARGET_SPEED.name: 0.0,
+                dd_enum_repository.DDSubstitutionPumpAttributes.CURRENT_SPEED.name: 0.0,
+                dd_enum_repository.DDSubstitutionPumpAttributes.STATE.name: 0,
+                dd_enum_repository.DDSubstitutionPumpAttributes.MEASURED_SPEED.name: 0.0,
+            }
         }
         self.dd_substitution_pump_timestamp = 0  #: The timestamp of the latest message