Index: TD_OpMode/interface.ui
===================================================================
diff -u -r9b2ba9f2fcc1e0e872c1856c5654c797be8f29b3 -rc81cc70c3e01faf81396c4c891509471eb4fffb5
--- TD_OpMode/interface.ui	(.../interface.ui)	(revision 9b2ba9f2fcc1e0e872c1856c5654c797be8f29b3)
+++ TD_OpMode/interface.ui	(.../interface.ui)	(revision c81cc70c3e01faf81396c4c891509471eb4fffb5)
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>746</width>
+    <width>1026</width>
     <height>337</height>
    </rect>
   </property>
@@ -266,7 +266,7 @@
         <bool>false</bool>
        </property>
        <property name="rowCount">
-        <number>12</number>
+        <number>6</number>
        </property>
        <property name="columnCount">
         <number>2</number>
@@ -319,36 +319,6 @@
          <string>5</string>
         </property>
        </row>
-       <row>
-        <property name="text">
-         <string>6</string>
-        </property>
-       </row>
-       <row>
-        <property name="text">
-         <string>7</string>
-        </property>
-       </row>
-       <row>
-        <property name="text">
-         <string>8</string>
-        </property>
-       </row>
-       <row>
-        <property name="text">
-         <string>9</string>
-        </property>
-       </row>
-       <row>
-        <property name="text">
-         <string>10</string>
-        </property>
-       </row>
-       <row>
-        <property name="text">
-         <string>11</string>
-        </property>
-       </row>
        <column>
         <property name="text">
          <string>1 : SubMode</string>
@@ -366,7 +336,7 @@
        </item>
        <item row="0" column="1">
         <property name="text">
-         <string>Start standby</string>
+         <string>Start standby (home actuators).</string>
         </property>
        </item>
        <item row="1" column="0">
@@ -376,7 +346,7 @@
        </item>
        <item row="1" column="1">
         <property name="text">
-         <string>Wait for treatment</string>
+         <string>Wait for treatment.</string>
         </property>
        </item>
        <item row="2" column="0">
@@ -386,99 +356,39 @@
        </item>
        <item row="2" column="1">
         <property name="text">
-         <string>Wait for disinfection</string>
+         <string>Wait for UI to send disinfect option.</string>
         </property>
        </item>
        <item row="3" column="0">
         <property name="text">
-         <string>STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE</string>
+         <string>STANDBY_WAIT_FOR_DD_CLEANING_MODE_CMD_RESPONSE_STATE</string>
         </property>
        </item>
        <item row="3" column="1">
         <property name="text">
-         <string>Wait for DG flush command response.</string>
+         <string>Wait for DD cleaning mode command response state.</string>
         </property>
        </item>
        <item row="4" column="0">
         <property name="text">
-         <string>STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE</string>
+         <string>STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE</string>
         </property>
        </item>
        <item row="4" column="1">
         <property name="text">
-         <string>Wait for DG flush to start.</string>
+         <string>Wait for DD cleaning mode to start state.</string>
         </property>
        </item>
        <item row="5" column="0">
         <property name="text">
-         <string>STANDBY_DG_FLUSH_IN_PROGRESS_STATE</string>
+         <string>STANDBY_CLEANING_MODE_IN_PROGRESS_STATE</string>
         </property>
        </item>
        <item row="5" column="1">
         <property name="text">
-         <string>DG flush operation is in progress</string>
+         <string>Cleaning mode in progress state.</string>
         </property>
        </item>
-       <item row="6" column="0">
-        <property name="text">
-         <string>STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE</string>
-        </property>
-       </item>
-       <item row="6" column="1">
-        <property name="text">
-         <string>Wait for DG heat disinfect command response.</string>
-        </property>
-       </item>
-       <item row="7" column="0">
-        <property name="text">
-         <string>STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE</string>
-        </property>
-       </item>
-       <item row="7" column="1">
-        <property name="text">
-         <string>Wait for DG heat disinfect to start.</string>
-        </property>
-       </item>
-       <item row="8" column="0">
-        <property name="text">
-         <string>STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE</string>
-        </property>
-       </item>
-       <item row="8" column="1">
-        <property name="text">
-         <string>DG heat disinfect operation is in progress.</string>
-        </property>
-       </item>
-       <item row="9" column="0">
-        <property name="text">
-         <string>STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE</string>
-        </property>
-       </item>
-       <item row="9" column="1">
-        <property name="text">
-         <string>Wait for DG chemical disinfect command response.</string>
-        </property>
-       </item>
-       <item row="10" column="0">
-        <property name="text">
-         <string>STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE</string>
-        </property>
-       </item>
-       <item row="10" column="1">
-        <property name="text">
-         <string>Wait for DG chemical disinfect to start.</string>
-        </property>
-       </item>
-       <item row="11" column="0">
-        <property name="text">
-         <string>STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE</string>
-        </property>
-       </item>
-       <item row="11" column="1">
-        <property name="text">
-         <string>DG chemical disinfect operation is in progress</string>
-        </property>
-       </item>
       </widget>
      </item>
     </layout>
Index: TD_OpMode/loader.py
===================================================================
diff -u -r50bfbaff06702626e86b0d27b2d7531d013e7828 -rc81cc70c3e01faf81396c4c891509471eb4fffb5
--- TD_OpMode/loader.py	(.../loader.py)	(revision 50bfbaff06702626e86b0d27b2d7531d013e7828)
+++ TD_OpMode/loader.py	(.../loader.py)	(revision c81cc70c3e01faf81396c4c891509471eb4fffb5)
@@ -12,11 +12,11 @@
 from engine.dynamicloader   import DynamicLoader
 
 # plugin specific
-from dialin.common.td_defs  import TDOpModes
-from dialin.common.td_defs  import TDStandbyStates
+from leahi_dialin.common.td_defs  import TDOpModes
+from leahi_dialin.common.td_defs  import TDStandbyStates
 
 # hd Simulator
-from dialin.ui.td_messaging import TD_Messaging
+from leahi_dialin.ui.td_messaging import TD_Messaging
 
 
 class Loader(DynamicLoader):