Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r615da996f40180040439b2a2fba22e8f24920336
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 13d6a4fae2f910ab6e289ac9280258a94f734405)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 615da996f40180040439b2a2fba22e8f24920336)
@@ -433,6 +433,8 @@
     case Gui::GuiActionType::ID_TreatmentLogAlarmData               : ok = notify<Model::MTreatmentLogAlarmData                     >(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogAlarmData             ); break;
     case Gui::GuiActionType::ID_TreatmentLogEventData               : ok = notify<Model::MTreatmentLogEventData                     >(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogEventData             ); break;
 
+    // ----- Disinfect - States
+    case Gui::GuiActionType::ID_DisinfectStates                     : ok = notify<Model::MDisinfectStates                           >(vMessage, vData, Gui::GuiActionType::ID_DisinfectStates                   ); break;
     // ----- Disinfection - Adjust
     case Gui::GuiActionType::ID_AdjustDisinfectRsp                  : ok = notify<Model::MAdjustDisinfectResponse                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectRsp                ); break;
     case Gui::GuiActionType::ID_AdjustChemicalConfirmRsp            : ok = notify<Model::MAdjustChemicalConfirmResponse             >(vMessage, vData, Gui::GuiActionType::ID_AdjustChemicalConfirmRsp          ); break;
@@ -500,8 +502,6 @@
     case Gui::GuiActionType::ID_DisinfectDGFlushTimeData    : ok = notify<Model::MDisinfectDGFlushTime          >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGFlushTimeData      ); break;
     case Gui::GuiActionType::ID_DisinfectDGHeatTimeData     : ok = notify<Model::MDisinfectDGHeatTime           >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGHeatTimeData       ); break;
     case Gui::GuiActionType::ID_DisinfectDGChemicalTimeData : ok = notify<Model::MDisinfectDGChemicalTime       >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGChemicalTimeData   ); break;
-    // ----- Datum - Disinfect States
-    case Gui::GuiActionType::ID_DisinfectStates             : ok = notify<Model::MDisinfectStates               >(vMessage, vData, Gui::GuiActionType::ID_DisinfectStates               ); break;
 
     // DG Response Messages
     case Gui::GuiActionType::ID_AdjustVersionsDGRsp         : ok = notify<Model::MAdjustVersionsDGResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDGRsp           ); break;
Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -r42c029b1704455433cb095d2e76dcd540c1f0046 -r615da996f40180040439b2a2fba22e8f24920336
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 42c029b1704455433cb095d2e76dcd540c1f0046)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 615da996f40180040439b2a2fba22e8f24920336)
@@ -88,12 +88,11 @@
         isComplete              : vDisinfectStates.flushComplete
         completeText            : qsTr("Water Flush Complete!")
         checkListStepNames      : [
-            qsTr("Pre-Flush Drain"          ),
-            qsTr("Flush Reservoirs"         ),
-            qsTr("Drain Reservoirs"         ),
-            qsTr("Flush Recirculating Path" ),
+            qsTr("Drain Device"         ),
+            qsTr("Flush Reservoirs"     ),
+            qsTr("Drain Reservoirs"     ),
+            qsTr("Flush Recirculation"  ),
         ]
-
     }
 
     DisinfectBase { id          :  _disinfectHeat
@@ -110,13 +109,13 @@
         isComplete              : vDisinfectStates.heatComplete
         completeText            : qsTr("Heat Disinfection Complete!")
         checkListStepNames      : [
-            qsTr("Pre-Disinfect Flush"                  ),
-            qsTr("Heating Up the Fluid"                 ),
-            qsTr("Heat Disinfect Reservoir 1"           ),
-            qsTr("Heat Disinfect Transition Hot Water"  ),
-            qsTr("Heat Disinfect Reservoir 2"           ),
-            qsTr("Cooling Down"                         ),
-            qsTr("Post-Disinfect Flush"                 ),
+            qsTr("Flush Before Disinfect"   ),
+            qsTr("Heat Up Water"            ),
+            qsTr("Disinfect Reservoir 1"    ),
+            qsTr("Transition Hot Water"     ),
+            qsTr("Disinfect Reservoir 2"    ),
+            qsTr("Cool Down Device"         ),
+            qsTr("Flush After Disinfect"    ),
         ]
     }
 
@@ -143,11 +142,11 @@
         isComplete              : vDisinfectStates.chemicalComplete
         completeText            : qsTr("Chemical Disinfection Complete!")
         checkListStepNames      : [
-            qsTr("Pre-Disinfect Flush"  ),
-            qsTr("Mix Water And Acid"   ),
-            qsTr("Remove Acid"          ),
-            qsTr("Chemical Disinfect"   ),
-            qsTr("Post-Disinfect Flush" ),
+            qsTr("Flush Before Disinfect"   ),
+            qsTr("Mix water And Acid"       ),
+            qsTr("Remove Acid"              ),
+            qsTr("Disinfect Device"         ),
+            qsTr("Flush After Disinfect"    ),
         ]
     }
 
Index: sources/model/dg/data/disinfect/MDisinfectStatesData.h
===================================================================
diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -r615da996f40180040439b2a2fba22e8f24920336
--- sources/model/dg/data/disinfect/MDisinfectStatesData.h	(.../MDisinfectStatesData.h)	(revision e125bd5cf13750eaf241d518b9c846139afaa81c)
+++ sources/model/dg/data/disinfect/MDisinfectStatesData.h	(.../MDisinfectStatesData.h)	(revision 615da996f40180040439b2a2fba22e8f24920336)
@@ -33,7 +33,7 @@
  *
  * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description |
  * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:|
- * |0x7E00| 0x080  | 1 Hz   | N   | DG  | All | Disinfection States Data |
+ * |0x7E00| 0x040  | 1 Hz   | N   | HD  | All | Disinfection States Data |
  *
  * | Payload  ||
  * |          ||