1 files changed, 7 insertions, 6 deletions
diff --git a/src/components/application_manager/src/command_holder_impl.cc b/src/components/application_manager/src/command_holder_impl.cc
index 4e2cf89f57..ea74e78f4e 100644
--- a/src/components/application_manager/src/command_holder_impl.cc
+++ b/src/components/application_manager/src/command_holder_impl.cc
@@ -43,7 +43,7 @@ CommandHolderImpl::CommandHolderImpl(ApplicationManager& app_manager)
 void CommandHolderImpl::Suspend(
     ApplicationSharedPtr application,
     CommandType type,
-    utils::SharedPtr<smart_objects::SmartObject> command) {
+    std::shared_ptr<smart_objects::SmartObject> command) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(application);
   LOG4CXX_DEBUG(logger_,
@@ -57,8 +57,9 @@ void CommandHolderImpl::Suspend(
                   "Suspended HMI command(s): " << app_hmi_commands_.size());
   } else {
     app_mobile_commands_[application].push_back(command);
-    LOG4CXX_DEBUG(logger_,
-                  "Suspended mobile command(s): " << app_hmi_commands_.size());
+    LOG4CXX_DEBUG(
+        logger_,
+        "Suspended mobile command(s): " << app_mobile_commands_.size());
   }
 }
 
@@ -113,7 +114,7 @@ void CommandHolderImpl::ResumeHmiCommand(ApplicationSharedPtr application) {
 
   for (auto cmd : app_commands->second) {
     (*cmd)[strings::msg_params][strings::app_id] = application->hmi_app_id();
-    app_manager_.ManageHMICommand(cmd);
+    app_manager_.GetRPCService().ManageHMICommand(cmd);
   }
 
   app_hmi_commands_.erase(app_commands);
@@ -132,8 +133,8 @@ void CommandHolderImpl::ResumeMobileCommand(ApplicationSharedPtr application) {
 
   for (auto cmd : app_commands->second) {
     (*cmd)[strings::params][strings::connection_key] = application->app_id();
-    app_manager_.ManageMobileCommand(
-        cmd, commands::Command::CommandOrigin::ORIGIN_MOBILE);
+    app_manager_.GetRPCService().ManageMobileCommand(
+        cmd, commands::Command::CommandSource::SOURCE_MOBILE);
   }
 
   app_mobile_commands_.erase(app_commands);