Index: sources/ApplicationController.cpp
===================================================================
diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r2bef7b8a25a76a4597aa833955c57fd1c4884de7
--- sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision ccba568494c6b7214116f818a0ac89d0fa3ba81b)
+++ sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7)
@@ -240,11 +240,11 @@
 /*!
  * \brief   ApplicationController::onMainTimerTimeout
  * \details This slot is called by MainTimer::didTimeout each second
- *          to call required methods like keepAlive
+ *          to call required methods like checkIn
  */
 void ApplicationController::onMainTimerTimeout()
 {
-    keepAlive();
+    checkIn();
 }
 
 /*!
@@ -364,11 +364,11 @@
 // disabled coco end
 
 /*!
- * \brief   ApplicationController::keepAlive
+ * \brief   ApplicationController::checkIn
  * \details This is the message which has to be send over the CANBus
  *          as an monitor for other nodes on the bus to notify UI is alive
  */
-void ApplicationController::keepAlive()
+void ApplicationController::checkIn()
 {
     // DEBUG: return;
 #ifndef DISABLE_KEEP_ALIVE
@@ -389,7 +389,7 @@
     else {
         mData += static_cast<quint8>(GuiActionData::NoData);
     }
-    onActionTransmit(GuiActionType::ID_KeepAlive, mData);
+    onActionTransmit(GuiActionType::ID_TDCheckIn, mData);
 #endif
 }
 
@@ -549,7 +549,7 @@
     _post.isDone( ! _settingsError );
     if (            _settingsError )  {
         LOG_APPED_PO(QString("Settings read failed"));
-        alarmTrigger(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_SETTINGS_BAD);
+        alarmTrigger(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SETTINGS_BAD);
     } else {
         _Settings.datetimeFormat();
     }
@@ -731,7 +731,7 @@
     if ( ! vPass ) {
         _post.isDone(vPass);
         LOG_APPED_PO(QString("Configuration partition encryption failed."));
-        alarmTrigger(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_SETTINGS_BAD);
+        alarmTrigger(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SETTINGS_BAD);
     }
     // if ( vPass ) // it needs more investigation
     initSettings();
@@ -744,7 +744,7 @@
 void ApplicationController::onLogIOFail()
 {
     //DEBUG qDebug()<<"SENDING " << Gui::GuiAlarmID::ALARM_ID_HD_UI_SDCARD_FAILURE;
-    alarmTrigger(Gui::GuiAlarmID::ALARM_ID_HD_UI_SDCARD_FAILURE, true, true); // send, single, this happens after POST.
+    alarmTrigger(Gui::GuiAlarmID::ALARM_ID_TD_UI_EVNT_FAILURE_SDCARD, true, true); // send, single, this happens after POST.
 }
 
 /*!
@@ -757,12 +757,12 @@
     if ( ! vPass ) {
         _post.isDone(vPass);
         LOG_APPED_PO(QString("Configuration treatment ranges failed."));
-        alarmTrigger(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_SETTINGS_BAD);
+        alarmTrigger(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SETTINGS_BAD);
     }
 
     // HD POST
     // UI is done, let HD start the communication [ UI Check-in is the HD commjunication listener starter ]
-    keepAlive();
+    checkIn();
     emit didKeepAliveBegin  ();
     alarmTrigger            (Gui::GuiAlarmID::ALARM_ID_NO_ALARM, true);     // send queued fails
     postDoneRequest         ();                                             // send HD the POST result