Fixes typos, comments

5 files changed, 6 insertions, 7 deletions

diff --git a/src/components/application_manager/include/application_manager/helpers/application_helper.h b/src/components/application_manager/include/application_manager/helpers/application_helper.h
index 7eba501e88..ebf709bc45 100644
--- a/src/components/application_manager/include/application_manager/helpers/application_helper.h
+++ b/src/components/application_manager/include/application_manager/helpers/application_helper.h
@@ -40,7 +40,7 @@
 namespace application_manager {
 
 /**
- * Helper function for lookup through applications list and returing first
+ * Helper function for lookup through applications list and returning first
  * application satisfying predicate logic
  */
 template <class UnaryPredicate>
diff --git a/src/components/application_manager/src/helpers/application_helper.cc b/src/components/application_manager/src/helpers/application_helper.cc
index ffe97709a8..4b4816b273 100644
--- a/src/components/application_manager/src/helpers/application_helper.cc
+++ b/src/components/application_manager/src/helpers/application_helper.cc
@@ -24,8 +24,7 @@ void RecallCommands(ApplicationSharedPtr app, ApplicationManager& app_manager) {
   }
 }
 
-void RecallSubmenues(ApplicationSharedPtr app,
-                     ApplicationManager& app_manager) {
+void RecallSubmenus(ApplicationSharedPtr app, ApplicationManager& app_manager) {
   SubMenuMap smap = app->sub_menu_map().GetData();
 
   for (auto smenu : smap) {
@@ -136,7 +135,7 @@ void RecallApplicationData(ApplicationSharedPtr app,
 
   RecallWayPoints(app, app_manager);
   RecallCommands(app, app_manager);
-  RecallSubmenues(app, app_manager);
+  RecallSubmenus(app, app_manager);
   RecallChoiceSets(app, app_manager);
   RecallGlobalProperties(app, app_manager);
   RecallButtonSubscriptions(app, app_manager);
diff --git a/src/components/application_manager/test/include/application_manager/mock_application_helper.h b/src/components/application_manager/test/include/application_manager/mock_application_helper.h
index d159dd95d9..82f73d452e 100644
--- a/src/components/application_manager/test/include/application_manager/mock_application_helper.h
+++ b/src/components/application_manager/test/include/application_manager/mock_application_helper.h
@@ -48,6 +48,6 @@ class MockApplicationHelper {
 
   static MockApplicationHelper& application_helper_mock();
 };
-}
+}  // application_manager_test
 }  // components
 }  // test
diff --git a/src/components/application_manager/test/include/application_manager/mock_hmi_command_factory.h b/src/components/application_manager/test/include/application_manager/mock_hmi_command_factory.h
index 6ff40394a2..b0086a20fe 100644
--- a/src/components/application_manager/test/include/application_manager/mock_hmi_command_factory.h
+++ b/src/components/application_manager/test/include/application_manager/mock_hmi_command_factory.h
@@ -52,6 +52,6 @@ class MockHMICommandFactory {
   static MockHMICommandFactory* mock_hmi_command_factory();
 };
 
-}  // application_manager
+}  // application_manager_test
 }  // components
 }  // test
diff --git a/src/components/application_manager/test/mock_hmi_command_factory.cc b/src/components/application_manager/test/mock_hmi_command_factory.cc
index 19ad44f482..c2b4644f86 100644
--- a/src/components/application_manager/test/mock_hmi_command_factory.cc
+++ b/src/components/application_manager/test/mock_hmi_command_factory.cc
@@ -43,7 +43,7 @@ MockHMICommandFactory* MockHMICommandFactory::mock_hmi_command_factory() {
   return &mock_hmi_command_factory;
 }
 
-}  // application_manager
+}  // application_manager_test
 }  // components
 }  // test