Index: sources/cloudsync/CloudSyncController.cpp
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r1a614320ec16b956d14c644ac2e90833f5cbdbcf
--- sources/cloudsync/CloudSyncController.cpp	(.../CloudSyncController.cpp)	(revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/cloudsync/CloudSyncController.cpp	(.../CloudSyncController.cpp)	(revision 1a614320ec16b956d14c644ac2e90833f5cbdbcf)
@@ -134,8 +134,8 @@
     _thread = &vThread;
     _thread->setObjectName(QString("%1_Thread").arg(metaObject()->className()));
     connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(quit()));
-    _thread->start();
     moveToThread(_thread);
+    _thread->start();
 }
 
 /*!
@@ -763,7 +763,7 @@
     // Same parameters will be sent for these messages for now, so data is not changed.
 
     switch (vAction) {
-    case GuiActionType::ID_HDOperationModeData  : {
+    case GuiActionType::ID_TDOpModeData  : {
         // ----------------------------------------------------------------------------------------
         // DEBUG : disable the HD HW message on the device on CloudSync integration testing.
         // currently it is always on fault and resets CloudSync inp log
@@ -782,8 +782,8 @@
     }
     break;
 
-    case GuiActionType::ID_AdjustSerialHDRsp    :
-    case GuiActionType::ID_AdjustSerialDGRsp    :
+    case GuiActionType::ID_AdjustSerialTDRsp    :
+    case GuiActionType::ID_AdjustSerialDDRsp    :
         // this message is not complete in one step and saves only the received info and waits for the other if complete will send.
         saveDeviceInfo(vAction, vData);
     break;
@@ -1237,14 +1237,14 @@
     // if both values received
     initDeviceInfoWait();
 
-    if ( vAction == GuiActionType::ID_AdjustSerialHDRsp ) {
+    if ( vAction == GuiActionType::ID_AdjustSerialTDRsp ) {
         if ( vData.count() ) {
             _deviceInfoHD = vData[eDeviceInfo_Ix].toString();
         } else {
             _deviceInfoHD = "";
         }
     }
-    if ( vAction == GuiActionType::ID_AdjustSerialDGRsp ) {
+    if ( vAction == GuiActionType::ID_AdjustSerialDDRsp ) {
         if ( vData.count() ) {
             _deviceInfoDG = vData[eDeviceInfo_Ix].toString();
         } else {