1 files changed, 8 insertions, 6 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
index d78f019e35..4fd121ba54 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
@@ -40,11 +40,13 @@
 #include "application_manager/message_helper.h"
 #include "utils/helpers.h"
 
-namespace application_manager {
+namespace sdl_rpc_plugin {
+using namespace application_manager;
 namespace commands {
 
 SubscribeVehicleDataRequest::SubscribeVehicleDataRequest(
-    const MessageSharedPtr& message, ApplicationManager& application_manager)
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager)
     : CommandRequestImpl(message, application_manager) {}
 
 SubscribeVehicleDataRequest::~SubscribeVehicleDataRequest() {}
@@ -257,7 +259,7 @@ void SubscribeVehicleDataRequest::on_event(const event_engine::Event& event) {
 
     if (!vi_waiting_for_subscribe_.empty()) {
       LOG4CXX_DEBUG(logger_, "Subscribing to all pending VehicleData");
-      VehicleInfoSubscriptions::const_iterator key =
+      app_mngr::VehicleInfoSubscriptions::const_iterator key =
           vi_waiting_for_subscribe_.begin();
       for (; key != vi_waiting_for_subscribe_.end(); ++key) {
         app->SubscribeToIVI(*key);
@@ -299,7 +301,7 @@ void SubscribeVehicleDataRequest::AddAlreadySubscribedVI(
         return std::string();
       };
 
-  VehicleInfoSubscriptions::const_iterator it_same_app =
+  app_mngr::VehicleInfoSubscriptions::const_iterator it_same_app =
       vi_already_subscribed_by_this_app_.begin();
   for (; vi_already_subscribed_by_this_app_.end() != it_same_app;
        ++it_same_app) {
@@ -308,7 +310,7 @@ void SubscribeVehicleDataRequest::AddAlreadySubscribedVI(
     msg_params[vi_to_string(*it_same_app)][strings::data_type] = *it_same_app;
   }
 
-  VehicleInfoSubscriptions::const_iterator it_another_app =
+  app_mngr::VehicleInfoSubscriptions::const_iterator it_another_app =
       vi_already_subscribed_by_another_apps_.begin();
   for (; vi_already_subscribed_by_another_apps_.end() != it_another_app;
        ++it_another_app) {
@@ -384,7 +386,7 @@ void SubscribeVehicleDataRequest::CheckVISubscriptions(
     smart_objects::SmartObject& out_request_params,
     bool& out_result) {
   // counter for items to subscribe
-  VehicleInfoSubscriptions::size_type items_to_subscribe = 0;
+  app_mngr::VehicleInfoSubscriptions::size_type items_to_subscribe = 0;
   // counter for subscribed items by application
   uint32_t subscribed_items = 0;