1 files changed, 5 insertions, 5 deletions

diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc
index 6716da2983..93e831acda 100644
--- a/src/components/policy/policy_regular/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc
@@ -395,7 +395,7 @@ void PolicyManagerImpl::CheckPermissions(const PTString& device_id,
                                        << " for " << hmi_level << " level.");
 
 #ifdef SDL_REMOTE_CONTROL
-  Subject who = {device_id, app_id};
+  ApplicationOnDevice who = {device_id, app_id};
   const policy_table::Strings& groups = access_remote_->GetGroups(who);
 #else   // SDL_REMOTE_CONTROL
   const policy_table::Strings& groups = cache_->GetGroups(app_id);
@@ -458,7 +458,7 @@ void PolicyManagerImpl::SendNotificationOnPermissionsUpdated(
   default_hmi = "NONE";
 
 #ifdef SDL_REMOTE_CONTROL
-  const Subject who = {device_id, application_id};
+  const ApplicationOnDevice who = {device_id, application_id};
   if (access_remote_->IsAppRemoteControl(who)) {
     listener()->OnPermissionsUpdated(application_id, notification_data);
     return;
@@ -1169,7 +1169,7 @@ void PolicyManagerImpl::SetDefaultHmiTypes(const std::string& application_id,
                                            const std::vector<int>& hmi_types) {
   LOG4CXX_INFO(logger_, "SetDefaultHmiTypes");
   const std::string device_id = GetCurrentDeviceId(application_id);
-  Subject who = {device_id, application_id};
+  ApplicationOnDevice who = {device_id, application_id};
   access_remote_->SetDefaultHmiTypes(who, hmi_types);
 }
 
@@ -1204,7 +1204,7 @@ bool PolicyManagerImpl::CheckModule(const PTString& app_id,
          access_remote_->CheckModuleType(app_id, module_type);
 }
 
-void PolicyManagerImpl::SendHMILevelChanged(const Subject& who) {
+void PolicyManagerImpl::SendHMILevelChanged(const ApplicationOnDevice& who) {
   std::string default_hmi("NONE");
   if (GetDefaultHmi(who.app_id, &default_hmi)) {
     listener()->OnUpdateHMIStatus(who.dev_id, who.app_id, default_hmi);
@@ -1253,7 +1253,7 @@ void PolicyManagerImpl::OnPrimaryGroupsChanged(
   for (std::vector<std::string>::const_iterator i = devices.begin();
        i != devices.end();
        ++i) {
-    const Subject who = {*i, application_id};
+    const ApplicationOnDevice who = {*i, application_id};
     if (access_remote_->IsAppRemoteControl(who)) {
       SendAppPermissionsChanged(who.dev_id, who.app_id);
     }