1 files changed, 13 insertions, 11 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc
index bbce4d2bb3..b8f1e3d70f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc
@@ -73,11 +73,11 @@ SetGlobalPropertiesRequest::SetGlobalPropertiesRequest(
     app_mngr::rpc_service::RPCService& rpc_service,
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
-    : CommandRequestImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+    : RequestFromMobileImpl(message,
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , is_ui_send_(false)
     , is_tts_send_(false)
     , is_rc_send_(false)
@@ -186,6 +186,7 @@ void SetGlobalPropertiesRequest::Run() {
         msg_params[strings::menu_layout].asUInt());
     if (app->menu_layout_supported(menu_layout)) {
       params[strings::menu_layout] = msg_params[strings::menu_layout];
+      app->set_menu_layout(msg_params[strings::menu_layout]);
     } else {
       is_menu_layout_available_ = false;
     }
@@ -425,10 +426,10 @@ bool SetGlobalPropertiesRequest::Init() {
   return true;
 }
 
-void SetGlobalPropertiesRequest::onTimeOut() {
+void SetGlobalPropertiesRequest::OnTimeOut() {
   SDL_LOG_AUTO_TRACE();
 
-  CommandRequestImpl::onTimeOut();
+  RequestFromMobileImpl::OnTimeOut();
 
   auto& resume_ctrl = application_manager_.resume_controller();
 
@@ -454,7 +455,7 @@ bool SetGlobalPropertiesRequest::PrepareResponseParameters(
   bool result = false;
 
   if (!is_rc_send_) {
-    result = CommandRequestImpl::PrepareResultForMobileResponse(
+    result = RequestFromMobileImpl::PrepareResultForMobileResponse(
         ui_properties_info, tts_properties_info);
   } else {
     result = PrepareResultForMobileResponse(
@@ -475,7 +476,7 @@ bool SetGlobalPropertiesRequest::PrepareResponseParameters(
   }
 
   if (!is_rc_send_) {
-    result_code = CommandRequestImpl::PrepareResultCodeForResponse(
+    result_code = RequestFromMobileImpl::PrepareResultCodeForResponse(
         ui_properties_info, tts_properties_info);
   } else {
     result_code = PrepareResultCodeForResponse(
@@ -516,8 +517,9 @@ bool SetGlobalPropertiesRequest::PrepareResultForMobileResponse(
       (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE == first.result_code) ||
       (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE == second.result_code);
 
-  const bool final_result = CommandRequestImpl::CheckResult(both_info, third) ||
-                            CommandRequestImpl::CheckResult(third, both_info);
+  const bool final_result =
+      RequestFromMobileImpl::CheckResultCode(both_info, third) ||
+      RequestFromMobileImpl::CheckResultCode(third, both_info);
 
   return final_result;
 }