Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp
===================================================================
diff -u -r0bb5f08eb3570de6bff3ce67ca502db129b59096 -rc66898d4ac69b72f1b9cc59e3039e7d9a1e59154
--- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision 0bb5f08eb3570de6bff3ce67ca502db129b59096)
+++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision c66898d4ac69b72f1b9cc59e3039e7d9a1e59154)
@@ -75,7 +75,7 @@
 
 
     // Consumable and cartridge installation state
-    bool mInstallation                              = vData.mSubMode                    == GuiPreTreatmentStates                    ::TD_PRE_TREATMENT_CART_INSTALL_STATE                ;
+    bool mInstallation                              = vData.mSubMode                    == GuiPreTreatmentStates                    ::TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE         ;
     if ( mInstallation ) {
           // There is not state(enum) for this and it is always 0 for now. but will be used to notify UI about being in this state.
           installation_start                        ( vData.mInstallationState          == 0 /* There is no other state and it is always 0 for now */                                   );
@@ -86,25 +86,25 @@
     // Self tests dry state
     bool mSelfTestDry                               = vData.mSubMode                    == GuiPreTreatmentStates                    ::TD_PRE_TREATMENT_SELF_TEST_DRY_STATE                   ;
     if ( mSelfTestDry ) {
-        selfTestDry_start                           ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_START_STATE                            );
-        selfTestDry_waitDoorClose                   ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE              );
-        selfTestDry_usedTubeSetCheck                ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE              );
-        selfTestDry_tubeSetLoadedCheck              ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE            );
-        selfTestDry_tubeSetAuthentication           ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE          );
-        selfTestDry_syringePumpSeek                 ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE                );
-        selfTestDry_pressureSensorNormalSetup       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE     );
-        selfTestDry_pressureSensorVenousSetup       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE            );
-        selfTestDry_venousPressureStabilization     ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE    );
-        selfTestDry_venousPressureLeakCheck         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE       );
-        selfTestDry_venousPressureRelief            ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE           );
-        selfTestDry_pressureArterialSetup           ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE          );
-        selfTestDry_arterialPressureStabilization   ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE  );
-        selfTestDry_arterialPressureLeakCheck       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE     );
-        selfTestDry_arterialPressureRelief          ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE         );
-        selfTestDry_syringePump                     ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE               );
-        selfTestDry_syringePumpOcclusionCheck       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE     );
-        selfTestDry_complete                        ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_COMPLETE_STATE                         );
-        selfTestDry_stopped                         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_STOPPED_STATE                          );
+          selfTestDry_start                           ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_START_STATE                            );
+          selfTestDry_waitDoorClose                   ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE              );
+          selfTestDry_usedTubeSetCheck                ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE              );
+          selfTestDry_tubeSetLoadedCheck              ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE            );
+          selfTestDry_tubeSetAuthentication           ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE          );
+          selfTestDry_syringePumpSeek                 ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE                );
+          selfTestDry_pressureSensorNormalSetup       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE     );
+          selfTestDry_pressureSensorVenousSetup       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE            );
+          selfTestDry_venousPressureStabilization     ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE    );
+          selfTestDry_venousPressureLeakCheck         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE       );
+          selfTestDry_venousPressureRelief            ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE           );
+          selfTestDry_pressureArterialSetup           ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE          );
+          selfTestDry_arterialPressureStabilization   ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE  );
+          selfTestDry_arterialPressureLeakCheck       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE     );
+          selfTestDry_arterialPressureRelief          ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE         );
+          selfTestDry_syringePump                     ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE               );
+          selfTestDry_syringePumpOcclusionCheck       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE     );
+          selfTestDry_complete                        ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_COMPLETE_STATE                         );
+          selfTestDry_stopped                         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_STOPPED_STATE                          );
     }
     selfTestDry(mSelfTestDry); // it's the main even so moved last to have all the sub-states updated prior to.