Index: leahi_dialin/dd/modules/mixing_cntrl.py
===================================================================
diff -u -r3c8e7ea66c42cb56094aab65ad46d1a7b75ec904 -r3c8a9517b70f8a0096e7f25c0397f9c8084b0b19
--- leahi_dialin/dd/modules/mixing_cntrl.py	(.../mixing_cntrl.py)	(revision 3c8e7ea66c42cb56094aab65ad46d1a7b75ec904)
+++ leahi_dialin/dd/modules/mixing_cntrl.py	(.../mixing_cntrl.py)	(revision 3c8a9517b70f8a0096e7f25c0397f9c8084b0b19)
@@ -29,7 +29,7 @@
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 from leahi_dialin.common.closed_loop_signals import ControllerSignals
 
-class DDDialysateCompositionClosedLoopMixing(AbstractSubSystem):
+class DDDialysateMixing(AbstractSubSystem):
     """
     DryBicart
 
@@ -137,9 +137,9 @@
         self.process_into_vars(decoder_list = msg_list,
                                message = message)
 
-        self.dd_dry_bicart_timestamp = timestamp
+        self.dd_dialysate_mixing_timestamp = timestamp
 
-    def cmd_dry_bicart_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
+    def cmd_dialysate_mixing_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart data broadcast interval override command
         Constraints:
@@ -160,7 +160,7 @@
             can_interface=self.can_interface)
 
 
-    def cmd_bicart_bicarb_dose_vol_control_override(self, bicarb_dose_vol: float, reset: int = NO_RESET) -> int:
+    def cmd_dialysate_mixing_bicarb_dose_vol_control_override(self, bicarb_dose_vol: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart bicarb dose vol override command
         Constraints:
@@ -184,7 +184,7 @@
             logger=self.logger,
             can_interface=self.can_interface)
 
-    def cmd_bicart_acid_dose_vol_control_override(self, acid_dose_vol: float, reset: int = NO_RESET) -> int:
+    def cmd_dialysate_mixing_acid_dose_vol_control_override(self, acid_dose_vol: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart acid dose vol override command
         Constraints:
@@ -208,7 +208,7 @@
             logger=self.logger,
             can_interface=self.can_interface)
 
-    def cmd_bicart_bicarb_dose_vol_control_kp_gain_coeff_override(self, bicarb_kp_coeff: float, reset: int = NO_RESET) -> int:
+    def cmd_dialysate_mixing_bicarb_dose_vol_control_kp_gain_coeff_override(self, bicarb_kp_coeff: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart bicarb kp coeff override command
         Constraints:
@@ -232,7 +232,7 @@
             logger=self.logger,
             can_interface=self.can_interface)
 
-    def cmd_bicart_bicarb_dose_vol_control_ki_gain_coeff_override(self, bicarb_ki_coeff: float, reset: int = NO_RESET) -> int:
+    def cmd_dialysate_mixing_bicarb_dose_vol_control_ki_gain_coeff_override(self, bicarb_ki_coeff: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart bicarb ki coeff override command
         Constraints:
@@ -256,7 +256,7 @@
             logger=self.logger,
             can_interface=self.can_interface)
 
-    def cmd_bicart_acid_dose_vol_control_kp_gain_coeff_override(self, acid_kp_coeff: float, reset: int = NO_RESET) -> int:
+    def cmd_dialysate_mixing_acid_dose_vol_control_kp_gain_coeff_override(self, acid_kp_coeff: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart acid kp coeff override command
         Constraints:
@@ -280,7 +280,7 @@
             logger=self.logger,
             can_interface=self.can_interface)
 
-    def cmd_bicart_acid_dose_vol_control_ki_gain_coeff_override(self, acid_ki_coeff: float, reset: int = NO_RESET) -> int:
+    def cmd_dialysate_mixing_acid_dose_vol_control_ki_gain_coeff_override(self, acid_ki_coeff: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart acid ki coeff override command
         Constraints:
@@ -304,7 +304,7 @@
             logger=self.logger,
             can_interface=self.can_interface)
 
-    def cmd_bicart_target_conductivity_override(self, conductivity: float, reset: int = NO_RESET) -> int:
+    def cmd_dialysate_mixing_target_conductivity_override(self, conductivity: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart target conductivity override command
         Constraints:
@@ -328,7 +328,7 @@
             logger=self.logger,
             can_interface=self.can_interface)
 
-    def cmd_bicart_delta_conductivity_override(self, conductivity: float, reset: int = NO_RESET) -> int:
+    def cmd_dialysate_mixing_delta_conductivity_override(self, conductivity: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart target conductivity override command
         Constraints: