diff --git a/coding/coding_tests/file_utils_test.cpp b/coding/coding_tests/file_utils_test.cpp
index 5293d3608f..35fbf51fec 100644
--- a/coding/coding_tests/file_utils_test.cpp
+++ b/coding/coding_tests/file_utils_test.cpp
@@ -76,10 +76,10 @@ UNIT_TEST(FilePath_Slash)
 
 UNIT_TEST(FilePath_Join)
 {
-  TEST_EQUAL("omim/strings.txt", base::JoinFoldersToPath("omim", "strings.txt"), ());
-  TEST_EQUAL("omim/strings.txt", base::JoinFoldersToPath("omim/", "strings.txt"), ());
-  TEST_EQUAL("../../omim/strings.txt", base::JoinFoldersToPath({"..", "..", "omim"}, "strings.txt"), ());
-  TEST_EQUAL("../../omim/strings.txt", base::JoinFoldersToPath({"../", "..", "omim/"}, "strings.txt"), ());
+  TEST_EQUAL("omim/strings.txt", base::JoinPath("omim", "strings.txt"), ());
+  TEST_EQUAL("omim/strings.txt", base::JoinPath("omim/", "strings.txt"), ());
+  TEST_EQUAL("../../omim/strings.txt", base::JoinPath("..", "..", "omim", "strings.txt"), ());
+  TEST_EQUAL("../../omim/strings.txt", base::JoinPath("../", "..", "omim/", "strings.txt"), ());
 }
 
 #endif // OMIM_OS_WINDOWS
diff --git a/coding/file_name_utils.cpp b/coding/file_name_utils.cpp
index fc74539e1e..656bdc816a 100644
--- a/coding/file_name_utils.cpp
+++ b/coding/file_name_utils.cpp
@@ -62,21 +62,6 @@ string GetNativeSeparator()
 #endif
 }
 
-string JoinFoldersToPath(const string & folder, const string & file)
-{
-  return base::AddSlashIfNeeded(folder) + file;
-}
-
-string JoinFoldersToPath(initializer_list<string> const & folders, const string & file)
-{
-  string result;
-  for (string const & s : folders)
-    result += AddSlashIfNeeded(s);
-
-  result += file;
-  return result;
-}
-
 string AddSlashIfNeeded(string const & path)
 {
   string const sep = GetNativeSeparator();
diff --git a/coding/file_name_utils.hpp b/coding/file_name_utils.hpp
index f39ca0bb00..83424b14dd 100644
--- a/coding/file_name_utils.hpp
+++ b/coding/file_name_utils.hpp
@@ -26,11 +26,6 @@ std::string GetDirectory(std::string const & path);
 /// Get folder separator for specific platform
 std::string GetNativeSeparator();
 
-/// @deprecated use JoinPath instead.
-std::string JoinFoldersToPath(std::string const & folder, std::string const & file);
-std::string JoinFoldersToPath(std::initializer_list<std::string> const & folders,
-                              std::string const & file);
-
 /// Add the terminating slash to the folder path std::string if it's not already there.
 std::string AddSlashIfNeeded(std::string const & path);
 
diff --git a/editor/editor_tests/editor_notes_test.cpp b/editor/editor_tests/editor_notes_test.cpp
index 8d1b868333..fc863e76e7 100644
--- a/editor/editor_tests/editor_notes_test.cpp
+++ b/editor/editor_tests/editor_notes_test.cpp
@@ -16,7 +16,7 @@ using platform::tests_support::ScopedFile;
 UNIT_TEST(Notes_Smoke)
 {
   auto const fileName = "notes.xml";
-  auto const fullFileName = base::JoinFoldersToPath({GetPlatform().WritableDir()}, fileName);
+  auto const fullFileName = base::JoinPath(GetPlatform().WritableDir(), fileName);
   ScopedFile sf(fileName, ScopedFile::Mode::DoNotCreate);
   {
     auto const notes = Notes::MakeNotes(fullFileName, true);
diff --git a/generator/booking_quality_check/booking_addr_match.cpp b/generator/booking_quality_check/booking_addr_match.cpp
index eeff581d2b..82883ca39a 100644
--- a/generator/booking_quality_check/booking_addr_match.cpp
+++ b/generator/booking_quality_check/booking_addr_match.cpp
@@ -57,7 +57,7 @@ int main(int argc, char * argv[])
   if (!FLAGS_user_resource_path.empty())
   {
     platform.SetResourceDir(FLAGS_user_resource_path);
-    countriesFile = base::JoinFoldersToPath(FLAGS_user_resource_path, COUNTRIES_FILE);
+    countriesFile = base::JoinPath(FLAGS_user_resource_path, COUNTRIES_FILE);
   }
 
   if (!FLAGS_data_path.empty())
diff --git a/generator/borders_loader.cpp b/generator/borders_loader.cpp
index effca15af8..283040081b 100644
--- a/generator/borders_loader.cpp
+++ b/generator/borders_loader.cpp
@@ -169,13 +169,13 @@ void UnpackBorders(string const & baseDir, string const & targetDir)
     MYTHROW(FileSystemException, ("Unable to find or create directory", targetDir));
 
   vector<storage::CountryDef> countries;
-  FilesContainerR reader(base::JoinFoldersToPath(baseDir, PACKED_POLYGONS_FILE));
+  FilesContainerR reader(base::JoinPath(baseDir, PACKED_POLYGONS_FILE));
   ReaderSource<ModelReaderPtr> src(reader.GetReader(PACKED_POLYGONS_INFO_TAG));
   rw::Read(src, countries);
 
   for (size_t id = 0; id < countries.size(); id++)
   {
-    ofstream poly(base::JoinFoldersToPath(targetDir, countries[id].m_countryId + ".poly"));
+    ofstream poly(base::JoinPath(targetDir, countries[id].m_countryId + ".poly"));
     poly << countries[id].m_countryId << endl;
     src = reader.GetReader(strings::to_string(id));
     uint32_t const count = ReadVarUint<uint32_t>(src);
diff --git a/generator/generate_info.hpp b/generator/generate_info.hpp
index 29ced81bd1..36ad67ef3e 100644
--- a/generator/generate_info.hpp
+++ b/generator/generate_info.hpp
@@ -97,19 +97,19 @@ struct GenerateInfo
   std::string GetTmpFileName(std::string const & fileName,
                              std::string const & ext = DATA_FILE_EXTENSION_TMP) const
   {
-    return base::JoinFoldersToPath(m_tmpDir, fileName + ext);
+    return base::JoinPath(m_tmpDir, fileName + ext);
   }
 
   std::string GetTargetFileName(std::string const & fileName,
                                 std::string const & ext = DATA_FILE_EXTENSION) const
   {
-    return base::JoinFoldersToPath(m_targetDir, fileName + ext);
+    return base::JoinPath(m_targetDir, fileName + ext);
   }
 
   std::string GetIntermediateFileName(std::string const & fileName,
                                       std::string const & ext = "") const
   {
-    return base::JoinFoldersToPath(m_intermediateDir, fileName + ext);
+    return base::JoinPath(m_intermediateDir, fileName + ext);
   }
 
   std::string GetAddressesFileName() const
diff --git a/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp b/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp
index eadb067372..3eb7002914 100644
--- a/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp
+++ b/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp
@@ -26,13 +26,10 @@ UNIT_TEST(IncrementalUpdates_Smoke)
 {
   base::ScopedLogAbortLevelChanger ignoreLogError(base::LogLevel::LCRITICAL);
 
-  string const oldMwmPath = base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass.mwm");
-  string const newMwmPath1 =
-      base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass-new1.mwm");
-  string const newMwmPath2 =
-      base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass-new2.mwm");
-  string const diffPath =
-      base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass.mwmdiff");
+  string const oldMwmPath = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass.mwm");
+  string const newMwmPath1 = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass-new1.mwm");
+  string const newMwmPath2 = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass-new2.mwm");
+  string const diffPath = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass.mwmdiff");
 
   SCOPE_GUARD(cleanup, [&] {
     FileWriter::DeleteFileX(newMwmPath1);
diff --git a/indexer/indexer_tests/centers_table_test.cpp b/indexer/indexer_tests/centers_table_test.cpp
index a0207931fd..4fa2b265e0 100644
--- a/indexer/indexer_tests/centers_table_test.cpp
+++ b/indexer/indexer_tests/centers_table_test.cpp
@@ -34,7 +34,7 @@ struct CentersTableTest
 
 UNIT_CLASS_TEST(CentersTableTest, Smoke)
 {
-  string const kMap = base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass.mwm");
+  string const kMap = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass.mwm");
 
   feature::DataHeader header(kMap);
   auto const codingParams = header.GetDefGeometryCodingParams();
diff --git a/indexer/indexer_tests/rank_table_test.cpp b/indexer/indexer_tests/rank_table_test.cpp
index d138ab1eb8..9a95f24ecc 100644
--- a/indexer/indexer_tests/rank_table_test.cpp
+++ b/indexer/indexer_tests/rank_table_test.cpp
@@ -76,9 +76,8 @@ UNIT_TEST(RankTableBuilder_EndToEnd)
 {
   classificator::Load();
 
-  string const originalMapPath =
-      base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass.mwm");
-  string const mapPath = base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass-copy.mwm");
+  string const originalMapPath = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass.mwm");
+  string const mapPath = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass-copy.mwm");
   base::CopyFileX(originalMapPath, mapPath);
   SCOPE_GUARD(cleanup, bind(&FileWriter::DeleteFileX, mapPath));
 
diff --git a/indexer/map_style_reader.cpp b/indexer/map_style_reader.cpp
index efb77d543c..e1eb9b120a 100644
--- a/indexer/map_style_reader.cpp
+++ b/indexer/map_style_reader.cpp
@@ -98,7 +98,7 @@ ReaderPtr<Reader> StyleReader::GetDrawingRulesReader() const
       std::string("drules_proto") + GetStyleRulesSuffix(GetCurrentStyle()) + ".bin";
 
   auto overriddenRulesFile =
-      base::JoinFoldersToPath({GetPlatform().WritableDir(), kStylesOverrideDir}, rulesFile);
+      base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, rulesFile);
   if (GetPlatform().IsFileExistsByFullPath(overriddenRulesFile))
     rulesFile = overriddenRulesFile;
 
@@ -110,10 +110,9 @@ ReaderPtr<Reader> StyleReader::GetResourceReader(std::string const & file,
 {
   std::string const resourceDir =
       std::string("resources-") + density + GetStyleResourcesSuffix(GetCurrentStyle());
-  std::string resFile = base::JoinFoldersToPath(resourceDir, file);
+  std::string resFile = base::JoinPath(resourceDir, file);
 
-  auto overriddenResFile =
-      base::JoinFoldersToPath({GetPlatform().WritableDir(), kStylesOverrideDir}, resFile);
+  auto overriddenResFile = base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, resFile);
   if (GetPlatform().IsFileExistsByFullPath(overriddenResFile))
     resFile = overriddenResFile;
 
@@ -122,7 +121,7 @@ ReaderPtr<Reader> StyleReader::GetResourceReader(std::string const & file,
 
 ReaderPtr<Reader> StyleReader::GetDefaultResourceReader(std::string const & file) const
 {
-  return GetPlatform().GetReader(base::JoinFoldersToPath("resources-default", file));
+  return GetPlatform().GetReader(base::JoinPath("resources-default", file));
 }
 
 StyleReader & GetStyleReader()
diff --git a/local_ads/statistics.cpp b/local_ads/statistics.cpp
index 5b19de28ac..2ebab84772 100644
--- a/local_ads/statistics.cpp
+++ b/local_ads/statistics.cpp
@@ -135,7 +135,7 @@ std::string GetClientIdHash()
 
 std::string GetPath(std::string const & fileName)
 {
-  return base::JoinFoldersToPath({GetPlatform().SettingsDir(), kStatisticsFolderName}, fileName);
+  return base::JoinPath(GetPlatform().SettingsDir(), kStatisticsFolderName, fileName);
 }
 
 std::string GetPath(local_ads::Event const & event)
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 54be93ca7b..c534b99ea2 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -357,7 +357,7 @@ bool MigrateIfNeeded()
   }
 
   for (auto & f : files)
-    f = base::JoinFoldersToPath(dir, f);
+    f = base::JoinPath(dir, f);
 
   std::string failedStage;
   auto const backupDir = CheckAndCreateBackupFolder();
diff --git a/map/cloud.cpp b/map/cloud.cpp
index c01f98b0ee..681d1a764f 100644
--- a/map/cloud.cpp
+++ b/map/cloud.cpp
@@ -831,7 +831,7 @@ std::string Cloud::PrepareFileToUploading(std::string const & fileName, std::str
 
   // 3. Create a temporary file from the original uploading file.
   auto name = ExtractFileNameWithoutExtension(filePath);
-  auto const tmpPath = base::JoinFoldersToPath(GetPlatform().TmpDir(), name + ".tmp");
+  auto const tmpPath = base::JoinPath(GetPlatform().TmpDir(), name + ".tmp");
   if (!base::CopyFileX(filePath, tmpPath))
     return {};
 
@@ -844,8 +844,7 @@ std::string Cloud::PrepareFileToUploading(std::string const & fileName, std::str
   if (originalSha1 != tmpSha1)
     return {};
 
-  auto const outputPath = base::JoinFoldersToPath(GetPlatform().TmpDir(),
-                                                name + ".uploaded");
+  auto const outputPath = base::JoinPath(GetPlatform().TmpDir(), name + ".uploaded");
 
   // 5. Convert temporary file and save to output path.
   CHECK(m_params.m_backupConverter, ());
diff --git a/map/gps_tracker.cpp b/map/gps_tracker.cpp
index 6ca9e44495..c1a391b5bd 100644
--- a/map/gps_tracker.cpp
+++ b/map/gps_tracker.cpp
@@ -20,7 +20,7 @@ size_t constexpr kMaxItemCount = 100000; // > 24h with 1point/s
 
 inline string GetFilePath()
 {
-  return base::JoinFoldersToPath(GetPlatform().WritableDir(), GPS_TRACK_FILENAME);
+  return base::JoinPath(GetPlatform().WritableDir(), GPS_TRACK_FILENAME);
 }
 
 inline bool GetSettingsIsEnabled()
diff --git a/map/local_ads_manager.cpp b/map/local_ads_manager.cpp
index 0326c18a82..a310a3c027 100644
--- a/map/local_ads_manager.cpp
+++ b/map/local_ads_manager.cpp
@@ -77,7 +77,7 @@ void DeserializeCampaign(ReaderSource<FileReader> & src, std::string & countryNa
 
 std::string GetPath(std::string const & fileName)
 {
-  return base::JoinFoldersToPath(GetPlatform().SettingsDir(), fileName);
+  return base::JoinPath(GetPlatform().SettingsDir(), fileName);
 }
 
 std::string MakeCampaignDownloadingURL(MwmSet::MwmId const & mwmId)
diff --git a/map/map_tests/gps_track_storage_test.cpp b/map/map_tests/gps_track_storage_test.cpp
index a07e454786..bb35a49b52 100644
--- a/map/map_tests/gps_track_storage_test.cpp
+++ b/map/map_tests/gps_track_storage_test.cpp
@@ -30,7 +30,7 @@ location::GpsInfo Make(double timestamp, ms::LatLon const & ll, double speed)
 
 inline string GetGpsTrackFilePath()
 {
-  return base::JoinFoldersToPath(GetPlatform().WritableDir(), "gpstrack_test.bin");
+  return base::JoinPath(GetPlatform().WritableDir(), "gpstrack_test.bin");
 }
 
 } // namespace
diff --git a/map/map_tests/gps_track_test.cpp b/map/map_tests/gps_track_test.cpp
index 768ef85771..07f7398224 100644
--- a/map/map_tests/gps_track_test.cpp
+++ b/map/map_tests/gps_track_test.cpp
@@ -32,7 +32,7 @@ inline location::GpsInfo Make(double timestamp, ms::LatLon const & ll, double sp
 
 inline string GetGpsTrackFilePath()
 {
-  return base::JoinFoldersToPath(GetPlatform().WritableDir(), "gpstrack_test.bin");
+  return base::JoinPath(GetPlatform().WritableDir(), "gpstrack_test.bin");
 }
 
 class GpsTrackCallback
diff --git a/openlr/openlr_stat/openlr_stat.cpp b/openlr/openlr_stat/openlr_stat.cpp
index 96a423ffda..3bf197c628 100644
--- a/openlr/openlr_stat/openlr_stat.cpp
+++ b/openlr/openlr_stat/openlr_stat.cpp
@@ -73,7 +73,7 @@ void LoadDataSources(std::string const & pathToMWMFolder,
 
   for (auto const & fileName : files)
   {
-    auto const fullFileName = base::JoinFoldersToPath({pathToMWMFolder}, fileName);
+    auto const fullFileName = base::JoinPath(pathToMWMFolder, fileName);
     ModelReaderPtr reader(GetPlatform().GetReader(fullFileName, "f"));
     platform::LocalCountryFile localFile(pathToMWMFolder,
                                          platform::CountryFile(base::FilenameWithoutExt(fileName)),
diff --git a/qt/build_style/build_common.cpp b/qt/build_style/build_common.cpp
index b17c3545ce..0b683c7745 100644
--- a/qt/build_style/build_common.cpp
+++ b/qt/build_style/build_common.cpp
@@ -46,8 +46,8 @@ bool CopyFile(QString const & oldFile, QString const & newFile)
 void CopyFromResources(QString const & name, QString const & output)
 {
   QString const resourceDir = GetPlatform().ResourcesDir().c_str();
-  if (!CopyFile(JoinFoldersToPath({resourceDir, name}),
-                JoinFoldersToPath({output, name})))
+  if (!CopyFile(JoinPathQt({resourceDir, name}),
+                JoinPathQt({output, name})))
   {
     throw std::runtime_error(std::string("Cannot copy file ") +
                              name.toStdString() +
@@ -58,8 +58,8 @@ void CopyFromResources(QString const & name, QString const & output)
 void CopyToResources(QString const & name, QString const & input, QString const & newName)
 {
   QString const resourceDir = GetPlatform().ResourcesDir().c_str();
-  if (!CopyFile(JoinFoldersToPath({input, name}),
-                JoinFoldersToPath({resourceDir, newName.isEmpty() ? name : newName})))
+  if (!CopyFile(JoinPathQt({input, name}),
+                JoinPathQt({resourceDir, newName.isEmpty() ? name : newName})))
   {
     throw std::runtime_error(std::string("Cannot copy file ") +
                              name.toStdString() +
@@ -67,7 +67,7 @@ void CopyToResources(QString const & name, QString const & input, QString const
   }
 }
 
-QString JoinFoldersToPath(std::initializer_list<QString> const & folders)
+QString JoinPathQt(std::initializer_list<QString> const & folders)
 {
   QString result;
   bool firstInserted = false;
@@ -89,9 +89,9 @@ QString GetExternalPath(QString const & name, QString const & primaryPath,
                         QString const & secondaryPath)
 {
   QString const resourceDir = GetPlatform().ResourcesDir().c_str();
-  QString path = JoinFoldersToPath({resourceDir, primaryPath, name});
+  QString path = JoinPathQt({resourceDir, primaryPath, name});
   if (!QFileInfo::exists(path))
-    path = JoinFoldersToPath({resourceDir, secondaryPath, name});
+    path = JoinPathQt({resourceDir, secondaryPath, name});
 
   // Special case for looking for in application folder.
   if (!QFileInfo::exists(path) && secondaryPath.isEmpty())
@@ -100,7 +100,7 @@ QString GetExternalPath(QString const & name, QString const & primaryPath,
     QRegExp rx("(/[^/]*\\.app)", Qt::CaseInsensitive);
     int i = rx.indexIn(appPath);
     if (i >= 0)
-      path = JoinFoldersToPath({appPath.left(i), name});
+      path = JoinPathQt({appPath.left(i), name});
   }
   return path;
 }
diff --git a/qt/build_style/build_common.h b/qt/build_style/build_common.h
index ca3382ae43..3d5fda1972 100644
--- a/qt/build_style/build_common.h
+++ b/qt/build_style/build_common.h
@@ -16,7 +16,7 @@ bool CopyFile(QString const & oldFile, QString const & newFile);
 void CopyFromResources(QString const & name, QString const & output);
 void CopyToResources(QString const & name, QString const & input, QString const & newName = "");
 
-QString JoinFoldersToPath(std::initializer_list<QString> const & folders);
+QString JoinPathQt(std::initializer_list<QString> const & folders);
 
 QString GetExternalPath(QString const & name, QString const & primaryPath,
                         QString const & secondaryPath);
diff --git a/qt/build_style/build_drules.cpp b/qt/build_style/build_drules.cpp
index 3c8a680427..0de3b56e96 100644
--- a/qt/build_style/build_drules.cpp
+++ b/qt/build_style/build_drules.cpp
@@ -24,7 +24,7 @@ namespace build_style
 {
 void BuildDrawingRulesImpl(QString const & mapcssFile, QString const & outputDir)
 {
-  QString const outputTemplate = JoinFoldersToPath({outputDir, "drules_proto_design"});
+  QString const outputTemplate = JoinPathQt({outputDir, "drules_proto_design"});
   QString const outputFile = outputTemplate + ".bin";
 
   // Caller ensures that output directory is clear
diff --git a/qt/build_style/build_skins.cpp b/qt/build_style/build_skins.cpp
index b76ee09321..7bf0a14d7b 100644
--- a/qt/build_style/build_skins.cpp
+++ b/qt/build_style/build_skins.cpp
@@ -123,7 +123,7 @@ std::unordered_map<string, int> GetSkinSizes(QString const & file)
 void BuildSkinImpl(QString const & styleDir, QString const & suffix,
                    int size, bool colorCorrection, QString const & outputDir)
 {
-  QString const symbolsDir = JoinFoldersToPath({styleDir, "symbols"});
+  QString const symbolsDir = JoinPathQt({styleDir, "symbols"});
 
   // Check symbols directory exists
   if (!QDir(symbolsDir).exists())
@@ -139,7 +139,7 @@ void BuildSkinImpl(QString const & styleDir, QString const & suffix,
 
   // Create symbolic link for symbols/png
   QString const pngOriginDir = styleDir + suffix;
-  QString const pngDir = JoinFoldersToPath({styleDir, "symbols", "png"});
+  QString const pngDir = JoinPathQt({styleDir, "symbols", "png"});
   QFile::remove(pngDir);
   if (!QFile::link(pngOriginDir, pngDir))
     throw std::runtime_error("Unable to create symbols/png link");
@@ -151,7 +151,7 @@ void BuildSkinImpl(QString const & styleDir, QString const & suffix,
           "--symbolWidth" << to_string(size).c_str() <<
           "--symbolHeight" << to_string(size).c_str() <<
           "--symbolsDir" << symbolsDir <<
-          "--skinName" << JoinFoldersToPath({outputDir, "basic"}) <<
+          "--skinName" << JoinPathQt({outputDir, "basic"}) <<
           "--skinSuffix=\"\"";
   if (colorCorrection)
     params << "--colorCorrection true";
@@ -170,8 +170,8 @@ void BuildSkinImpl(QString const & styleDir, QString const & suffix,
   }
 
   // Check files were created
-  if (QFile(JoinFoldersToPath({outputDir, "symbols.png"})).size() == 0 ||
-      QFile(JoinFoldersToPath({outputDir, "symbols.sdf"})).size() == 0)
+  if (QFile(JoinPathQt({outputDir, "symbols.png"})).size() == 0 ||
+      QFile(JoinPathQt({outputDir, "symbols.sdf"})).size() == 0)
   {
     throw std::runtime_error("Skin files have not been created");
   }
@@ -179,14 +179,14 @@ void BuildSkinImpl(QString const & styleDir, QString const & suffix,
 
 void BuildSkins(QString const & styleDir, QString const & outputDir)
 {
-  QString const resolutionFilePath = JoinFoldersToPath({styleDir, "resolutions.txt"});
+  QString const resolutionFilePath = JoinPathQt({styleDir, "resolutions.txt"});
 
   auto const resolution2size = GetSkinSizes(resolutionFilePath);
 
   for (SkinType s : g_skinTypes)
   {
     QString const suffix = SkinSuffix(s);
-    QString const outputSkinDir = JoinFoldersToPath({outputDir, "resources-" + suffix + "_design"});
+    QString const outputSkinDir = JoinPathQt({outputDir, "resources-" + suffix + "_design"});
     int const size = resolution2size.at(to_string(suffix)); // SkinSize(s);
     bool const colorCorrection = SkinCoorrectColor(s);
 
@@ -201,16 +201,16 @@ void ApplySkins(QString const & outputDir)
   for (SkinType s : g_skinTypes)
   {
     QString const suffix = SkinSuffix(s);
-    QString const outputSkinDir = JoinFoldersToPath({outputDir, "resources-" + suffix + "_design"});
-    QString const resourceSkinDir = JoinFoldersToPath({resourceDir, "resources-" + suffix + "_design"});
+    QString const outputSkinDir = JoinPathQt({outputDir, "resources-" + suffix + "_design"});
+    QString const resourceSkinDir = JoinPathQt({resourceDir, "resources-" + suffix + "_design"});
 
     if (!QFileInfo::exists(resourceSkinDir) && !QDir().mkdir(resourceSkinDir))
       throw std::runtime_error("Cannot create resource skin directory: " + resourceSkinDir.toStdString());
 
-    if (!CopyFile(JoinFoldersToPath({outputSkinDir, "symbols.png"}),
-                  JoinFoldersToPath({resourceSkinDir, "symbols.png"})) ||
-        !CopyFile(JoinFoldersToPath({outputSkinDir, "symbols.sdf"}),
-                  JoinFoldersToPath({resourceSkinDir, "symbols.sdf"})))
+    if (!CopyFile(JoinPathQt({outputSkinDir, "symbols.png"}),
+                  JoinPathQt({resourceSkinDir, "symbols.png"})) ||
+        !CopyFile(JoinPathQt({outputSkinDir, "symbols.sdf"}),
+                  JoinPathQt({resourceSkinDir, "symbols.sdf"})))
     {
       throw std::runtime_error("Cannot copy skins files");
     }
diff --git a/qt/build_style/build_statistics.cpp b/qt/build_style/build_statistics.cpp
index 84b3a4765d..f19596b0b1 100644
--- a/qt/build_style/build_statistics.cpp
+++ b/qt/build_style/build_statistics.cpp
@@ -58,8 +58,8 @@ QString GetStyleStatistics(QString const & mapcssMappingFile, QString const & dr
 QString GetCurrentStyleStatistics()
 {
   QString const resourceDir = GetPlatform().ResourcesDir().c_str();
-  QString const mappingPath = JoinFoldersToPath({resourceDir, "mapcss-mapping.csv"});
-  QString const drulesPath = JoinFoldersToPath({resourceDir, "drules_proto_design.bin"});
+  QString const mappingPath = JoinPathQt({resourceDir, "mapcss-mapping.csv"});
+  QString const drulesPath = JoinPathQt({resourceDir, "drules_proto_design.bin"});
   return GetStyleStatistics(mappingPath, drulesPath);
 }
 }  // namespace build_style
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index 456cc6e790..e44ea5173a 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -756,7 +756,7 @@ void MainWindow::OnBuildPhonePackage()
     QString const targetDir = QFileDialog::getExistingDirectory(nullptr, "Choose output directory");
     if (targetDir.isEmpty())
       return;
-    auto outDir = QDir(JoinFoldersToPath({targetDir, kStylesFolder}));
+    auto outDir = QDir(JoinPathQt({targetDir, kStylesFolder}));
     if (outDir.exists())
     {
       QMessageBox msgBox;
@@ -769,13 +769,13 @@ void MainWindow::OnBuildPhonePackage()
         throw std::runtime_error(std::string("Target directory exists: ") + outDir.absolutePath().toStdString());
     }
 
-    QString const stylesDir = JoinFoldersToPath({m_mapcssFilePath, "..", "..", ".."});
-    if (!QDir(JoinFoldersToPath({stylesDir, kClearStyleFolder})).exists())
+    QString const stylesDir = JoinPathQt({m_mapcssFilePath, "..", "..", ".."});
+    if (!QDir(JoinPathQt({stylesDir, kClearStyleFolder})).exists())
       throw std::runtime_error(std::string("Styles folder is not found in ") + stylesDir.toStdString());
 
     QString text = build_style::RunBuildingPhonePack(stylesDir, targetDir);
     text.append("\nMobile device style package is in the directory: ");
-    text.append(JoinFoldersToPath({targetDir, kStylesFolder}));
+    text.append(JoinPathQt({targetDir, kStylesFolder}));
     text.append(". Copy it to your mobile device.\n");
     InfoDialog dlg(QString("Building phone pack"), text, nullptr);
     dlg.exec();
diff --git a/search/pysearch/bindings.cpp b/search/pysearch/bindings.cpp
index 5859ef9745..85da7a0115 100644
--- a/search/pysearch/bindings.cpp
+++ b/search/pysearch/bindings.cpp
@@ -68,7 +68,7 @@ void Init(string const & resource_path, string const & mwm_path)
   if (!resource_path.empty())
   {
     platform.SetResourceDir(resource_path);
-    countriesFile = base::JoinFoldersToPath(resource_path, COUNTRIES_FILE);
+    countriesFile = base::JoinPath(resource_path, COUNTRIES_FILE);
   }
 
   if (!mwm_path.empty())
diff --git a/search/search_quality/features_collector_tool/features_collector_tool.cpp b/search/search_quality/features_collector_tool/features_collector_tool.cpp
index db92f2e903..5d306931f4 100644
--- a/search/search_quality/features_collector_tool/features_collector_tool.cpp
+++ b/search/search_quality/features_collector_tool/features_collector_tool.cpp
@@ -116,7 +116,7 @@ int main(int argc, char * argv[])
   if (!FLAGS_data_path.empty())
   {
     platform.SetResourceDir(FLAGS_data_path);
-    countriesFile = base::JoinFoldersToPath(FLAGS_data_path, COUNTRIES_FILE);
+    countriesFile = base::JoinPath(FLAGS_data_path, COUNTRIES_FILE);
   }
 
   if (!FLAGS_mwm_path.empty())
diff --git a/search/search_quality/search_quality_tool/search_quality_tool.cpp b/search/search_quality/search_quality_tool/search_quality_tool.cpp
index 5bac6a20ce..823046329b 100644
--- a/search/search_quality/search_quality_tool/search_quality_tool.cpp
+++ b/search/search_quality/search_quality_tool/search_quality_tool.cpp
@@ -362,7 +362,7 @@ int main(int argc, char * argv[])
   if (!FLAGS_data_path.empty())
   {
     platform.SetResourceDir(FLAGS_data_path);
-    countriesFile = base::JoinFoldersToPath(FLAGS_data_path, COUNTRIES_FILE);
+    countriesFile = base::JoinPath(FLAGS_data_path, COUNTRIES_FILE);
   }
 
   if (!FLAGS_mwm_path.empty())
@@ -435,7 +435,7 @@ int main(int argc, char * argv[])
   vector<string> queries;
   string queriesPath = FLAGS_queries_path;
   if (queriesPath.empty())
-    queriesPath = base::JoinFoldersToPath(platform.WritableDir(), kDefaultQueriesPathSuffix);
+    queriesPath = base::JoinPath(platform.WritableDir(), kDefaultQueriesPathSuffix);
   ReadStringsFromFile(queriesPath, queries);
 
   vector<unique_ptr<TestSearchRequest>> requests;
diff --git a/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp b/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
index b74a2d709f..cb8afdb773 100644
--- a/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
+++ b/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
@@ -120,14 +120,14 @@ void TestShaders(dp::ApiVersion apiVersion, std::string const & defines,
 std::string GetCompilerPath(std::string const & compilerName)
 {
   Platform & platform = GetPlatform();
-  std::string compilerPath = base::JoinFoldersToPath(kCompilersDir, compilerName);
+  std::string compilerPath = base::JoinPath(kCompilersDir, compilerName);
   if (platform.IsFileExistsByFullPath(compilerPath))
     return compilerPath;
-  
-  compilerPath = base::JoinFoldersToPath({platform.ResourcesDir(), kCompilersDir}, compilerName);
+
+  compilerPath = base::JoinPath(platform.ResourcesDir(), kCompilersDir, compilerName);
   if (!platform.IsFileExistsByFullPath(compilerPath))
   {
-    compilerPath = base::JoinFoldersToPath({platform.WritableDir(), kCompilersDir}, compilerName);
+    compilerPath = base::JoinPath(platform.WritableDir(), kCompilersDir, compilerName);
     TEST(platform.IsFileExistsByFullPath(compilerPath), ("GLSL compiler not found"));
   }
   return compilerPath;
diff --git a/storage/storage_integration_tests/storage_3levels_tests.cpp b/storage/storage_integration_tests/storage_3levels_tests.cpp
index 973eecce1e..d1618a61ef 100644
--- a/storage/storage_integration_tests/storage_3levels_tests.cpp
+++ b/storage/storage_integration_tests/storage_3levels_tests.cpp
@@ -46,7 +46,7 @@ UNIT_TEST(SmallMwms_3levels_Test)
 
   TEST_EQUAL(3, GetLevelCount(storage, kCountryId), ());
 
-  string const mapDir = base::JoinFoldersToPath(platform.WritableDir(), version);
+  string const mapDir = base::JoinPath(platform.WritableDir(), version);
 
   auto onProgressFn = [&](CountryId const & countryId, LocalAndRemoteSize const & mapSize) {};
 
diff --git a/storage/storage_integration_tests/storage_group_download_tests.cpp b/storage/storage_integration_tests/storage_group_download_tests.cpp
index 963479aed4..a89006f6f0 100644
--- a/storage/storage_integration_tests/storage_group_download_tests.cpp
+++ b/storage/storage_integration_tests/storage_group_download_tests.cpp
@@ -33,20 +33,20 @@ CountriesSet const kLeafCountriesIds = {
 
 string GetMwmFilePath(string const & version, CountryId const & countryId)
 {
-  return base::JoinFoldersToPath({GetPlatform().WritableDir(), version},
-                                 countryId + DATA_FILE_EXTENSION);
+  return base::JoinPath(GetPlatform().WritableDir(), version, countryId + DATA_FILE_EXTENSION);
 }
 
 string GetMwmDownloadingFilePath(string const & version, CountryId const & countryId)
 {
-  return base::JoinFoldersToPath({GetPlatform().WritableDir(), version},
-                                 countryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION DOWNLOADING_FILE_EXTENSION);
+  return base::JoinPath(
+      GetPlatform().WritableDir(), version,
+      countryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION DOWNLOADING_FILE_EXTENSION);
 }
 
 string GetMwmResumeFilePath(string const & version, CountryId const & countryId)
 {
-  return base::JoinFoldersToPath({GetPlatform().WritableDir(), version},
-                                 countryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION RESUME_FILE_EXTENSION);
+  return base::JoinPath(GetPlatform().WritableDir(), version,
+                        countryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION RESUME_FILE_EXTENSION);
 }
 
 void DownloadGroup(Storage & storage, bool oneByOne)
diff --git a/storage/storage_integration_tests/storage_http_tests.cpp b/storage/storage_integration_tests/storage_http_tests.cpp
index 5089f900ee..a2602f307d 100644
--- a/storage/storage_integration_tests/storage_http_tests.cpp
+++ b/storage/storage_integration_tests/storage_http_tests.cpp
@@ -38,20 +38,21 @@ void UpdateWithoutChecks(CountryId const &, LocalFilePtr const /* localCountryFi
 
 string const GetMwmFullPath(string const & countryId, string const & version)
 {
-  return base::JoinFoldersToPath({GetPlatform().WritableDir(), version},
-                                 countryId + DATA_FILE_EXTENSION);
+  return base::JoinPath(GetPlatform().WritableDir(), version, countryId + DATA_FILE_EXTENSION);
 }
 
 string const GetDownloadingFullPath(string const & countryId, string const & version)
 {
-  return base::JoinFoldersToPath({GetPlatform().WritableDir(), version},
-                                 kCountryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION DOWNLOADING_FILE_EXTENSION);
+  return base::JoinPath(
+      GetPlatform().WritableDir(), version,
+      kCountryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION DOWNLOADING_FILE_EXTENSION);
 }
 
 string const GetResumeFullPath(string const & countryId, string const & version)
 {
-  return base::JoinFoldersToPath({GetPlatform().WritableDir(), version},
-                                 kCountryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION RESUME_FILE_EXTENSION);
+  return base::JoinPath(
+      GetPlatform().WritableDir(), version,
+      kCountryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION RESUME_FILE_EXTENSION);
 }
 
 void InitStorage(Storage & storage, Storage::UpdateCallback const & didDownload,
diff --git a/storage/storage_integration_tests/storage_update_tests.cpp b/storage/storage_integration_tests/storage_update_tests.cpp
index f3c79c9aef..d1dffe7015 100644
--- a/storage/storage_integration_tests/storage_update_tests.cpp
+++ b/storage/storage_integration_tests/storage_update_tests.cpp
@@ -66,13 +66,12 @@ string GetCountriesTxtWebUrl(string const version)
 
 string GetCountriesTxtFilePath()
 {
-  return base::JoinFoldersToPath(GetPlatform().WritableDir(), kCountriesTxtFile);
+  return base::JoinPath(GetPlatform().WritableDir(), kCountriesTxtFile);
 }
 
 string GetMwmFilePath(string const & version, CountryId const & countryId)
 {
-  return base::JoinFoldersToPath({GetPlatform().WritableDir(), version},
-                                 countryId + DATA_FILE_EXTENSION);
+  return base::JoinPath(GetPlatform().WritableDir(), version, countryId + DATA_FILE_EXTENSION);
 }
 
 } // namespace
diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp
index b3e590e62d..2d299e2491 100644
--- a/storage/storage_tests/storage_tests.cpp
+++ b/storage/storage_tests/storage_tests.cpp
@@ -1216,7 +1216,7 @@ UNIT_TEST(StorageTest_TwoInstance)
   platform::tests_support::ScopedDir removeTestDir1(testDir1);
   UNUSED_VALUE(removeTestDir1);
   string const versionDir1 =
-      base::JoinFoldersToPath(testDir1, strings::to_string(storage1.GetCurrentDataVersion()));
+      base::JoinPath(testDir1, strings::to_string(storage1.GetCurrentDataVersion()));
   platform::tests_support::ScopedDir removeVersionDir1(versionDir1);
   UNUSED_VALUE(removeVersionDir1);
   TaskRunner runner1;
@@ -1227,7 +1227,7 @@ UNIT_TEST(StorageTest_TwoInstance)
   platform::tests_support::ScopedDir removeTestDir2(testDir2);
   UNUSED_VALUE(removeTestDir2);
   string const versionDir2 =
-      base::JoinFoldersToPath(testDir2, strings::to_string(storage2.GetCurrentDataVersion()));
+      base::JoinPath(testDir2, strings::to_string(storage2.GetCurrentDataVersion()));
   platform::tests_support::ScopedDir removeVersionDir2(versionDir2);
   UNUSED_VALUE(removeVersionDir2);
   TaskRunner runner2;
@@ -1241,7 +1241,7 @@ UNIT_TEST(StorageTest_TwoInstance)
     auto const checker = AbsentCountryDownloaderChecker(storage1, uruguayId, MapOptions::Map);
     checker->StartDownload();
     runner1.Run();
-    TEST(platform.IsFileExistsByFullPath(base::JoinFoldersToPath(writableDir, versionDir1)), ());
+    TEST(platform.IsFileExistsByFullPath(base::JoinPath(writableDir, versionDir1)), ());
   }
 
   storage2.DeleteCountry(uruguayId, MapOptions::Map);
@@ -1251,7 +1251,7 @@ UNIT_TEST(StorageTest_TwoInstance)
     auto const checker = AbsentCountryDownloaderChecker(storage2, uruguayId, MapOptions::Map);
     checker->StartDownload();
     runner2.Run();
-    TEST(platform.IsFileExistsByFullPath(base::JoinFoldersToPath(writableDir, versionDir1)), ());
+    TEST(platform.IsFileExistsByFullPath(base::JoinPath(writableDir, versionDir1)), ());
   }
 }
 
@@ -1410,7 +1410,7 @@ UNIT_TEST(StorageTest_GetUpdateInfoSingleMwm)
   classificator::Load();
   WritableDirChanger writableDirChanger(kMapTestDir);
 
-  string const kVersion1Dir = base::JoinFoldersToPath(GetPlatform().WritableDir(), "1");
+  string const kVersion1Dir = base::JoinPath(GetPlatform().WritableDir(), "1");
   CHECK_EQUAL(Platform::MkDir(kVersion1Dir), Platform::ERR_OK, ());
 
   LocalCountryFile country1(kVersion1Dir, CountryFile("OutdatedCountry1"), 1);