diff --git a/base/base_tests/string_utils_test.cpp b/base/base_tests/string_utils_test.cpp
index 88ddb70300..f259c6fc98 100644
--- a/base/base_tests/string_utils_test.cpp
+++ b/base/base_tests/string_utils_test.cpp
@@ -6,15 +6,15 @@ UNIT_TEST(make_lower_case)
   string s;
 
   s = "THIS_IS_UPPER";
-  string_utils::make_lower_case(s);
+  strings::make_lower_case(s);
   TEST_EQUAL(s, "this_is_upper", ());
 
   s = "THIS_iS_MiXed";
-  string_utils::make_lower_case(s);
+  strings::make_lower_case(s);
   TEST_EQUAL(s, "this_is_mixed", ());
 
   s = "this_is_lower";
-  string_utils::make_lower_case(s);
+  strings::make_lower_case(s);
   TEST_EQUAL(s, "this_is_lower", ());
 }
 
@@ -24,30 +24,30 @@ UNIT_TEST(to_double)
   double d;
 
   s = "0.123";
-  TEST(string_utils::to_double(s, d), ());
+  TEST(strings::to_double(s, d), ());
   TEST_ALMOST_EQUAL(0.123, d, ());
 
   s = "1.";
-  TEST(string_utils::to_double(s, d), ());
+  TEST(strings::to_double(s, d), ());
   TEST_ALMOST_EQUAL(1.0, d, ());
 
   s = "0";
-  TEST(string_utils::to_double(s, d), ());
+  TEST(strings::to_double(s, d), ());
   TEST_ALMOST_EQUAL(0., d, ());
 
   s = "5.6843418860808e-14";
-  TEST(string_utils::to_double(s, d), ());
+  TEST(strings::to_double(s, d), ());
   TEST_ALMOST_EQUAL(5.6843418860808e-14, d, ());
 
   s = "-2";
-  TEST(string_utils::to_double(s, d), ());
+  TEST(strings::to_double(s, d), ());
   TEST_ALMOST_EQUAL(-2.0, d, ());
 }
 
 UNIT_TEST(to_string)
 {
-  TEST_EQUAL(string_utils::to_string(-1), "-1", ());
-  TEST_EQUAL(string_utils::to_string(1234567890), "1234567890", ());
-  TEST_EQUAL(string_utils::to_string(0.56), "0.56", ());
-  TEST_EQUAL(string_utils::to_string(-100.2), "-100.2", ());
+  TEST_EQUAL(strings::to_string(-1), "-1", ());
+  TEST_EQUAL(strings::to_string(1234567890), "1234567890", ());
+  TEST_EQUAL(strings::to_string(0.56), "0.56", ());
+  TEST_EQUAL(strings::to_string(-100.2), "-100.2", ());
 }
diff --git a/base/string_utils.cpp b/base/string_utils.cpp
index 0d230c7d12..48d85c6186 100644
--- a/base/string_utils.cpp
+++ b/base/string_utils.cpp
@@ -5,7 +5,8 @@
 
 #include <locale>   // for make_lower_case
 
-namespace string_utils {
+namespace strings
+{
 
 TokenizeIterator::TokenizeIterator(string const & s, char const * delim)
 : m_start(0), m_src(s), m_delim(delim)
diff --git a/base/string_utils.hpp b/base/string_utils.hpp
index f905cccea1..482c12810f 100644
--- a/base/string_utils.hpp
+++ b/base/string_utils.hpp
@@ -5,7 +5,7 @@
 
 #include "../3party/utfcpp/source/utf8/unchecked.h"
 
-namespace string_utils
+namespace strings
 {
   // get substrings from s divided by delim and pass them to toDo
   template <class ToDo> void TokenizeString(string const & s, char const * delim, ToDo toDo)
diff --git a/coding/coding_tests/file_container_test.cpp b/coding/coding_tests/file_container_test.cpp
index 53fd16dc83..927d848e77 100644
--- a/coding/coding_tests/file_container_test.cpp
+++ b/coding/coding_tests/file_container_test.cpp
@@ -18,7 +18,7 @@ UNIT_TEST(FilesContainer_Smoke)
 
     for (size_t i = 0; i < count; ++i)
     {
-      FileWriter w = writer.GetWriter(string_utils::to_string(i));
+      FileWriter w = writer.GetWriter(strings::to_string(i));
 
       for (uint32_t j = 0; j < i; ++j)
         WriteVarUint(w, j);
@@ -33,7 +33,7 @@ UNIT_TEST(FilesContainer_Smoke)
 
     for (size_t i = 0; i < count; ++i)
     {
-      FileReader r = reader.GetReader(string_utils::to_string(i));
+      FileReader r = reader.GetReader(strings::to_string(i));
       ReaderSource<FileReader> src(r);
 
       for (uint32_t j = 0; j < i; ++j)
@@ -51,7 +51,7 @@ UNIT_TEST(FilesContainer_Smoke)
     {
       FilesContainerW writer(fName, FileWriter::OP_APPEND);
 
-      FileWriter w = writer.GetWriter(string_utils::to_string(arrAppend[i]));
+      FileWriter w = writer.GetWriter(strings::to_string(arrAppend[i]));
       WriteVarUint(w, arrAppend[i]);
 
       writer.Finish();
@@ -61,7 +61,7 @@ UNIT_TEST(FilesContainer_Smoke)
     {
       FilesContainerR reader(fName);
 
-      FileReader r = reader.GetReader(string_utils::to_string(arrAppend[i]));
+      FileReader r = reader.GetReader(strings::to_string(arrAppend[i]));
       ReaderSource<FileReader> src(r);
 
       uint32_t const test = ReadVarUint<uint32_t>(src);
diff --git a/coding/coding_tests/value_opt_string_test.cpp b/coding/coding_tests/value_opt_string_test.cpp
index db99f4831b..bfd2c9bc67 100644
--- a/coding/coding_tests/value_opt_string_test.cpp
+++ b/coding/coding_tests/value_opt_string_test.cpp
@@ -29,7 +29,7 @@ namespace
       ReaderSource<MemReader> src(r);
       s.Read(src);
 
-      TEST_EQUAL(string_utils::to_string(arr[i]), s.Get(), ());
+      TEST_EQUAL(strings::to_string(arr[i]), s.Get(), ());
     }
   }
 }
diff --git a/coding/file_reader.cpp b/coding/file_reader.cpp
index d666bde873..2805b8f882 100644
--- a/coding/file_reader.cpp
+++ b/coding/file_reader.cpp
@@ -106,7 +106,7 @@ FileReader * FileReader::CreateSubReader(uint64_t pos, uint64_t size) const
 bool FileReader::IsEqual(string const & fName) const
 {
 #if defined(OMIM_OS_WINDOWS)
-  return string_utils::equal_no_case(fName, m_pFileData->GetName());
+  return strings::equal_no_case(fName, m_pFileData->GetName());
 #else
   return (fName == m_pFileData->GetName());
 #endif
diff --git a/coding/value_opt_string.hpp b/coding/value_opt_string.hpp
index 560a547e93..6511775614 100644
--- a/coding/value_opt_string.hpp
+++ b/coding/value_opt_string.hpp
@@ -32,7 +32,7 @@ public:
   }
   template <class T> void Set(T const & s)
   {
-    m_s = string_utils::to_string(s);
+    m_s = strings::to_string(s);
     CHECK ( !m_s.empty(), () );
   }
 
@@ -43,7 +43,7 @@ public:
   template <class TSink> void Write(TSink & sink) const
   {
     int n;
-    if (string_utils::to_int(m_s, n) && n >= 0)
+    if (strings::to_int(m_s, n) && n >= 0)
       WriteVarUint(sink, static_cast<uint32_t>((n << 1) | numeric_bit));
     else
     {
@@ -60,7 +60,7 @@ public:
     uint32_t sz = ReadVarUint<uint32_t>(src);
 
     if ((sz & numeric_bit) != 0)
-      m_s = string_utils::to_string(sz >> 1);
+      m_s = strings::to_string(sz >> 1);
     else
     {
       sz = (sz >> 1) + 1;
diff --git a/generator/borders_loader.cpp b/generator/borders_loader.cpp
index 4c4b343fc2..cf0165fa66 100644
--- a/generator/borders_loader.cpp
+++ b/generator/borders_loader.cpp
@@ -69,7 +69,7 @@ namespace borders
       m2::RectD rect;
 
       PolygonLoader loader(baseDir, simplifyCountriesLevel, country, rect);
-      string_utils::TokenizeString(line, "|", loader);
+      strings::TokenizeString(line, "|", loader);
       if (!country.m_regions.IsEmpty())
         countries.Add(country, rect);
     }
diff --git a/generator/feature_sorter.cpp b/generator/feature_sorter.cpp
index 2cbb86d43f..0d05670a66 100644
--- a/generator/feature_sorter.cpp
+++ b/generator/feature_sorter.cpp
@@ -93,7 +93,7 @@ namespace feature
     {
       for (size_t i = 0; i < m_header.GetScalesCount(); ++i)
       {
-        string const postfix = string_utils::to_string(i);
+        string const postfix = strings::to_string(i);
         m_geoFile.push_back(new FileWriter(fName + GEOMETRY_FILE_TAG + postfix));
         m_trgFile.push_back(new FileWriter(fName + TRIANGLE_FILE_TAG + postfix));
       }
@@ -120,7 +120,7 @@ namespace feature
         delete m_geoFile[i];
         delete m_trgFile[i];
 
-        string const postfix = string_utils::to_string(i);
+        string const postfix = strings::to_string(i);
 
         string geoPostfix = GEOMETRY_FILE_TAG;
         geoPostfix += postfix;
diff --git a/generator/first_pass_parser.hpp b/generator/first_pass_parser.hpp
index 9624e38f65..0d115e59c4 100644
--- a/generator/first_pass_parser.hpp
+++ b/generator/first_pass_parser.hpp
@@ -24,15 +24,15 @@ protected:
   virtual void EmitElement(XMLElement * p)
   {
     uint64_t id;
-    VERIFY ( string_utils::to_uint64(p->attrs["id"], id), ("Unknown element with invalid id : ", p->attrs["id"]) );
+    VERIFY ( strings::to_uint64(p->attrs["id"], id), ("Unknown element with invalid id : ", p->attrs["id"]) );
 
     if (p->name == "node")
     {
       // store point
 
       double lat, lng;
-      VERIFY ( string_utils::to_double(p->attrs["lat"], lat), ("Bad node lat : ", p->attrs["lat"]) );
-      VERIFY ( string_utils::to_double(p->attrs["lon"], lng), ("Bad node lon : ", p->attrs["lon"]) );
+      VERIFY ( strings::to_double(p->attrs["lat"], lat), ("Bad node lat : ", p->attrs["lat"]) );
+      VERIFY ( strings::to_double(p->attrs["lon"], lng), ("Bad node lon : ", p->attrs["lon"]) );
 
       // convert to mercator
       lat = MercatorBounds::LatToY(lat);
@@ -53,7 +53,7 @@ protected:
         if (p->childs[i].name == "nd")
         {
           uint64_t ref;
-          VERIFY ( string_utils::to_uint64(p->childs[i].attrs["ref"], ref), ("Bad node ref in way : ", p->childs[i].attrs["ref"]) );
+          VERIFY ( strings::to_uint64(p->childs[i].attrs["ref"], ref), ("Bad node ref in way : ", p->childs[i].attrs["ref"]) );
           e.nodes.push_back(ref);
         }
         else if (!bUnite && (p->childs[i].name == "tag"))
@@ -84,7 +84,7 @@ protected:
         if (p->childs[i].name == "member")
         {
           uint64_t ref;
-          VERIFY ( string_utils::to_uint64(p->childs[i].attrs["ref"], ref), ("Bad ref in relation : ", p->childs[i].attrs["ref"]) );
+          VERIFY ( strings::to_uint64(p->childs[i].attrs["ref"], ref), ("Bad ref in relation : ", p->childs[i].attrs["ref"]) );
 
           string const & type = p->childs[i].attrs["type"];
           string const & role = p->childs[i].attrs["role"];
diff --git a/generator/osm_element.hpp b/generator/osm_element.hpp
index 9298325bb7..0d89d357a3 100644
--- a/generator/osm_element.hpp
+++ b/generator/osm_element.hpp
@@ -274,7 +274,7 @@ protected:
 
   bool ParseType(XMLElement * p, uint64_t & id, FeatureParams & fValue)
   {
-    VERIFY ( string_utils::to_uint64(p->attrs["id"], id),
+    VERIFY ( strings::to_uint64(p->attrs["id"], id),
       ("Unknown element with invalid id : ", p->attrs["id"]) );
 
     // try to get type from element tags
@@ -476,7 +476,7 @@ protected:
         if (p->childs[i].name == "nd")
         {
           uint64_t nodeID;
-          VERIFY ( string_utils::to_uint64(p->childs[i].attrs["ref"], nodeID),
+          VERIFY ( strings::to_uint64(p->childs[i].attrs["ref"], nodeID),
                    ("Bad node ref in way : ", p->childs[i].attrs["ref"]) );
 
           m2::PointD pt;
@@ -534,7 +534,7 @@ protected:
         {
           string const & role = p->childs[i].attrs["role"];
           uint64_t wayID;
-          VERIFY ( string_utils::to_uint64(p->childs[i].attrs["ref"], wayID),
+          VERIFY ( strings::to_uint64(p->childs[i].attrs["ref"], wayID),
             ("Bad way ref in relation : ", p->childs[i].attrs["ref"]) );
 
           if (role == "outer")
diff --git a/generator/osm_xml_parser.cpp b/generator/osm_xml_parser.cpp
index abcc4e2300..aff442688d 100644
--- a/generator/osm_xml_parser.cpp
+++ b/generator/osm_xml_parser.cpp
@@ -212,21 +212,21 @@ namespace osm
     string const & elem = m_xmlTags.back();
     if (attr == "id" && (elem == "node" || elem == "way" || elem == "relation"))
     {
-      CHECK(string_utils::to_int64(value, m_id), ());
+      CHECK(strings::to_int64(value, m_id), ());
       CHECK_NOT_EQUAL(m_id, 0, ("id == 0 is invalid"));
     }
     else if (attr == "lat" && elem == "node")
     {
-      CHECK(string_utils::to_double(value, m_lat), ());
+      CHECK(strings::to_double(value, m_lat), ());
     }
     else if (attr == "lon" && elem == "node")
     {
-      CHECK(string_utils::to_double(value, m_lon), ());
+      CHECK(strings::to_double(value, m_lon), ());
     }
     else if (attr == "ref")
     {
       int64_t numVal;
-      CHECK(string_utils::to_int64(value, numVal), ());
+      CHECK(strings::to_int64(value, numVal), ());
       if (elem == "nd")
         m_ref = numVal;
       else if (elem == "member")
diff --git a/generator/statistics.cpp b/generator/statistics.cpp
index 6119e96b60..aba55716fc 100644
--- a/generator/statistics.cpp
+++ b/generator/statistics.cpp
@@ -102,7 +102,7 @@ namespace stats
 
   string GetKey(uint32_t i)
   {
-    return string_utils::to_string(i);
+    return strings::to_string(i);
   }
 
   string GetKey(TypeTag t)
diff --git a/indexer/drawing_rule_def.cpp b/indexer/drawing_rule_def.cpp
index a889c2532a..aefcbc6d26 100644
--- a/indexer/drawing_rule_def.cpp
+++ b/indexer/drawing_rule_def.cpp
@@ -23,7 +23,7 @@ namespace drule
   {
     int * arrParams[] = { &m_scale, &m_type, &m_index, &m_priority };
 
-    string_utils::TokenizeIterator it(s, "|");
+    strings::TokenizeIterator it(s, "|");
     size_t i = 0;
     while (!it.end())
     {
diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp
index bb129742e1..83e241fc39 100644
--- a/indexer/drawing_rules.cpp
+++ b/indexer/drawing_rules.cpp
@@ -42,13 +42,13 @@ namespace drule {
   template <> double get_value<double>(string const & s)
   {
     double d;
-    VERIFY ( string_utils::to_double(s, d), ("Bad double in drawing rule : ", s) );
+    VERIFY ( strings::to_double(s, d), ("Bad double in drawing rule : ", s) );
     return d;
   }
   template <> string get_value<string>(string const & s)
   {
     string ss(s);
-    string_utils::make_lower_case(ss);
+    strings::make_lower_case(ss);
     return ss;
   }
   //@}
@@ -213,7 +213,7 @@ namespace drule {
   template <> dash_array_t get_value<dash_array_t>(string const & s)
   {
     dash_array_t ret;
-    string_utils::TokenizeString(s, " \tpx,", bind(&dash_array_t::add, ref(ret), _1));
+    strings::TokenizeString(s, " \tpx,", bind(&dash_array_t::add, ref(ret), _1));
 
     /// @see http://www.w3.org/TR/SVG/painting.html stroke-dasharray
     size_t const count = ret.m_v.size();
@@ -866,10 +866,10 @@ Key RulesHolder::CreateRuleImpl1(string const & name,
 #endif
 
   attrs_map_t a;
-  string_utils::TokenizeString(clValue, " \t", bind(&RulesHolder::PushAttributes, this, _1, ref(a)));
+  strings::TokenizeString(clValue, " \t", bind(&RulesHolder::PushAttributes, this, _1, ref(a)));
 
   for (attrs_map_t::const_iterator i = attrs.begin(); i != attrs.end(); ++i)
-    if (!string_utils::IsInArray(arrClassTags, i->first))
+    if (!strings::IsInArray(arrClassTags, i->first))
       a[i->first] = i->second;
 
   // background color (imitation of masks in tunnel patterns)
diff --git a/map/information_display.cpp b/map/information_display.cpp
index 3e36de81d3..a9e7325bc8 100644
--- a/map/information_display.cpp
+++ b/map/information_display.cpp
@@ -139,9 +139,9 @@ void InformationDisplay::drawRuler(DrawerYG * pDrawer)
       scalerText = "<";
 
     if (curVal >= 1000)
-      scalerText += string_utils::to_string(curVal / 1000) + " km";
+      scalerText += strings::to_string(curVal / 1000) + " km";
     else
-      scalerText += string_utils::to_string(curVal) + " m";
+      scalerText += strings::to_string(curVal) + " m";
 
   m2::PointD scalerOrg = m2::PointD(m_displayRect.minX(), m_displayRect.maxY() - m_bottomShift * m_visualScale) + m2::PointD(10 * m_visualScale, -10 * m_visualScale);
 
diff --git a/map/languages.cpp b/map/languages.cpp
index ac7249d23c..effba1a417 100644
--- a/map/languages.cpp
+++ b/map/languages.cpp
@@ -99,7 +99,7 @@ namespace languages
 
     CodesT currentCodes;
     Collector c(currentCodes);
-    string_utils::TokenizeString(settingsString, LANG_DELIMETER, c);
+    strings::TokenizeString(settingsString, LANG_DELIMETER, c);
 
     GetSupportedLanguages(outLanguages);
     Sort(currentCodes, outLanguages);
@@ -108,7 +108,7 @@ namespace languages
   void SaveSettings(CodesT const & langs)
   {
     CHECK_EQUAL(langs.size(), MAX_SUPPORTED_LANGUAGES, ());
-    string const saveString = string_utils::JoinStrings(langs.begin(), langs.end(), LANG_DELIMETER);
+    string const saveString = strings::JoinStrings(langs.begin(), langs.end(), LANG_DELIMETER);
     Settings::Set(SETTING_LANG_KEY, saveString);
 
     // apply new settings
diff --git a/platform/wifi_info_mac.mm b/platform/wifi_info_mac.mm
index 9da4857ed1..844d1c2dbe 100644
--- a/platform/wifi_info_mac.mm
+++ b/platform/wifi_info_mac.mm
@@ -62,12 +62,12 @@ static string AppendZeroIfNeeded(string const & macAddrPart)
     CWNetwork * net = (CWNetwork *)[nets objectAtIndex:i];
     WiFiInfo::AccessPoint apn;
     apn.m_ssid = [net.ssid UTF8String];
-    apn.m_signalStrength = string_utils::to_string([net.rssi intValue]);
+    apn.m_signalStrength = strings::to_string([net.rssi intValue]);
     // fix formatting for wifi address
     string const rawBssid = [net.bssid UTF8String];
     if (!rawBssid.empty())
     {
-      string_utils::TokenizeIterator tokIt(rawBssid, ":");
+      strings::TokenizeIterator tokIt(rawBssid, ":");
       apn.m_bssid = AppendZeroIfNeeded(*tokIt);
       do
       {
diff --git a/storage/storage.cpp b/storage/storage.cpp
index dc822bce9f..08d0babb17 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -83,7 +83,7 @@ namespace storage
 
   string Storage::UpdateBaseUrl() const
   {
-    return UPDATE_BASE_URL OMIM_OS_NAME "/" + string_utils::to_string(m_currentVersion) + "/";
+    return UPDATE_BASE_URL OMIM_OS_NAME "/" + strings::to_string(m_currentVersion) + "/";
   }
 
   TCountriesContainer const & NodeFromIndex(TCountriesContainer const & root, TIndex const & index)
diff --git a/yg/glyph_cache.cpp b/yg/glyph_cache.cpp
index 3daa7be166..0559f7c9dd 100644
--- a/yg/glyph_cache.cpp
+++ b/yg/glyph_cache.cpp
@@ -240,7 +240,7 @@ namespace yg
 
   double GlyphCache::getTextLength(double fontSize, string const & text)
   {
-    wstring s = string_utils::FromUtf8(text);
+    wstring s = strings::FromUtf8(text);
     double len = 0;
     for (unsigned i = 0; i < s.size(); ++i)
     {
diff --git a/yg/skin_loader.cpp b/yg/skin_loader.cpp
index 513a365634..afaffa8366 100644
--- a/yg/skin_loader.cpp
+++ b/yg/skin_loader.cpp
@@ -161,7 +161,7 @@ namespace yg
   int StrToInt(string const & s)
   {
     int i;
-    VERIFY ( string_utils::to_int(s, i), ("Bad int int StrToInt function") );
+    VERIFY ( strings::to_int(s, i), ("Bad int int StrToInt function") );
     return i;
   }
 
diff --git a/yg/text_renderer.cpp b/yg/text_renderer.cpp
index e76ab53beb..b6807fd35b 100644
--- a/yg/text_renderer.cpp
+++ b/yg/text_renderer.cpp
@@ -249,7 +249,7 @@ namespace yg
 
     void TextRenderer::drawTextImpl(FontDesc const & fontDesc, m2::PointD const & pt, yg::EPosition pos, float angle, string const & utf8Text, double depth, bool log2vis)
     {
-      wstring text = string_utils::FromUtf8(utf8Text);
+      wstring text = strings::FromUtf8(utf8Text);
 
       if (log2vis)
         text = Log2Vis(text);
@@ -292,7 +292,7 @@ namespace yg
       m2::RectD rect;
       m2::PointD pt(0, 0);
 
-      wstring text = string_utils::FromUtf8(utf8Text);
+      wstring text = strings::FromUtf8(utf8Text);
       if (log2vis)
         text = Log2Vis(text);
 
@@ -350,7 +350,7 @@ namespace yg
         FontDesc const & fontDesc, m2::PointD const * path, size_t s, string const & utf8Text,
         double fullLength, double pathOffset, yg::EPosition pos, double depth)
     {
-      wstring const text = Log2Vis(string_utils::FromUtf8(utf8Text));
+      wstring const text = Log2Vis(strings::FromUtf8(utf8Text));
 
       GlyphLayout layout(resourceManager(), fontDesc, path, s, text, fullLength, pathOffset, pos);