1 files changed, 6 insertions, 4 deletions

diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h
index fdb4bdad1e..d63b429c09 100644
--- a/src/components/application_manager/include/application_manager/application_impl.h
+++ b/src/components/application_manager/include/application_manager/application_impl.h
@@ -49,6 +49,7 @@
 #include "utils/timer_thread.h"
 #include "utils/lock.h"
 #include "utils/atomic_object.h"
+#include "utils/custom_string.h"
 
 namespace usage_statistics {
 
@@ -60,6 +61,7 @@ using namespace utils;
 using namespace timer;
 
 namespace mobile_api = mobile_apis;
+namespace custom_str = custom_string;
 
 class ApplicationImpl : public virtual InitialApplicationDataImpl,
                         public virtual DynamicApplicationDataImpl {
@@ -67,7 +69,7 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   ApplicationImpl(
       uint32_t application_id,
       const std::string& mobile_app_id,
-      const std::string& app_name,
+      const custom_str::CustomString& app_name,
       utils::SharedPtr<usage_statistics::StatisticsManager> statistics_manager);
 
   ~ApplicationImpl();
@@ -118,7 +120,7 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   void set_hmi_application_id(uint32_t hmi_app_id);
   inline uint32_t hmi_app_id() const;
   inline uint32_t app_id() const;
-  const std::string& name() const;
+  const custom_str::CustomString& name() const;
   void set_folder_name(const std::string& folder_name) OVERRIDE;
   const std::string folder_name() const;
   bool is_media_application() const;
@@ -138,7 +140,7 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   void set_tts_properties_in_full(bool active);
   bool tts_properties_in_full();
   void set_version(const Version& ver);
-  void set_name(const std::string& name);
+  void set_name(const custom_str::CustomString& name);
   void set_is_media_application(bool is_media);
   void increment_put_file_in_none_count();
   void increment_delete_file_in_none_count();
@@ -303,7 +305,7 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl,
   uint32_t grammar_id_;
 
   Version version_;
-  std::string app_name_;
+  custom_str::CustomString app_name_;
   uint32_t hmi_app_id_;
   uint32_t app_id_;
   smart_objects::SmartObject* active_message_;