diff --git a/editor/osm_editor.cpp b/editor/osm_editor.cpp
index 66656f9ac..1c3bd90ae 100644
--- a/editor/osm_editor.cpp
+++ b/editor/osm_editor.cpp
@@ -1147,7 +1147,7 @@ void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
   {
   case NoteProblemType::PlaceDoesNotExist:
   {
-    sstr << "The place has gone or never existed. A user of Organic Maps application has reported "
+    sstr << "The place has gone or never existed. A CoMaps user reported "
             "that the POI was visible on the map (see snapshot date below), but was not found "
             "on the ground.\n";
     auto const features = m_features.Get();
diff --git a/editor/server_api.cpp b/editor/server_api.cpp
index 3ed493ef2..41693c1cf 100644
--- a/editor/server_api.cpp
+++ b/editor/server_api.cpp
@@ -123,7 +123,7 @@ uint64_t ServerApi06::CreateNote(ms::LatLon const & ll, std::string const & mess
   CHECK(!message.empty(), ("Note content should not be empty."));
   std::string const params = "?lat=" + strings::to_string_dac(ll.m_lat, 7) +
                              "&lon=" + strings::to_string_dac(ll.m_lon, 7) +
-                             "&text=" + url::UrlEncode(message + " #organicmaps " + OMIM_OS_NAME);
+                             "&text=" + url::UrlEncode(message + " #CoMaps " + OMIM_OS_NAME);
   OsmOAuth::Response const response = m_auth.Request("/notes" + params, "POST");
   if (response.first != OsmOAuth::HTTP::OK)
     MYTHROW(ErrorAddingNote, ("Could not post a new note:", response));