Fix some sdl commands

156 files changed, 156 insertions, 156 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h
index 6aa28246f7..605ae94a56 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief ActivateAppResponse command class
  **/
-class ActivateAppResponse : public ResponseFromHMI {
+class ActivateAppResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief ActivateAppResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h
index b0adc0378c..9a1b851a7c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief AddStatisticsInfoNotification command class
  **/
-class AddStatisticsInfoNotification : public NotificationFromHMI {
+class AddStatisticsInfoNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief AddStatisticsInfoNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h
index 60aea5ab57..2f6ce7a1b0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief AllowAllAppsResponse command class
  **/
-class AllowAllAppsResponse : public ResponseFromHMI {
+class AllowAllAppsResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief AllowAllAppsResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h
index 41815662ed..06b750381c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief AllowAppResponse command class
  **/
-class AllowAppResponse : public ResponseFromHMI {
+class AllowAppResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief AllowAppResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h
index 6b8e7087fd..5652b81687 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnAwakeSDLNotification command class
  **/
-class OnAwakeSDLNotification : public NotificationFromHMI {
+class OnAwakeSDLNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnAwakeSDLNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h
index a8b2b568f8..c214dc074a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief BasicCommunicationSystemResponse command class
  **/
-class BasicCommunicationSystemResponse : public ResponseFromHMI {
+class BasicCommunicationSystemResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief BasicCommunicationSystemResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h
index 0ec9f8cb69..c09d1e4f62 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief ButtonGetCapabilitiesResponse command class
  **/
-class ButtonGetCapabilitiesResponse : public ResponseFromHMI {
+class ButtonGetCapabilitiesResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief ButtonGetCapabilitiesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h
index d07b76a62e..da76b0c633 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief ClosePopupResponse command class
  **/
-class ClosePopupResponse : public ResponseFromHMI {
+class ClosePopupResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief ClosePopupResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h
index 40a7c06c9b..900dbadaf1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief DecryptCertificateResponse command class
  **/
-class DecryptCertificateResponse : public ResponseFromHMI {
+class DecryptCertificateResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief DecryptCertificateResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h
index 3c50e34b53..aeffd01e0b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h
@@ -45,7 +45,7 @@ namespace hmi {
 /**
  * @brief DialNumberResponse command class
  **/
-class DialNumberResponse : public ResponseFromHMI {
+class DialNumberResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief DialNumberResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h
index 3c54b50767..b821a2bc2a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h
@@ -50,7 +50,7 @@ struct SystemInfo {
 /**
  * @brief GetSystemInfoResponse command class
  **/
-class GetSystemInfoResponse : public ResponseFromHMI {
+class GetSystemInfoResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief GetSystemInfoResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h
index 795eb7ccb8..fbccfca0dd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h
@@ -39,7 +39,7 @@ namespace sdl_rpc_plugin {
 namespace app_mngr = application_manager;
 namespace commands {
 
-class GetUrlsResponse : public ResponseToHMI {
+class GetUrlsResponse : public app_mngr::commands::ResponseToHMI {
  public:
   /**
    * @brief GetUrlsResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h
index cdec8fb2c7..996fd6751f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief MixingAudioSupportedResponse command class
  **/
-class MixingAudioSupportedResponse : public ResponseFromHMI {
+class MixingAudioSupportedResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief MixingAudioSupportedResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h
index 293051dd4a..222faa73ee 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief NaviAlertManeuverResponse command class
  **/
-class NaviAlertManeuverResponse : public ResponseFromHMI {
+class NaviAlertManeuverResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviAlertManeuverResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h
index a8504f4aac..5de431323e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h
@@ -42,7 +42,7 @@ namespace commands {
 /**
  * @brief AudioStartStreamResponse command class
  **/
-class AudioStartStreamResponse : public ResponseFromHMI {
+class AudioStartStreamResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief AudioStartStreamResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h
index c2fbc2407a..ecb935dca6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h
@@ -42,7 +42,7 @@ namespace commands {
 /**
  * @brief NaviStopStreamResponse command class
  **/
-class AudioStopStreamResponse : public ResponseFromHMI {
+class AudioStopStreamResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief AudioStopStreamResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h
index 2704fb091a..e535c29b20 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief NaviGetWaypoints command class
  **/
-class NaviGetWayPointsResponse : public ResponseFromHMI {
+class NaviGetWayPointsResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviGetWaypoints class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h
index 7f7e8e6038..794da61603 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief NaviIsReadyResponse command class
  **/
-class NaviIsReadyResponse : public ResponseFromHMI {
+class NaviIsReadyResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviIsReadyResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h
index f471f4869c..15a700ad9a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief NaviSendLocationResponse command class
  */
-class NaviSendLocationResponse : public ResponseFromHMI {
+class NaviSendLocationResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviSendLocationResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h
index c45aa28da5..33ab02df7b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief NaviSetVideoConfigResponse command class
  **/
-class NaviSetVideoConfigResponse : public ResponseFromHMI {
+class NaviSetVideoConfigResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviSetVideoConfigResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h
index c5bbcf2629..063133c1f4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief NaviShowConstantTBTResponse command class
  **/
-class NaviShowConstantTBTResponse : public ResponseFromHMI {
+class NaviShowConstantTBTResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviShowConstantTBTResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h
index 3b8a6cc196..3c76f5a33e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h
@@ -42,7 +42,7 @@ namespace commands {
 /**
  * @brief NaviStartStreamResponse command class
  **/
-class NaviStartStreamResponse : public ResponseFromHMI {
+class NaviStartStreamResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviStartStreamResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h
index 63841e663a..bd2958f550 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h
@@ -42,7 +42,7 @@ namespace commands {
 /**
  * @brief NaviStopStreamResponse command class
  **/
-class NaviStopStreamResponse : public ResponseFromHMI {
+class NaviStopStreamResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviStopStreamResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h
index c9e79c2ef6..4a1bd37818 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief NaviSubscribeWaypoints command class
  **/
-class NaviSubscribeWayPointsResponse : public ResponseFromHMI {
+class NaviSubscribeWayPointsResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviSubscribeWaypoints class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h
index 9f695bbf5d..b66d6d7648 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief NaviUnSubscribeWaypoints command class
  **/
-class NaviUnsubscribeWayPointsResponse : public ResponseFromHMI {
+class NaviUnsubscribeWayPointsResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviUnSubscribeWaypoints class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h
index 846a676d34..4b3b387704 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief NaviUpdateTurnListResponse command class
  **/
-class NaviUpdateTurnListResponse : public ResponseFromHMI {
+class NaviUpdateTurnListResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviUpdateTurnListResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h
index 141f16b572..3101132b07 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnAllowSDLFunctionalityNotification command class
  **/
-class OnAllowSDLFunctionalityNotification : public NotificationFromHMI {
+class OnAllowSDLFunctionalityNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnAllowSDLFunctionalityNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h
index 31073100ea..6beae61347 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnAppActivatedNotification command class
  **/
-class OnAppActivatedNotification : public NotificationFromHMI {
+class OnAppActivatedNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnAppActivatedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h
index 7b6f613737..eb4ca07ceb 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnAppDeactivatedNotification command class
  **/
-class OnAppDeactivatedNotification : public NotificationFromHMI {
+class OnAppDeactivatedNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnAppDeactivatedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h
index 73abaf29a9..f680596479 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnAppPermissionChangedNotification command class
  **/
-class OnAppPermissionChangedNotification : public NotificationToHMI {
+class OnAppPermissionChangedNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnAppPermissionChangedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h
index 95df5043b1..ec4432c9a4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnAppPermissionConsentNotification command class
  **/
-class OnAppPermissionConsentNotification : public NotificationFromHMI {
+class OnAppPermissionConsentNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnAppPermissionConsentNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h
index 7315f3ecf7..6d719212a7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnAppRegisteredNotification command class
  **/
-class OnAppRegisteredNotification : public NotificationToHMI {
+class OnAppRegisteredNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnAppRegisteredNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h
index 956ac6852d..deeb9d1c37 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnAppUnregisteredNotification command class
  **/
-class OnAppUnregisteredNotification : public NotificationToHMI {
+class OnAppUnregisteredNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnAppUnregisteredNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h
index e2c3288f70..3a1873b180 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnAudioDataStreamingNotification command class
  **/
-class OnAudioDataStreamingNotification : public NotificationToHMI {
+class OnAudioDataStreamingNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnAudioDataStreamingNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h
index 109f61a4ce..49104fe045 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h
@@ -47,7 +47,7 @@ namespace hmi {
 /**
  * @brief OnButtonEventNotification command class
  **/
-class OnButtonEventNotification : public NotificationFromHMI {
+class OnButtonEventNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnButtonEventNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h
index faacf79fcf..2b70ec11bf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h
@@ -47,7 +47,7 @@ namespace hmi {
 /**
  * @brief OnButtonPressNotification command class
  **/
-class OnButtonPressNotification : public NotificationFromHMI {
+class OnButtonPressNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnButtonPressNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h
index c7179d36d8..b17bc65c0f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h
@@ -45,7 +45,7 @@ namespace hmi {
 /**
  * @brief OnButtonSubscriptionNotification command class
  **/
-class OnButtonSubscriptionNotification : public NotificationToHMI {
+class OnButtonSubscriptionNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnButtonSubscriptionNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h
index 0cd99f83f2..50ca88f354 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnDeviceChosenNotification command class
  **/
-class OnDeviceChosenNotification : public NotificationFromHMI {
+class OnDeviceChosenNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnDeviceChosenNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h
index 70687305b1..36672580fa 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnDeviceStateChangedNotification command class
  **/
-class OnDeviceStateChangedNotification : public NotificationFromHMI {
+class OnDeviceStateChangedNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnDeviceStateChangedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h
index f57d7a186e..dc2a601e91 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h
@@ -47,7 +47,7 @@ namespace hmi {
 /**
  * @brief OnDriverDistractionNotification command class
  **/
-class OnDriverDistractionNotification : public NotificationFromHMI {
+class OnDriverDistractionNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnDriverDistractionNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h
index 1cabebaae8..cdf05b7472 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnEventChangedNotification command class
  **/
-class OnEventChangedNotification : public NotificationFromHMI {
+class OnEventChangedNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnEventChangedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h
index f4d4518445..00a37ecd9a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnExitAllApplicationsNotification command class
  **/
-class OnExitAllApplicationsNotification : public NotificationFromHMI {
+class OnExitAllApplicationsNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnExitAllApplicationsNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h
index 4e171be0b1..edc924b1d0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnExitApplicationNotification command class
  **/
-class OnExitApplicationNotification : public NotificationFromHMI {
+class OnExitApplicationNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnExitApplicationNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h
index 3201c9d0c2..f566fb8de0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnFileRemovedNotification command class
  **/
-class OnFileRemovedNotification : public NotificationToHMI {
+class OnFileRemovedNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnFileRemovedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h
index faa935f98b..ce03217787 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnFindApplications command class
  **/
-class OnFindApplications : public NotificationFromHMI {
+class OnFindApplications : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnFindApplications class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h
index 92ee65cfea..dabbf05ecb 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnIgnitionCycleOverNotification command class
  **/
-class OnIgnitionCycleOverNotification : public NotificationFromHMI {
+class OnIgnitionCycleOverNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnIgnitionCycleOverNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h
index 078325ce4b..0e3f0d99fd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnNaviTBTClientStateNotification command class
  **/
-class OnNaviTBTClientStateNotification : public NotificationFromHMI {
+class OnNaviTBTClientStateNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnNaviTBTClientStateNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h
index 193437d591..9cc3e3eecc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnNaviWayPointChangeNotification command class
  **/
-class OnNaviWayPointChangeNotification : public NotificationFromHMI {
+class OnNaviWayPointChangeNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnNaviWayPointChangeNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h
index 3a7cf5f119..5e4233ed05 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h
@@ -39,7 +39,7 @@ namespace sdl_rpc_plugin {
 namespace app_mngr = application_manager;
 namespace commands {
 
-class OnPolicyUpdate : public NotificationFromHMI {
+class OnPolicyUpdate : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnPolicyUpdate class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h
index 2cb76ddc07..5d0201bf29 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnPutFileNotification command class
  **/
-class OnPutFileNotification : public NotificationToHMI {
+class OnPutFileNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnPutFileNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h
index c017067383..f076d0f9d8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnReadyNotification command class
  **/
-class OnReadyNotification : public NotificationFromHMI {
+class OnReadyNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnReadyNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h
index 23351a60f2..75de51aabe 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h
@@ -40,7 +40,7 @@ namespace app_mngr = application_manager;
 
 namespace commands {
 
-class OnReceivedPolicyUpdate : public NotificationFromHMI {
+class OnReceivedPolicyUpdate : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
      * @brief OnReceivedPolicyUpdate class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h
index 37e393eb6c..e73506f749 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnRecordStartdNotification command class
  **/
-class OnRecordStartdNotification : public NotificationToHMI {
+class OnRecordStartdNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnRecordStartdNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h
index be52696906..d737a6b6bd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnResumeAudioSourceNotification command class
  **/
-class OnResumeAudioSourceNotification : public NotificationToHMI {
+class OnResumeAudioSourceNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnResumeAudioSourceNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h
index a4865cb388..b1ea473b35 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnSDLCloseNotification command class
  **/
-class OnSDLCloseNotification : public NotificationToHMI {
+class OnSDLCloseNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnSDLCloseNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h
index 00524f59ab..2bb1006928 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnSDLConsentNeededNotification command class
  **/
-class OnSDLConsentNeededNotification : public NotificationToHMI {
+class OnSDLConsentNeededNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnSDLConsentNeededNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h
index 14b01b4d36..00b755a1e5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnSDLPersistenceCompleteNotification command class
  **/
-class OnSDLPersistenceCompleteNotification : public NotificationToHMI {
+class OnSDLPersistenceCompleteNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnSDLPersistenceCompleteNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h
index 1b49220580..399adc9f85 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnStartDeviceDiscovery command class
  **/
-class OnStartDeviceDiscovery : public NotificationFromHMI {
+class OnStartDeviceDiscovery : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnStartDeviceDiscovery class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h
index 97eba347bd..1cf5e623a0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnGetStatusUpdateNotification command class
  **/
-class OnStatusUpdateNotification : public NotificationToHMI {
+class OnStatusUpdateNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnGetStatusUpdateNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h
index 3e01cc2d3d..e2f128d94f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h
@@ -45,7 +45,7 @@ namespace mobile_api = mobile_apis;
 /**
  * @brief OnSystemContextNotification command class
  **/
-class OnSystemContextNotification : public NotificationFromHMI {
+class OnSystemContextNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnSystemContextNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h
index 4935e711f3..2484516e69 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnSystemErrorNotification command class
  **/
-class OnSystemErrorNotification : public NotificationFromHMI {
+class OnSystemErrorNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnSystemErrorNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h
index afba2f5ac9..cc0c8098f9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnSystemInfoChangedNotification command class
  **/
-class OnSystemInfoChangedNotification : public NotificationFromHMI {
+class OnSystemInfoChangedNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnSystemInfoChangedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h
index d6599219a9..eb72031878 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnSystemRequestNotification command class
  **/
-class OnSystemRequestNotification : public NotificationFromHMI {
+class OnSystemRequestNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnSystemRequestNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h
index e8343b2d78..f3bd9485a5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnTTSLanguageChangeNotification command class
  **/
-class OnTTSLanguageChangeNotification : public NotificationFromHMI {
+class OnTTSLanguageChangeNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnTTSLanguageChangeNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h
index 43b81590eb..c90c3b53c1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h
@@ -45,7 +45,7 @@ namespace hmi {
 /**
  * @brief OnTTSResetTimeoutNotification command class
  **/
-class OnTTSResetTimeoutNotification : public NotificationFromHMI {
+class OnTTSResetTimeoutNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnTTSResetTimeoutNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h
index e3628cc560..2d76e77e38 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnTTSStartedNotification command class
  **/
-class OnTTSStartedNotification : public NotificationFromHMI {
+class OnTTSStartedNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnTTSStartedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h
index 956f8a5298..56c5f6f35b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnTTSStoppedNotification command class
  **/
-class OnTTSStoppedNotification : public NotificationFromHMI {
+class OnTTSStoppedNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnTTSStoppedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h
index 311ad6e981..1dcbf027b7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnUICommandNotification command class
  **/
-class OnUICommandNotification : public NotificationFromHMI {
+class OnUICommandNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnUICommandNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h
index a8c925fbc2..b47d2c364a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h
@@ -46,7 +46,7 @@ namespace hmi {
 /**
  * @brief OnUIKeyBoardInputNotification command class
  **/
-class OnUIKeyBoardInputNotification : public NotificationFromHMI {
+class OnUIKeyBoardInputNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnUIKeyBoardInputNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h
index 2879010940..16371691fb 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnUILanguageChangeNotification command class
  **/
-class OnUILanguageChangeNotification : public NotificationFromHMI {
+class OnUILanguageChangeNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnUILanguageChangeNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h
index ed3f85869e..b2ca4d4c02 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h
@@ -45,7 +45,7 @@ namespace hmi {
 /**
  * @brief OnUIResetTimeoutNotification command class
  **/
-class OnUIResetTimeoutNotification : public NotificationFromHMI {
+class OnUIResetTimeoutNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnUIResetTimeoutNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h
index 6a31b79c10..f8c323c8ef 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h
@@ -46,7 +46,7 @@ namespace hmi {
 /**
  * @brief OnUITouchEventNotification command class
  **/
-class OnUITouchEventNotification : public NotificationFromHMI {
+class OnUITouchEventNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnUITouchEventNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h
index a0f23f0923..5a872b8d3c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnUpdateDeviceList command class
  **/
-class OnUpdateDeviceList : public NotificationFromHMI {
+class OnUpdateDeviceList : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnUpdateDeviceList class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h
index d510afd822..c232838eb8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIAccPedalPositionNotification command class
  **/
-class OnVIAccPedalPositionNotification : public NotificationFromHMI {
+class OnVIAccPedalPositionNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIAccPedalPositionNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h
index 740b614bdb..03b83184cc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIBeltStatusNotification command class
  **/
-class OnVIBeltStatusNotification : public NotificationFromHMI {
+class OnVIBeltStatusNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIBeltStatusNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h
index 88d2efb0c8..4530266ea8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIBodyInformationNotification command class
  **/
-class OnVIBodyInformationNotification : public NotificationFromHMI {
+class OnVIBodyInformationNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIBodyInformationNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h
index ac5128ff34..378b5bf6c2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIDeviceStatusNotification command class
  **/
-class OnVIDeviceStatusNotification : public NotificationFromHMI {
+class OnVIDeviceStatusNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIDeviceStatusNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h
index 7fa83cdffb..449e6da414 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIDriverBrakingNotification command class
  **/
-class OnVIDriverBrakingNotification : public NotificationFromHMI {
+class OnVIDriverBrakingNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIDriverBrakingNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h
index 2128c21f3a..5274a8406d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIEngineTorqueNotification command class
  **/
-class OnVIEngineTorqueNotification : public NotificationFromHMI {
+class OnVIEngineTorqueNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIEngineTorqueNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h
index 74ac0377e5..4d573afc9a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIExternalTemperatureNotification command class
  **/
-class OnVIExternalTemperatureNotification : public NotificationFromHMI {
+class OnVIExternalTemperatureNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIExternalTemperatureNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h
index dd47f9f694..7ed0a90e1e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIFuelLevelNotification command class
  **/
-class OnVIFuelLevelNotification : public NotificationFromHMI {
+class OnVIFuelLevelNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIFuelLevelNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h
index 73ee912464..44e5aaff16 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIFuelLevelStateNotification command class
  **/
-class OnVIFuelLevelStateNotification : public NotificationFromHMI {
+class OnVIFuelLevelStateNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIFuelLevelStateNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h
index feba6c30fd..a3de9f9ed1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIGpsDataNotification command class
  **/
-class OnVIGpsDataNotification : public NotificationFromHMI {
+class OnVIGpsDataNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIGpsDataNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h
index 2f397cc14b..7fc5d3d209 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIHeadLampStatusNotification command class
  **/
-class OnVIHeadLampStatusNotification : public NotificationFromHMI {
+class OnVIHeadLampStatusNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIHeadLampStatusNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h
index ba5e805b34..facab07ed3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIInstantFuelConsumptionNotification command class
  **/
-class OnVIInstantFuelConsumptionNotification : public NotificationFromHMI {
+class OnVIInstantFuelConsumptionNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIInstantFuelConsumptionNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h
index 81498ac925..9b954165fc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIMyKeyNotification command class
  **/
-class OnVIMyKeyNotification : public NotificationFromHMI {
+class OnVIMyKeyNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIMyKeyNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h
index 80375d1220..57b83b2ec9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIOdometerNotification command class
  **/
-class OnVIOdometerNotification : public NotificationFromHMI {
+class OnVIOdometerNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIOdometerNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h
index 7ea11e6ad2..e713298301 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIPrndlNotification command class
  **/
-class OnVIPrndlNotification : public NotificationFromHMI {
+class OnVIPrndlNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIPrndlNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h
index f86e1c4611..b5207f9df9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIRpmNotification command class
  **/
-class OnVIRpmNotification : public NotificationFromHMI {
+class OnVIRpmNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIRpmNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h
index 78afa5cf3d..99e69aa718 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVISpeedNotification command class
  **/
-class OnVISpeedNotification : public NotificationFromHMI {
+class OnVISpeedNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVISpeedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h
index c29209505b..d32a7e18c0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVISteeringWheelAngleNotification command class
  **/
-class OnVISteeringWheelAngleNotification : public NotificationFromHMI {
+class OnVISteeringWheelAngleNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVISteeringWheelAngleNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h
index 7aabde586e..034545843b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVITirePressureNotification command class
  **/
-class OnVITirePressureNotification : public NotificationFromHMI {
+class OnVITirePressureNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVITirePressureNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h
index 4c06825646..7cbf82b0e8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h
@@ -45,7 +45,7 @@ namespace commands {
  * @brief OnVIVehicleDataNotification command class
  * Sent by HMI for the periodic and non periodic vehicle data
  **/
-class OnVIVehicleDataNotification : public NotificationFromHMI {
+class OnVIVehicleDataNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIVehicleDataNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h
index 230a196bc0..3ccf9c03be 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIVinNotification command class
  **/
-class OnVIVinNotification : public NotificationFromHMI {
+class OnVIVinNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIVinNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h
index 41ce61e124..2b62d8024b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVIWiperStatusNotification command class
  **/
-class OnVIWiperStatusNotification : public NotificationFromHMI {
+class OnVIWiperStatusNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIWiperStatusNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h
index 26cf96546a..cc80045bd2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnVideoDataStreamingNotification command class
  **/
-class OnVideoDataStreamingNotification : public NotificationToHMI {
+class OnVideoDataStreamingNotification : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnVideoDataStreamingNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h
index 4ab4595ba9..82acbd66d1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief OnVRCommandNotification command class
  **/
-class OnVRCommandNotification : public NotificationFromHMI {
+class OnVRCommandNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVRCommandNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h
index 4690503b0e..37c2c7211a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnVRLanguageChangeNotification command class
  **/
-class OnVRLanguageChangeNotification : public NotificationFromHMI {
+class OnVRLanguageChangeNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVRLanguageChangeNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h
index 545cb332b5..b7609a4b16 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnVRStartedNotification command class
  **/
-class OnVRStartedNotification : public NotificationFromHMI {
+class OnVRStartedNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVRStartedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h
index 5d630e1ef3..01333cce53 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief OnVRStoppedNotification command class
  **/
-class OnVRStoppedNotification : public NotificationFromHMI {
+class OnVRStoppedNotification : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVRStoppedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h
index 66cf70e92a..a7aeb5b9fd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief RCGetCapabilitiesResponse command class
  **/
-class RCGetCapabilitiesResponse : public ResponseFromHMI {
+class RCGetCapabilitiesResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief RCGetCapabilitiesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h
index 956a48b6fd..26cf5309d2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief RCIsReadyResponse command class
  **/
-class RCIsReadyResponse : public ResponseFromHMI {
+class RCIsReadyResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief RCIsReadyResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h
index cdebd53596..18d4759119 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief SDLActivateAppResponse command class
  **/
-class SDLActivateAppResponse : public ResponseToHMI {
+class SDLActivateAppResponse : public app_mngr::commands::ResponseToHMI {
  public:
   /**
    * @brief SDLActivateAppResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h
index 5e4db1aa11..af0c6c81b0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief SDLGetListOfPermissionsResponse command class
  **/
-class SDLGetListOfPermissionsResponse : public ResponseToHMI {
+class SDLGetListOfPermissionsResponse : public app_mngr::commands::ResponseToHMI {
  public:
   /**
    * @brief SDLGetListOfPermissionsResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h
index 7b568c1c17..fd12376aaf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief SDLGetStatusUpdateResponse command class
  **/
-class SDLGetStatusUpdateResponse : public ResponseToHMI {
+class SDLGetStatusUpdateResponse : public app_mngr::commands::ResponseToHMI {
  public:
   /**
    * @brief SDLGetStatusUpdateResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h
index 87ed942fd8..3e0d0055b4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief SDLGetUserFriendlyMessageResponse command class
  **/
-class SDLGetUserFriendlyMessageResponse : public ResponseToHMI {
+class SDLGetUserFriendlyMessageResponse : public app_mngr::commands::ResponseToHMI {
  public:
   /**
    * @brief SDLGetUserFriendlyMessageResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h
index bc1e043add..cfbaad600f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h
@@ -40,7 +40,7 @@ namespace app_mngr = application_manager;
 
 namespace commands {
 
-class SDLPolicyUpdateResponse : public ResponseFromHMI {
+class SDLPolicyUpdateResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief SDLPolicyUpdateResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h
index fd459c9e2e..c122d39b68 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief TTSChangeRegistratioResponse command class
  **/
-class TTSChangeRegistratioResponse : public ResponseFromHMI {
+class TTSChangeRegistratioResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSChangeRegistratioResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h
index eb83c43464..7be74bba73 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief TTSGetCapabilitiesResponse command class
  **/
-class TTSGetCapabilitiesResponse : public ResponseFromHMI {
+class TTSGetCapabilitiesResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSGetCapabilitiesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h
index edc56902c5..df3347a718 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief TTSGetLanguageResponse command class
  **/
-class TTSGetLanguageResponse : public ResponseFromHMI {
+class TTSGetLanguageResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSGetLanguageResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h
index 96f089674a..370a38881a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief TTSGetSupportedLanguagesResponse command class
  **/
-class TTSGetSupportedLanguagesResponse : public ResponseFromHMI {
+class TTSGetSupportedLanguagesResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSGetSupportedLanguagesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h
index 76358df8dc..01a556f204 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief TTSIsReadyResponse command class
  **/
-class TTSIsReadyResponse : public ResponseFromHMI {
+class TTSIsReadyResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSIsReadyResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h
index 45d464f432..fe789110d9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief TTSSetGlobalPropertiesResponse command class
  **/
-class TTSSetGlobalPropertiesResponse : public ResponseFromHMI {
+class TTSSetGlobalPropertiesResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSSetGlobalPropertiesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h
index 264ea98ad5..5ca7cc2bac 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief TTSSpeakResponse command class
  **/
-class TTSSpeakResponse : public ResponseFromHMI {
+class TTSSpeakResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSSpeakResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h
index 68e3222829..b454f4d089 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief TTSStopSpeakingResponse command class
  **/
-class TTSStopSpeakingResponse : public ResponseFromHMI {
+class TTSStopSpeakingResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSStopSpeakingResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h
index 3657db1291..5eca3ba118 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIAddCommandResponse command class
  **/
-class UIAddCommandResponse : public ResponseFromHMI {
+class UIAddCommandResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIAddCommandResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h
index 5a7c3e0170..794d0794b8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIAddSubmenuResponse command class
  **/
-class UIAddSubmenuResponse : public ResponseFromHMI {
+class UIAddSubmenuResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIAddSubmenuResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h
index 5c911cfe12..0ab3350675 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIAlertResponse command class
  **/
-class UIAlertResponse : public ResponseFromHMI {
+class UIAlertResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIAlertResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h
index 8c359a9c43..3fdc0d4d2e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIChangeRegistratioResponse command class
  **/
-class UIChangeRegistratioResponse : public ResponseFromHMI {
+class UIChangeRegistratioResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIChangeRegistratioResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h
index 4220f7210c..ffd84d2963 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIDeleteCommandResponse command class
  **/
-class UIDeleteCommandResponse : public ResponseFromHMI {
+class UIDeleteCommandResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIDeleteCommandResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h
index 9ba5dd7b9c..8fd8235139 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIDeleteSubmenuResponse command class
  **/
-class UIDeleteSubmenuResponse : public ResponseFromHMI {
+class UIDeleteSubmenuResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIDeleteSubmenuResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h
index b4a9c14d05..2d9c57c8df 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIEndAudioPassThruResponse command class
  **/
-class UIEndAudioPassThruResponse : public ResponseFromHMI {
+class UIEndAudioPassThruResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIEndAudioPassThruResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h
index a8e9ae85c1..0565059bb5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIGetCapabilitiesResponse command class
  **/
-class UIGetCapabilitiesResponse : public ResponseFromHMI {
+class UIGetCapabilitiesResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIGetCapabilitiesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h
index 172ae91fb1..eab9307b01 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIGetLanguageResponse command class
  **/
-class UIGetLanguageResponse : public ResponseFromHMI {
+class UIGetLanguageResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIGetLanguageResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h
index 2c9b953a12..b6d411f759 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIGetSupportedLanguagesResponse command class
  **/
-class UIGetSupportedLanguagesResponse : public ResponseFromHMI {
+class UIGetSupportedLanguagesResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIGetSupportedLanguagesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h
index 55403657de..c4fb0a0dc0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIIsReadyResponse command class
  **/
-class UIIsReadyResponse : public ResponseFromHMI {
+class UIIsReadyResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIIsReadyResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h
index 499faf1797..92ff3e457b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIPerformAudioPassThruResponse command class
  **/
-class UIPerformAudioPassThruResponse : public ResponseFromHMI {
+class UIPerformAudioPassThruResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIPerformAudioPassThruResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h
index d764e9f70a..7f93895abf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIPerformInteractionResponse command class
  **/
-class UIPerformInteractionResponse : public ResponseFromHMI {
+class UIPerformInteractionResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIPerformInteractionResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h
index 23fed22a77..c0de6157ca 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIScrollableMessageResponse command class
  **/
-class UIScrollableMessageResponse : public ResponseFromHMI {
+class UIScrollableMessageResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIScrollableMessageResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h
index 5087302399..39e379e645 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UISendHapticDataResponse command class
  **/
-class UISendHapticDataResponse : public ResponseFromHMI {
+class UISendHapticDataResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UISendHapticDataResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h
index f5cfba0adf..52fbf3c7bd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UISetIconResponse command class
  **/
-class UISetAppIconResponse : public ResponseFromHMI {
+class UISetAppIconResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UISetIconResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h
index 82e04b41e4..26bf3a550f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UiSetDisplayLayoutResponse command class
  **/
-class UiSetDisplayLayoutResponse : public ResponseFromHMI {
+class UiSetDisplayLayoutResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UiSetDisplayLayoutResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h
index 03b5ba0e7d..a1ff8452ea 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UISetGlobalPropertiesResponse command class
  **/
-class UISetGlobalPropertiesResponse : public ResponseFromHMI {
+class UISetGlobalPropertiesResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UISetGlobalPropertiesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_response.h
index 70b3a98c21..0432993e4f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UISetIconResponse command class
  **/
-class UISetIconResponse : public ResponseFromHMI {
+class UISetIconResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UISetIconResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h
index f6ed1bf45c..6b09278744 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UISetMediaClockTimerResponse command class
  **/
-class UISetMediaClockTimerResponse : public ResponseFromHMI {
+class UISetMediaClockTimerResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UISetMediaClockTimerResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h
index a386dd8e37..d9e69a3ed5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UIShowResponse command class
  **/
-class UIShowResponse : public ResponseFromHMI {
+class UIShowResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIShowResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h
index e52d579475..9c92b4eec9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UISliderResponse command class
  **/
-class UISliderResponse : public ResponseFromHMI {
+class UISliderResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UISliderResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h
index f9cd36ac23..d24bbbcb26 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UpdateAppListResponse command class
  **/
-class UpdateAppListResponse : public ResponseFromHMI {
+class UpdateAppListResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UpdateAppListResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h
index a551bc3281..c393391e4a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UpdateDeviceListResponse command class
  **/
-class UpdateDeviceListResponse : public ResponseFromHMI {
+class UpdateDeviceListResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UpdateDeviceListResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h
index c7f2cf8e87..bbb2823816 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief UpdateSDLResponse command class
  **/
-class UpdateSDLResponse : public ResponseFromHMI {
+class UpdateSDLResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UpdateSDLResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_response.h
index e1a03a638c..a033feae44 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VIDiagnosticMessageResponse command class
  **/
-class VIDiagnosticMessageResponse : public ResponseFromHMI {
+class VIDiagnosticMessageResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VIDiagnosticMessageResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_response.h
index 7ba8924219..522ce80c61 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VIGetDTCsResponse command class
  **/
-class VIGetDTCsResponse : public ResponseFromHMI {
+class VIGetDTCsResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VIGetDTCsResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response.h
index a5d0751328..c18320c074 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief VIGetVehicleDataResponse command class
  **/
-class VIGetVehicleDataResponse : public ResponseFromHMI {
+class VIGetVehicleDataResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VIGetVehicleDataResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h
index 4be7867c4c..c75c57d603 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VIGetVehicleTypeResponse command class
  **/
-class VIGetVehicleTypeResponse : public ResponseFromHMI {
+class VIGetVehicleTypeResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VIGetVehicleTypeResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h
index 0364d3ac88..a38db9eafc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h
@@ -44,7 +44,7 @@ namespace commands {
 /**
  * @brief VIIsReadyResponse command class
  **/
-class VIIsReadyResponse : public ResponseFromHMI {
+class VIIsReadyResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VIIsReadyResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_response.h
index 50947637d4..f2822df68a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VIReadDIDResponse command class
  **/
-class VIReadDIDResponse : public ResponseFromHMI {
+class VIReadDIDResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VIReadDIDResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h
index d1ac1da8d6..1749c1e5f8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VISubscribeVehicleDataResponse command class
  **/
-class VISubscribeVehicleDataResponse : public ResponseFromHMI {
+class VISubscribeVehicleDataResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VISubscribeVehicleDataResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h
index 39535d7b08..47db0759f2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VIUnsubscribeVehicleDataResponse command class
  **/
-class VIUnsubscribeVehicleDataResponse : public ResponseFromHMI {
+class VIUnsubscribeVehicleDataResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VIUnsubscribeVehicleDataResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h
index f94d56543a..e9adb16497 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VRAddCommandResponse command class
  **/
-class VRAddCommandResponse : public ResponseFromHMI {
+class VRAddCommandResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VRAddCommandResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h
index 517d2068af..d226547e00 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VRChangeRegistrationResponse command class
  **/
-class VRChangeRegistrationResponse : public ResponseFromHMI {
+class VRChangeRegistrationResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VRChangeRegistrationResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h
index 291d14caf3..16380c2a00 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VRDeleteCommandResponse command class
  **/
-class VRDeleteCommandResponse : public ResponseFromHMI {
+class VRDeleteCommandResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VRDeleteCommandResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h
index dd57a24e7c..84799590e1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VRGetCapabilitiesResponse command class
  **/
-class VRGetCapabilitiesResponse : public ResponseFromHMI {
+class VRGetCapabilitiesResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VRGetCapabilitiesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h
index 05ad1c1d1e..e66e5c901a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VRGetLanguageResponse command class
  **/
-class VRGetLanguageResponse : public ResponseFromHMI {
+class VRGetLanguageResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VRGetLanguageResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h
index c93679f85d..a92254d81d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VRGetSupportedLanguagesResponse command class
  **/
-class VRGetSupportedLanguagesResponse : public ResponseFromHMI {
+class VRGetSupportedLanguagesResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VRGetSupportedLanguagesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h
index 069e506641..d266475842 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief VRIsReadyResponse command class
  **/
-class VRIsReadyResponse : public ResponseFromHMI {
+class VRIsReadyResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VRIsReadyResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h
index 527b6f8c59..8031478f7b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h
@@ -43,7 +43,7 @@ namespace commands {
 /**
  * @brief TTSPerformInteractionResponse command class
  **/
-class VRPerformInteractionResponse : public ResponseFromHMI {
+class VRPerformInteractionResponse : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSPerformInteractionResponse class constructor