diff --git a/android/jni/com/mapswithme/platform/Platform.hpp b/android/jni/com/mapswithme/platform/Platform.hpp
index 27f1ddeae7..a41cb4d352 100644
--- a/android/jni/com/mapswithme/platform/Platform.hpp
+++ b/android/jni/com/mapswithme/platform/Platform.hpp
@@ -27,9 +27,9 @@ public:
 
   void OnExternalStorageStatusChanged(bool isAvailable);
 
-  /// get storage path without ending "/MapsWithMe/"
+  /// get storage path without ending "/OMapsData/"
   std::string GetStoragePathPrefix() const;
-  /// assign storage path (should contain ending "/MapsWithMe/")
+  /// assign storage path (should contain ending "/OMapsData/")
   void SetWritableDir(std::string const & dir);
   void SetSettingsDir(std::string const & dir);
 
diff --git a/android/src/com/mapswithme/util/Constants.java b/android/src/com/mapswithme/util/Constants.java
index c439a58b30..74e576a8d4 100644
--- a/android/src/com/mapswithme/util/Constants.java
+++ b/android/src/com/mapswithme/util/Constants.java
@@ -70,7 +70,7 @@ public final class Constants
   }
 
 
-  public static final String MWM_DIR_POSTFIX = "/MapsWithMe/";
+  public static final String MWM_DIR_POSTFIX = "/OMapsData/";
   public static final String CACHE_DIR = "cache";
   public static final String FILES_DIR = "files";
 
diff --git a/coding/zip_creator.cpp b/coding/zip_creator.cpp
index c201303754..46ffe4e9e6 100644
--- a/coding/zip_creator.cpp
+++ b/coding/zip_creator.cpp
@@ -85,7 +85,7 @@ bool CreateZipFromPathDeflatedAndDefaultCompression(std::string const & filePath
   if (!strings::IsASCIIString(fileName))
     fileName = "MapsMe.kml";
 
-  if (zip::Code::Ok != zip::OpenNewFileInZip(zip.Handle(), fileName, zipInfo, "ZIP from MapsWithMe",
+  if (zip::Code::Ok != zip::OpenNewFileInZip(zip.Handle(), fileName, zipInfo, "ZIP from OMaps",
                                              Z_DEFLATED, Z_DEFAULT_COMPRESSION))
   {
     return false;
diff --git a/platform/platform_mac.mm b/platform/platform_mac.mm
index 34abacb9a9..7a1fdf1c80 100644
--- a/platform/platform_mac.mm
+++ b/platform/platform_mac.mm
@@ -85,9 +85,9 @@ Platform::Platform()
       NSString * supportDir = [dirPaths objectAtIndex:0];
       m_writableDir = supportDir.UTF8String;
 #ifdef BUILD_DESIGNER
-      m_writableDir += "/OMaps.Designer/";
+      m_writableDir += "/OMapsData.Designer/";
 #else // BUILD_DESIGNER
-      m_writableDir += "/MapsWithMe/";
+      m_writableDir += "/OMapsData/";
 #endif // BUILD_DESIGNER
       ::mkdir(m_writableDir.c_str(), 0755);
     }
diff --git a/qt/main.cpp b/qt/main.cpp
index 90e7c7a196..b69e332763 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -262,6 +262,6 @@ int main(int argc, char * argv[])
   }
 #endif // BUILD_DESIGNER
 
-  LOG_SHORT(LINFO, ("MapsWithMe finished with code", returnCode));
+  LOG_SHORT(LINFO, ("OMaps finished with code", returnCode));
   return returnCode;
 }