1 files changed, 16 insertions, 13 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h
index f556f81764..96290e6863 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h
@@ -31,29 +31,32 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_
-#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_
 
 #include "application_manager/commands/command_request_impl.h"
 #include "application_manager/application.h"
 #include "utils/macro.h"
 
-namespace application_manager {
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
 
 namespace commands {
 
 /**
  * @brief SubscribeVehicleDataRequest command class
  **/
-class SubscribeVehicleDataRequest : public CommandRequestImpl {
+class SubscribeVehicleDataRequest
+    : public app_mngr::commands::CommandRequestImpl {
  public:
   /**
    * @brief SubscribeVehicleDataRequest class constructor
    *
    * @param message Incoming SmartObject message
    **/
-  SubscribeVehicleDataRequest(const MessageSharedPtr& message,
-                              ApplicationManager& application_manager);
+  SubscribeVehicleDataRequest(
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager);
 
   /**
    * @brief SubscribeButtonCommandRequest class destructor
@@ -70,7 +73,7 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl {
    *
    * @param event The received event
    */
-  void on_event(const event_engine::Event& event) FINAL;
+  void on_event(const app_mngr::event_engine::Event& event) FINAL;
 
   /**
    * @brief Init sets hash update mode for request
@@ -114,7 +117,7 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl {
    * @param msg_params 'message_parameters' response section reference
    */
   void UnsubscribeFailedSubscriptions(
-      ApplicationSharedPtr app,
+      app_mngr::ApplicationSharedPtr app,
       const smart_objects::SmartObject& msg_params) const;
 
   /**
@@ -130,7 +133,7 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl {
    * HMI
    * @param result contains result that SDL sends to mobile app.
    */
-  void CheckVISubscribtions(ApplicationSharedPtr app,
+  void CheckVISubscribtions(app_mngr::ApplicationSharedPtr app,
                             std::string& out_info,
                             mobile_apis::Result::eType& out_result_code,
                             smart_objects::SmartObject& out_response_params,
@@ -141,17 +144,17 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl {
    * @brief VI parameters which had been already subscribed by another apps
    * befor particular app subscribed for these parameters
    */
-  VehicleInfoSubscriptions vi_already_subscribed_by_another_apps_;
+  app_mngr::VehicleInfoSubscriptions vi_already_subscribed_by_another_apps_;
 
   /**
    * @brief VI parameters which had been subscribed already by particular app
    */
-  VehicleInfoSubscriptions vi_already_subscribed_by_this_app_;
+  app_mngr::VehicleInfoSubscriptions vi_already_subscribed_by_this_app_;
 
   /**
    * @brief VI parameters which wait for subscribe after HMI respond
    */
-  VehicleInfoSubscriptions vi_waiting_for_subscribe_;
+  app_mngr::VehicleInfoSubscriptions vi_waiting_for_subscribe_;
 
   DISALLOW_COPY_AND_ASSIGN(SubscribeVehicleDataRequest);
 };
@@ -159,4 +162,4 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl {
 }  // namespace commands
 }  // namespace application_manager
 
-#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_