diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index 2a8797df93..3bc5479897 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -192,7 +192,7 @@
 	<string name="poi_waterway_turning_point">Паваротная кропка на вадзе</string>
 	<string name="poi_weir">Невялікая плаціна</string>
 	<string name="poi_dam">Дамба</string>
-	<string name="poi_water_mill">Вадзяны млын</string>
+	<string name="poi_watermill">Вадзяны млын</string>
 
 	<string name="poi_power_substation">Падстанцыя</string>
 	<string name="poi_power_transformer">Трансфарматар</string>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index 0acf18ff4c..12bc86bddd 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -163,7 +163,7 @@
 	<string name="poi_lock_gate">Resclosa</string>
 	<string name="poi_weir">Sobreeixidor</string>
 	<string name="poi_dam">Presa d\'aigua</string>
-	<string name="poi_water_mill">Molí hidràulic</string>
+	<string name="poi_watermill">Molí hidràulic</string>
 
 	<string name="poi_power_substation">Subestació elèctrica</string>
 	<string name="poi_power_transformer">Transformador elèctric</string>
diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml
index 972029fe28..0de14fc521 100644
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@@ -393,7 +393,7 @@
 	<string name="poi_waterway_turning_point">Vodní obratiště</string>
 	<string name="poi_weir">Hráz</string>
 	<string name="poi_dam">Přehrada</string>
-	<string name="poi_water_mill">Vodní mlýn</string>
+	<string name="poi_watermill">Vodní mlýn</string>
 
 	<string name="poi_power_substation">Transformátorová stanice</string>
 	<string name="poi_power_transformer">Transformátor</string>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 7737739231..a69caa5682 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -188,7 +188,7 @@
         <string name="poi_waterway_turning_point">Vendepunkt på vandet</string>
         <string name="poi_weir">Stemmeværk</string>
         <string name="poi_dam">Dæmning</string>
-        <string name="poi_water_mill">Vandmølle</string>
+        <string name="poi_watermill">Vandmølle</string>
 
         <string name="poi_power_substation">Transformerstation</string>
         <string name="poi_power_transformer">Transformator</string>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index bfe5f2f73d..7afd7c021b 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -571,7 +571,7 @@
 	<string name="poi_waste_disposal">Deponie</string>
 	<string name="poi_wastewater_plant">Abwasseranlage</string>
 	<string name="poi_craft_watchmaker">Uhrmacher</string>
-	<string name="poi_water_mill">Wassermühle</string>
+	<string name="poi_watermill">Wassermühle</string>
 	<string name="poi_water_park">Wasserpark</string>
 	<string name="poi_water_tower">Wasserturm</string>
 	<string name="poi_water_well">Wasserbrunnen</string>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index 894eb195ba..baea6dce65 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -471,7 +471,7 @@
 	<string name="poi_waterway_turning_point">Punto de giro fluvial</string>
 	<string name="poi_weir">Aliviadero</string>
 	<string name="poi_dam">Presa</string>
-	<string name="poi_water_mill">Molino de agua</string>
+	<string name="poi_watermill">Molino de agua</string>
 
 	<string name="poi_telephone_exchange">Central telefónica</string>
 
diff --git a/OsmAnd/res/values-fa/phrases.xml b/OsmAnd/res/values-fa/phrases.xml
index 1a72cd6fb8..20fc9177e4 100644
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@@ -194,7 +194,7 @@
 <string name="poi_waterway_turning_point">نقطه گردش آب</string>
 <string name="poi_weir">خاکریز</string>
 <string name="poi_dam">سد</string>
-<string name="poi_water_mill">اسیاب</string>
+<string name="poi_watermill">اسیاب</string>
 
 <string name="poi_power_substation">ایستگاه فرعی</string>
 <string name="poi_power_transformer">ترانسفورماتور</string>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 0f909fbb7e..24b20a0568 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -372,7 +372,7 @@
 	<string name="poi_water_well">Puits</string>
 	<string name="poi_water_works">Usine d\'eau potable</string>
 	<string name="poi_waterfall">Chute d\'eau</string>
-	<string name="poi_water_mill">Moulin à eau</string>
+	<string name="poi_watermill">Moulin à eau</string>
 	<string name="poi_wayside_cross">Calvaire</string>
 	<string name="poi_wayside_shrine">Oratoire</string>
 	<string name="poi_wetland">Zone humide</string>
diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index f0e88e0b33..6d1f5a9c4b 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -100,7 +100,7 @@
 	<string name="poi_wastewater_plant">Estación depuradora de augas residuais</string>
 	<string name="poi_water_tower">Depósito de auga</string>
 	<string name="poi_dam">Encoro</string>
-	<string name="poi_water_mill">Aceña</string>
+	<string name="poi_watermill">Aceña</string>
 
 	<string name="poi_power_substation">Subestación</string>
 	<string name="poi_power_transformer">Transformador</string>
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index e576fea5f3..5da9dcf880 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -135,7 +135,7 @@
 	<string name="poi_speed_camera">Autovelox</string>
 	<string name="poi_turning_circle">Rotonda per inversione di marcia</string>
 	<string name="poi_wastewater_plant">Depuratore acque</string>
-	<string name="poi_water_mill">Mulino ad acqua</string>
+	<string name="poi_watermill">Mulino ad acqua</string>
 
 	<string name="poi_power_substation">Sottostazione</string>
 	<string name="poi_power_transformer">Trasformatore</string>
diff --git a/OsmAnd/res/values-ja/phrases.xml b/OsmAnd/res/values-ja/phrases.xml
index 9e56f2308f..dcc3482f23 100644
--- a/OsmAnd/res/values-ja/phrases.xml
+++ b/OsmAnd/res/values-ja/phrases.xml
@@ -252,7 +252,7 @@
 	<string name="poi_waterway_turning_point">船舶転回所(Waterway turning point)</string>
 	<string name="poi_weir">堰(Weir)</string>
 	<string name="poi_dam">ダム(Dam)</string>
-	<string name="poi_water_mill">水車小屋(Water mill)</string>
+	<string name="poi_watermill">水車小屋(Water mill)</string>
 
 	<string name="poi_power_substation">変電所(Substation)</string>
 	<string name="poi_power_transformer">変圧器・トランス(Transformer)</string>
diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml
index 814c0f16d6..f25d8a3fe4 100644
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@@ -182,7 +182,7 @@
 	<string name="poi_lock_gate">게이트 잠금</string>
 	<string name="poi_waterway_turning_point">수로 터닝 포인트</string>
 	<string name="poi_dam">댐</string>
-	<string name="poi_water_mill">물방앗간</string>
+	<string name="poi_watermill">물방앗간</string>
 
 	<string name="poi_power_substation">변전소</string>
 	<string name="poi_power_transformer">변압기</string>
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index 674d947a6d..d83d7de6d5 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -433,7 +433,7 @@
 	<string name="poi_lock_gate">Schutsluis</string>
 	<string name="poi_waterway_turning_point">Zwaaikom</string>
 	<string name="poi_weir">Stuw</string>
-	<string name="poi_water_mill">Watermolen</string>
+	<string name="poi_watermill">Watermolen</string>
 
 	<string name="poi_power_substation">Onderstation</string>
 	<string name="poi_power_transformer">Transformator</string>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index dac23bf894..298f3f8ffb 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -188,7 +188,7 @@
 	<string name="poi_wastewater_plant">Oczyszczalnia ścieków</string>
 	<string name="poi_water_tower">Wieża ciśnień</string>
 	<string name="poi_dam">Tama</string>
-	<string name="poi_water_mill">Młyn wodny</string>
+	<string name="poi_watermill">Młyn wodny</string>
 
 	<string name="poi_power_substation">Podstacja</string>
 	<string name="poi_power_transformer">Transformator</string>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index de343f7893..a2c62f2f45 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -189,7 +189,7 @@
 	<string name="poi_waterway_turning_point">Поворотная точка на воде</string>
 	<string name="poi_weir">Небольшая плотина</string>
 	<string name="poi_dam">Дамба</string>
-	<string name="poi_water_mill">Водяная мельница</string>
+	<string name="poi_watermill">Водяная мельница</string>
 
 	<string name="poi_power_substation">Подстанция</string>
 	<string name="poi_power_transformer">Трансформатор</string>
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index 5921ee951d..07b88122bc 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -155,7 +155,7 @@
 	<string name="poi_wastewater_plant">Depuradore de sas abbas</string>
 	<string name="poi_water_tower">Turre ìdrica</string>
 	<string name="poi_dam">Diga</string>
-	<string name="poi_water_mill">Mulinu ad abba</string>
+	<string name="poi_watermill">Mulinu ad abba</string>
 
 	<string name="poi_power_transformer">Trasformadore</string>
 	<string name="poi_power_plant">Tzentrale elètrica</string>
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index 57470c67ac..ed7981fff3 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -205,7 +205,7 @@
 	<string name="poi_waterway_turning_point">Obratisko na vode</string>
 	<string name="poi_weir">Vzdúvacia hrádza</string>
 	<string name="poi_dam">Priehrada/Hrádza</string>
-	<string name="poi_water_mill">Vodný mlyn</string>
+	<string name="poi_watermill">Vodný mlyn</string>
 
 	<string name="poi_power_substation">Elektrická stanica</string>
 	<string name="poi_power_transformer">Transformátor</string>
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index 3c8d0321c7..44f1d6668e 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -265,7 +265,7 @@
 	<string name="poi_waterway_turning_point">水路轉折點</string>
 	<string name="poi_weir">堰</string>
 	<string name="poi_dam">水壩</string>
-	<string name="poi_water_mill">水磨坊</string>
+	<string name="poi_watermill">水磨坊</string>
 
 	<string name="poi_power_substation">變電所</string>
 	<string name="poi_power_transformer">變壓器</string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index fec650c0b6..a1c2e6c2a8 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -266,7 +266,7 @@
 	<string name="poi_waterway_turning_point">Waterway turning point</string>
 	<string name="poi_weir">Weir</string>
 	<string name="poi_dam">Dam</string>
-	<string name="poi_water_mill">Water mill</string>
+	<string name="poi_watermill">Water mill</string>
 
 	<string name="poi_power_substation">Substation</string>
 	<string name="poi_power_transformer">Transformer</string>