1 files changed, 5 insertions, 6 deletions
diff --git a/src/components/application_manager/include/application_manager/request_controller.h b/src/components/application_manager/include/application_manager/request_controller.h
index 3dca8c303b..6de5253ac0 100644
--- a/src/components/application_manager/include/application_manager/request_controller.h
+++ b/src/components/application_manager/include/application_manager/request_controller.h
@@ -213,15 +213,14 @@ class RequestController {
 
  protected:
   /**
-  * @brief Timer Callback
+  * @brief Timer callback which handles all request timeouts
   */
-  void onTimer();
+  void TimeoutThread();
 
   /**
-  * @brief Update timout for next OnTimer
-  * Not thread safe
+  * @brief Signal timer condition variable
   */
-  void UpdateTimer();
+  void NotifyTimer();
 
   void terminateWaitingForExecutionAppRequests(const uint32_t& app_id);
   void terminateWaitingForResponseAppRequests(const uint32_t& app_id);
@@ -284,7 +283,7 @@ class RequestController {
   /*
    * Timer for lock
    */
-  volatile bool timer_stop_flag_;
+  bool timer_stop_flag_;
   sync_primitives::Lock timer_lock;
   sync_primitives::ConditionalVariable timer_condition_;