diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index de96aff962..d3f73e40a1 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -784,7 +784,7 @@
 	<string name="poi_picnic_table">Cтол для пікніка</string>
 	<string name="poi_hanami">Ханамі</string>
 	<string name="poi_wine_cellar">Вінны склеп</string>
-	<string name="poi_winery">Вінны завод</string>
+	<string name="poi_craft_winery">Вінны завод</string>
 
 	<string name="poi_gallery">Галерэя мастацтваў</string>
 	<string name="poi_lean_to">Лабаз</string>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index 6cefb0905e..00779beefd 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -732,7 +732,7 @@
 	<string name="poi_hunting_lodge">Refugi de caça</string>
 
 	<string name="poi_picnic_table">Taula de berena</string>
-	<string name="poi_winery">Celler</string>
+	<string name="poi_craft_winery">Celler</string>
 
 	<string name="poi_stripclub">Club d\'striptease</string>
 	<string name="poi_craft_computer">Ordinadors a mida</string>
diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml
index 6b023767e2..a0b3a7c795 100644
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@@ -776,7 +776,7 @@
 	<string name="poi_lean_to">Trojstranný přístřešek</string>
 	<string name="poi_picnic_table">Piknikový stůl</string>
 	<string name="poi_wine_cellar">Vinný sklípek</string>
-	<string name="poi_winery">Vinařství</string>
+	<string name="poi_craft_winery">Vinařství</string>
 
 	<string name="poi_ski_rental">Půjčovna lyží</string>
 
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index c28600bcf7..04f11ec0bf 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -790,7 +790,7 @@
 	<string name="poi_picnic_table">Bordbænkesæt</string>
 	<string name="poi_hanami">Hanami</string>
 	<string name="poi_wine_cellar">Vinkælder</string>
-	<string name="poi_winery">Vingård</string>
+	<string name="poi_craft_winery">Vingård</string>
 
 	<string name="poi_gallery">Kunstgalleri</string>
 	<string name="poi_trail_riding_station">Trailridning station</string>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 243ca61cd4..11c74f813c 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -726,7 +726,7 @@
 	<string name="poi_hunting_lodge">Jagdhütte</string>
 
 	<string name="poi_tomb">Grab</string>
-	<string name="poi_winery">Weinkellerei</string>
+	<string name="poi_craft_winery">Weinkellerei</string>
 
 	<string name="poi_piste_hike">Wanderstrecke</string>
 	<string name="poi_piste_ice_skate">Eislaufen</string>
diff --git a/OsmAnd/res/values-eo/phrases.xml b/OsmAnd/res/values-eo/phrases.xml
index e965982a11..886e2d3403 100644
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@@ -811,7 +811,7 @@
 	<string name="poi_resort">Turisma centro</string>
 	<string name="poi_hanami">Hanami (florvidado)</string>
 	<string name="poi_wine_cellar">Vinejo</string>
-	<string name="poi_winery">Vinejo</string>
+	<string name="poi_craft_winery">Vinejo</string>
 
 	<string name="poi_club_art">Artisma klubejo</string>
 	<string name="poi_club_astronomy">Stelscienca klubejo</string>
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index 22b7a2391e..78e4f7adf9 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -545,7 +545,7 @@
 	<string name="poi_resort">Complejo turístico</string>
 	<string name="poi_hanami">Hanami</string>
 	<string name="poi_wine_cellar">Cava (bodega)</string>
-	<string name="poi_winery">Bodega (vinicultura)</string>
+	<string name="poi_craft_winery">Bodega (vinicultura)</string>
 
 	<string name="poi_club_art">Club de arte</string>
 	<string name="poi_club_astronomy">Club de astronomía</string>
diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml
index 31244f1bc6..f3fb4aec2f 100644
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@@ -515,7 +515,7 @@
 	<string name="poi_resort">Complejo turístico</string>
 	<string name="poi_hanami">Hanami</string>
 	<string name="poi_wine_cellar">Cava (bodega)</string>
-	<string name="poi_winery">Bodega (vinicultura)</string>
+	<string name="poi_craft_winery">Bodega (vinicultura)</string>
 	<string name="poi_club_art">Club de arte</string>
 	<string name="poi_club_astronomy">Club de astronomía</string>
 	<string name="poi_club_computer">Club de computación</string>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index e825223ca0..0407c4ed5c 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -775,7 +775,7 @@
 	<string name="poi_lean_to">Cobertizo</string>
 	<string name="poi_picnic_table">Mesa de picnic</string>
 	<string name="poi_wine_cellar">Bodega</string>
-	<string name="poi_winery">Bodega</string>
+	<string name="poi_craft_winery">Bodega</string>
 
 	<string name="poi_gallery">Galería de arte</string>
 	<string name="poi_hunting_lodge">Refugio de caza</string>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 95be6b4fb2..606e3738d8 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -765,7 +765,7 @@
 
 	<string name="poi_picnic_table">Table de pique-nique</string>
 	<string name="poi_wine_cellar">Cave à vin</string>
-	<string name="poi_winery">Établissement viticole</string>
+	<string name="poi_craft_winery">Établissement viticole</string>
 
 	<string name="poi_gallery">Galerie d\'art</string>
 	<string name="poi_hanami">Hanami</string>
diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index a0343639dd..4e51391a71 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -941,7 +941,7 @@
 	<string name="poi_board_type_notice">Taboleiro de anuncios</string>
 	<string name="poi_horse_track">Hipódromo</string>
 	<string name="poi_resort">Lugar turístico</string>
-	<string name="poi_winery">Vinoteca</string>
+	<string name="poi_craft_winery">Vinoteca</string>
 
 	<string name="poi_pawnbroker">Prestamista</string>
 	<string name="poi_information_nature">Marcador informativo: natureza</string>
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index 2b87745b57..1c7c42a363 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -492,7 +492,7 @@
 	<string name="poi_picnic_table">Piknikező asztal</string>
 	<string name="poi_tomb">Sírkő</string>
 	<string name="poi_wine_cellar">Borospince</string>
-	<string name="poi_winery">Borászat</string>
+	<string name="poi_craft_winery">Borászat</string>
 
 	<string name="poi_club_art">Művészklub</string>
 	<string name="poi_club_sport">Sportklub</string>
diff --git a/OsmAnd/res/values-ja/phrases.xml b/OsmAnd/res/values-ja/phrases.xml
index 0945e4be73..fd00813426 100644
--- a/OsmAnd/res/values-ja/phrases.xml
+++ b/OsmAnd/res/values-ja/phrases.xml
@@ -773,7 +773,7 @@
 	<string name="poi_picnic_table">ピクニックテーブル(Picnic table)</string>
 	<string name="poi_hanami">お花見スポット・桜の名所(Hanami)</string>
 	<string name="poi_wine_cellar">ワインセラー(Wine cellar)</string>
-	<string name="poi_winery">ワイナリー(Winery)</string>
+	<string name="poi_craft_winery">ワイナリー(Winery)</string>
 
 	<string name="poi_piste">ゲレンデ・スノーコース(Piste)</string>
 	<string name="poi_ski_rental">レンタルスキー(Ski rental)</string>
diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml
index 68d93ecac9..dab400bd41 100644
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@@ -782,7 +782,7 @@
 	<string name="poi_picnic_table">피크닉 테이블</string>
 	<string name="poi_hanami">꽃을 볼 수 있는 명소</string>
 	<string name="poi_wine_cellar">와인 저장고</string>
-	<string name="poi_winery">와이너리</string>
+	<string name="poi_craft_winery">와이너리</string>
 
 	<string name="poi_piste">피스트</string>
 	<string name="poi_ski_rental">스키 렌탈</string>
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index 1b4944dbec..2d28a440a4 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -762,7 +762,7 @@
 	<string name="poi_wood">Bos</string>
 	<string name="poi_communication">Communicatie</string>
 		<string name="poi_cabin">Hut</string>
-	<string name="poi_winery">Wijnhandel</string>
+	<string name="poi_craft_winery">Wijnhandel</string>
 
 	<string name="poi_piste_playground">Kinderskiweide</string>
 	<string name="poi_personal_transport">Persoonlijk vervoer</string>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index bdd2c00b72..7ee46baa65 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -679,7 +679,7 @@
 	<string name="poi_attraction_slide">Ślizgawka</string>
 	<string name="poi_attraction_summer_toboggan">Letni tor saneczkowy</string>
 	<string name="poi_picnic_table">Stół piknikowy</string>
-	<string name="poi_winery">Winiarnia</string>
+	<string name="poi_craft_winery">Winiarnia</string>
 
 	<string name="poi_piste">Stok</string>
 	<string name="poi_money_lender">Kredytodawca</string>
diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index a04c33f959..4c93da36b5 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -553,7 +553,7 @@
 	<string name="poi_funicular">Funicular</string>
 	<string name="poi_resort">Resort</string>
 	<string name="poi_wine_cellar">Adega de vinho</string>
-	<string name="poi_winery">Vinícola</string>
+	<string name="poi_craft_winery">Vinícola</string>
 
 	<string name="poi_club_art">Clube de arte</string>
 	<string name="poi_club_astronomy">Clube de astronomia</string>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index d19dfd4534..d55ba91e8d 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -868,7 +868,7 @@
 
 	<string name="poi_picnic_table">Стол для пикника</string>
 	<string name="poi_tomb">Гробница</string>
-	<string name="poi_winery">Винный завод</string>
+	<string name="poi_craft_winery">Винодельня</string>
 
 	<string name="poi_piste_downhill">Скоростной спуск</string>
 	<string name="poi_gallery">Художественная галерея</string>
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index d885a72fdb..c5b8224cb5 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -704,7 +704,7 @@
 	<string name="poi_picnic_table">Mesa de picnic</string>
 	<string name="poi_hanami">Hanami</string>
 	<string name="poi_wine_cellar">Cantina</string>
-	<string name="poi_winery">Azienda de produtzione de binu</string>
+	<string name="poi_craft_winery">Azienda de produtzione de binu</string>
 
 	<string name="poi_piste">Pista</string>
 	<string name="poi_piste_nordic">Pista de iscì nòrdicu</string>
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index 66bdd85747..4ad0e62ada 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -737,7 +737,7 @@
 	<string name="poi_lean_to">Trojstranný prístrešok</string>
 	<string name="poi_picnic_table">Piknikový stôl</string>
 	<string name="poi_wine_cellar">Vínna pivnica</string>
-	<string name="poi_winery">Vinárstvo</string>
+	<string name="poi_craft_winery">Vinárstvo</string>
 
 	<string name="poi_ski_rental">Požičovňa lyží</string>
 
diff --git a/OsmAnd/res/values-sl/phrases.xml b/OsmAnd/res/values-sl/phrases.xml
index f51ce50dd2..605449293f 100644
--- a/OsmAnd/res/values-sl/phrases.xml
+++ b/OsmAnd/res/values-sl/phrases.xml
@@ -393,7 +393,7 @@
 	<string name="poi_shelter">Zavetišče</string>
 	<string name="poi_funicular">Tirna vzpenjača</string>
 	<string name="poi_wine_cellar">Vinska klet</string>
-	<string name="poi_winery">Vinarna</string>
+	<string name="poi_craft_winery">Vinarna</string>
 
 	<string name="poi_craft_sawmill">Žaga (industrijski obrat)</string>
 	<string name="poi_craft_roofer">Krovstvo</string>
diff --git a/OsmAnd/res/values-tr/phrases.xml b/OsmAnd/res/values-tr/phrases.xml
index 19cdbc73a1..e2132bd67e 100644
--- a/OsmAnd/res/values-tr/phrases.xml
+++ b/OsmAnd/res/values-tr/phrases.xml
@@ -726,7 +726,7 @@
 	<string name="poi_resort">Tatil Yeri</string>
 	<string name="poi_hanami">Çiçek Görüntüsü</string>
 	<string name="poi_wine_cellar">Şarap mahzeni</string>
-	<string name="poi_winery">Şaraphane</string>
+	<string name="poi_craft_winery">Şaraphane</string>
 
 	<string name="poi_club_art">Sanat Kulübü</string>
 	<string name="poi_club_astronomy">Astronomi kulübü</string>
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index 8479a7359f..5543780ccd 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -547,7 +547,7 @@
 	<string name="poi_resort">度假村</string>
 	<string name="poi_hanami">賞花</string>
 	<string name="poi_wine_cellar">酒窖</string>
-	<string name="poi_winery">酒廠</string>
+	<string name="poi_craft_winery">酒廠</string>
 
 	<string name="poi_club_art">藝文俱樂部</string>
 	<string name="poi_club_astronomy">天文俱樂部</string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index dd54878fcd..1faea4bdf2 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -746,7 +746,7 @@
 	<string name="poi_resort">Resort</string>
 	<string name="poi_hanami">Hanami</string>
 	<string name="poi_wine_cellar">Wine cellar</string>
-	<string name="poi_winery">Winery</string>
+	<string name="poi_craft_winery">Winery</string>
 
 	<string name="poi_club_art">Art club</string>
 	<string name="poi_club_astronomy">Astronomy club</string>