Rename some variables and function

Reflecting review comments.

4 files changed, 12 insertions, 14 deletions

diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h
index da5e4794b3..9ef1210a02 100644
--- a/src/components/application_manager/include/application_manager/application_manager_impl.h
+++ b/src/components/application_manager/include/application_manager/application_manager_impl.h
@@ -1714,10 +1714,9 @@ class ApplicationManagerImpl
 
   // This is a cache to remember DeviceHandle of secondary transports. Only used
   // during RegisterApplication().
-  typedef std::map<int32_t, connection_handler::DeviceHandle>
-      SecondaryTransportDeviceMap;
+  typedef std::map<int32_t, connection_handler::DeviceHandle> DeviceMap;
 
-  SecondaryTransportDeviceMap secondary_transport_devices_cache_;
+  DeviceMap secondary_transport_devices_cache_;
 
 #ifdef TELEMETRY_MONITOR
   AMTelemetryObserver* metric_observer_;
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 1d3b8ac1b7..be78d8fb26 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -660,7 +660,7 @@ ApplicationSharedPtr ApplicationManagerImpl::RegisterApplication(
   // instance.
   // Also, make sure that this is done *after* we updated applications_ list to
   // avoid timing issues.
-  SecondaryTransportDeviceMap::iterator itr =
+  DeviceMap::iterator itr =
       secondary_transport_devices_cache_.find(connection_key);
   if (secondary_transport_devices_cache_.end() != itr) {
     connection_handler::DeviceHandle secondary_device_handle = itr->second;
@@ -1800,8 +1800,7 @@ void ApplicationManagerImpl::OnSecondaryTransportEndedCallback(
     const int32_t session_key) {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  SecondaryTransportDeviceMap::iterator it =
-      secondary_transport_devices_cache_.find(session_key);
+  DeviceMap::iterator it = secondary_transport_devices_cache_.find(session_key);
   if (it == secondary_transport_devices_cache_.end()) {
     LOG4CXX_WARN(
         logger_,
diff --git a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
index d44342d875..7984512a61 100644
--- a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
+++ b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
@@ -937,7 +937,7 @@ mobile_apis::HMILevel::eType ResumeCtrlImpl::GetHmiLevelOnLowBandwidthTransport(
   const std::string& level_for_projection_app =
       settings.projection_lowbandwidth_resumption_level();
   const std::string& level_for_media_app =
-      settings.mediaapp_lowbandwidth_resumption_level();
+      settings.media_lowbandwidth_resumption_level();
 
   HMILevel::eType result_level = HMILevel::HMI_NONE;
   HMILevel::eType level;
diff --git a/src/components/application_manager/test/resumption/resume_ctrl_test.cc b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
index f74424102b..b7a5cbcd33 100644
--- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc
+++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
@@ -86,7 +86,7 @@ class ResumeCtrlTest : public ::testing::Test {
       , kDefaultDeferredTestLevel_(eType::INVALID_ENUM)
       , kNaviLowbandwidthLevel_("LIMITED")
       , kProjectionLowbandwidthLevel_("NONE")
-      , kMediaappLowbandwidthLevel_("NONE") {}
+      , kMediaLowbandwidthLevel_("NONE") {}
 
   virtual void SetUp() OVERRIDE {
     Mock::VerifyAndClearExpectations(&app_mngr_);
@@ -124,9 +124,9 @@ class ResumeCtrlTest : public ::testing::Test {
         .Times(AtLeast(0))
         .WillRepeatedly(ReturnRef(kProjectionLowbandwidthLevel_));
     EXPECT_CALL(mock_application_manager_settings_,
-                mediaapp_lowbandwidth_resumption_level())
+                media_lowbandwidth_resumption_level())
         .Times(AtLeast(0))
-        .WillRepeatedly(ReturnRef(kMediaappLowbandwidthLevel_));
+        .WillRepeatedly(ReturnRef(kMediaLowbandwidthLevel_));
 
     EXPECT_CALL(*app_mock_, deferred_resumption_hmi_level())
         .Times(AtLeast(0))
@@ -167,7 +167,7 @@ class ResumeCtrlTest : public ::testing::Test {
   const mobile_apis::HMILevel::eType kDefaultDeferredTestLevel_;
   const std::string kNaviLowbandwidthLevel_;
   const std::string kProjectionLowbandwidthLevel_;
-  const std::string kMediaappLowbandwidthLevel_;
+  const std::string kMediaLowbandwidthLevel_;
 };
 
 /**
@@ -726,7 +726,7 @@ TEST_F(
 
   std::string navi_lowbandwidth_level("NONE");
   std::string projection_lowbandwidth_level("BACKGROUND");
-  std::string mediaapp_lowbandwidth_level("LIMITED");
+  std::string media_lowbandwidth_level("LIMITED");
   EXPECT_CALL(mock_application_manager_settings_,
               navigation_lowbandwidth_resumption_level())
       .WillRepeatedly(ReturnRef(navi_lowbandwidth_level));
@@ -734,8 +734,8 @@ TEST_F(
               projection_lowbandwidth_resumption_level())
       .WillRepeatedly(ReturnRef(projection_lowbandwidth_level));
   EXPECT_CALL(mock_application_manager_settings_,
-              mediaapp_lowbandwidth_resumption_level())
-      .WillRepeatedly(ReturnRef(mediaapp_lowbandwidth_level));
+              media_lowbandwidth_resumption_level())
+      .WillRepeatedly(ReturnRef(media_lowbandwidth_level));
 
   EXPECT_CALL(*app_mock_, deferred_resumption_hmi_level())
       .WillRepeatedly(Return(restored_test_type));