diff --git a/docs/ANDROID_LOCATION_TEST.md b/docs/ANDROID_LOCATION_TEST.md
index 7a0f8f3d6..2f496483c 100644
--- a/docs/ANDROID_LOCATION_TEST.md
+++ b/docs/ANDROID_LOCATION_TEST.md
@@ -72,7 +72,7 @@ This test-case should work with the same behavior regardless of
 - Tap on location button - "To continue, turn on device..." dialog
   should re-appear again.
 
-5. OM location dialog (negative case)
+5. CoMaps location dialog (negative case)
 
 - Use non-Google flavor or disable Google Play Location in the app settings;
 - Disable Wi-Fi, disable Cellular Data, disable Location;
diff --git a/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md b/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md
index 94530e889..9f7fa3f4e 100644
--- a/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md
+++ b/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md
@@ -71,7 +71,7 @@ TRANSIT_URL: file:///home/result_json_dir
 
 Run generator tool [as usual](../tools/python/maps_generator) with this ini config. After it is done you'll have mwms with transit section in experimental GTFS format.
 
-:checkered_flag: Use the resulting mwms in your app. Enjoy the experimental public transport in Organic Maps!
+:checkered_flag: Use the resulting mwms in your app. Enjoy the experimental public transport in CoMaps!
 
 ## If you have questions
 
diff --git a/docs/STRUCTURE.md b/docs/STRUCTURE.md
index 8b56d8e48..e118f1e10 100644
--- a/docs/STRUCTURE.md
+++ b/docs/STRUCTURE.md
@@ -30,7 +30,7 @@ There are some other files not mentioned here.
 
 ### Map features / classificator
 
-- `mapcss-mapping.csv` - mapping between OSM tags and OM types.
+- `mapcss-mapping.csv` - mapping between OSM tags and CoMaps types.
 - `replaced_tags.txt` - merging similar OSM tags.
 - `mixed_tags.txt` - pedestrian streets of high popularity.
 
@@ -38,7 +38,7 @@ There are some other files not mentioned here.
 - `config.xsd` - XML schema for `editor.config`.
 
 Automatically generated:
-- `classificator.txt` - hierarchical list of all OM types.
+- `classificator.txt` - hierarchical list of all CoMaps types.
 - `types.txt`
 
 ### Styles and icons
diff --git a/docs/STYLES.md b/docs/STYLES.md
index 80feb78f3..21c1b7c53 100644
--- a/docs/STYLES.md
+++ b/docs/STYLES.md
@@ -56,7 +56,7 @@ Icons are stored in [`data/styles/default/light/symbols/`](../data/styles/defaul
 ## How to add a new icon
 
 1. Add an svg icon to `data/styles/default/light/symbols/` (and to `dark` too)
-preferably look for icons in [collections OM uses already](../data/copyright.html#icons)
+preferably look for icons in [collections CoMaps uses already](../data/copyright.html#icons)
 2. Add icon rendering/visibility rules into `data/styles/default/include/Icons.mapcss` and to "navigation style" `data/styles/vehicle/include/Icons.mapcss`
 3. Run `tools/unix/generate_symbols.sh` to add new icons into skin files
 4. Run `tools/unix/generate_drules.sh` to generate drawing rules for the new icons
@@ -64,7 +64,7 @@ preferably look for icons in [collections OM uses already](../data/copyright.htm
 
 ## How to add a new map feature / POI type
 
-1. Add it into `data/mapcss-mapping.csv` (or better replace existing `deprecated` line) to make OM import it from OSM
+1. Add it into `data/mapcss-mapping.csv` (or better replace existing `deprecated` line) to make CoMaps import it from OSM
 2. If necessary merge similar tags in via `data/replaced_tags.txt`
 3. Define a priority for the new feature type in e.g. [`priorities_4_overlays.prio.txt`](../data/styles/default/include/priorities_4_overlays.prio.txt) and/or other priorities files
 4. Add a new icon (see [above](#how-to-add-a-new-icon)) and/or other styling (area, line..)
@@ -105,7 +105,7 @@ A whole map needs to be [regenerated](MAPS.md) for the changes to take effect if
 ## Technical details
 
 Map style files syntax is based on [MapCSS/0.2](https://wiki.openstreetmap.org/wiki/MapCSS/0.2),
-though the specification is not supported in full and there are OM-specific extensions to it.
+though the specification is not supported in full and there are CoMaps-specific extensions to it.
 
 The `tools/unix/generate_drules.sh` script uses a customized version of [Kothic](https://codeberg.org/comaps/kothic)
 stylesheet processor to compile MapCSS files into binary drawing rules files `data/drules_proto*.bin`.