diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index af0ee63dc5..428c2ee66c 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -8,7 +8,7 @@
 	<string name="poi_beverages">Напоі</string>
 	<string name="poi_butcher">Ятка</string>
 	<string name="poi_deli">Дэлікатэсы</string>
-	<string name="poi_shop_farm">Фермерскія прадукты</string>
+	<string name="poi_farm">Фермерскія прадукты</string>
 	<string name="poi_greengrocer">Гародніна і садавіна</string>
 	<string name="poi_seafood">Морапрадукты</string>
 	<string name="poi_confectionery">Кандытарская</string>
@@ -39,7 +39,7 @@
 	<string name="poi_boutique">Буцік</string>
 	<string name="poi_chemist">Аптэка</string>
 	<string name="poi_clothes">Крама адзеньня</string>
-	<string name="poi_children_clothes">Дзіцячае адзеньне</string>
+	<string name="poi_child_clothes">Дзіцячае адзеньне</string>
 	<string name="poi_shoes">Крама абутку</string>
 	<string name="poi_computer">Кампутары</string>
 	<string name="poi_copyshop">Капіявальныя паслугі</string>
@@ -87,8 +87,8 @@
 	<string name="poi_window_blind">Жалюзі, аканіцы, маркізы</string>
 	<string name="poi_department_store">Універмаг</string>
 	<string name="poi_electronics">Электроніка</string>
-	<string name="poi_car_shop">Аўтасалон</string>
-	<string name="poi_car_parts_shop">Аўтазапчасткі</string>
+	<string name="poi_car">Аўтасалон</string>
+	<string name="poi_car_parts">Аўтазапчасткі</string>
 	<string name="poi_atv">Квадрацыклы</string>
 	<string name="poi_cosmetics">Касметыка, парфумерыя</string>
 	<string name="poi_marketplace">Рынак</string>
@@ -147,7 +147,7 @@
 	<string name="poi_bus_station">Аўтобусная станцыя</string>
 	<string name="poi_railway_station">Чыгуначная станцыя</string>
 	<string name="poi_railway_platform">Чыгуначная плятформа</string>
-	<string name="poi_railway_halt">Чыгуначная плятформа (састар.)</string>
+	<string name="poi_halt">Чыгуначная плятформа (састар.)</string>
 	<string name="poi_railway_subway_entrance">Уваход у мэтро</string>
 	<string name="poi_subway_station">Станцыя мэтро</string>
 	<string name="poi_taxi">Стаянка таксі</string>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index d6cbf2b461..381623e0ba 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -25,7 +25,7 @@
 	<string name="poi_optician">Optometria</string>
 	<string name="poi_convenience">Botiga de queviures</string>
 	<string name="poi_deli">Delicadeses</string>
-	<string name="poi_shop_farm">Productes de granja</string>
+	<string name="poi_farm">Productes de granja</string>
 	<string name="poi_greengrocer">Verdureria</string>
 	<string name="poi_confectionery">Confiteria</string>
 	<string name="poi_ice_cream">Gelateria</string>
@@ -115,14 +115,14 @@
 	<string name="poi_tobacco">Venda de tabac</string>
 	<string name="poi_carpet">Botiga de catifes</string>
 	<string name="poi_clothes">Magatzem de roba</string>
-	<string name="poi_children_clothes">Roba infantil</string>
+	<string name="poi_child_clothes">Roba infantil</string>
 	<string name="poi_curtain">Pelleteria</string>
 	<string name="poi_fabric">Botiga de teixits</string>
 	<string name="poi_public_transport_platform">Parada de transport públic</string>
 	<string name="poi_bus_station">Estació d\'autobusos</string>
 	<string name="poi_railway_station">Estació de tren</string>
 	<string name="poi_railway_platform">Andana</string>
-	<string name="poi_railway_halt">Parada de tren (obsolet)</string>
+	<string name="poi_halt">Parada de tren (obsolet)</string>
 	<string name="poi_railway_subway_entrance">Entrada de metro</string>
 	<string name="poi_subway_station">Estació de metro</string>
 	<string name="poi_taxi">Parada de taxis</string>
@@ -305,7 +305,7 @@
 	<string name="poi_bedding">Matalasseria</string>
 	<string name="poi_gas">Gas liquat</string>
 	<string name="poi_department_store">Gran magatzem</string>
-	<string name="poi_car_parts_shop">Recanvis d\'automòbil</string>
+	<string name="poi_car_parts">Recanvis d\'automòbil</string>
 	<string name="poi_fire_water_pond">Punt d\'aigua per incendis</string>
 	<string name="poi_grit_bin">Reserva de sal</string>
 	<string name="poi_emergency_access_point">Punt d\'accés d\'emergència</string>
diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml
index 672441e220..697f01816a 100644
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@@ -6,7 +6,7 @@
 	<string name="poi_beverages">Obchod s nápoji</string>
 	<string name="poi_butcher">Masna</string>
 	<string name="poi_deli">Delikatesy</string>
-	<string name="poi_shop_farm">Farmářský obchod</string>
+	<string name="poi_farm">Farmářský obchod</string>
 	<string name="poi_greengrocer">Zelinářství</string>
 	<string name="poi_seafood">Obchod mořskými plody</string>
 	<string name="poi_supermarket">Supermarket</string>
@@ -18,7 +18,7 @@
 	<string name="poi_bed">Vybavení ložnic</string>
 	<string name="poi_boutique">Módní butik</string>
 	<string name="poi_chemist">Drogerie</string>
-	<string name="poi_children_clothes">Dětské oblečení</string>
+	<string name="poi_child_clothes">Dětské oblečení</string>
 	<string name="poi_shoes">Obuv</string>
 	<string name="poi_hardware">Železářství</string>
 	<string name="poi_tobacco">Tabák</string>
@@ -86,10 +86,10 @@
 	<string name="poi_first_aid">První pomoc</string>
 	<string name="poi_dentist">Zubař</string>
 	<string name="poi_veterinary">Veterinář</string>
-	<string name="blood_bank">Krevní banka</string>
-	<string name="optometrist">Optik</string>
-	<string name="physiotherapist">Fyzioterapeut</string>
-	<string name="psychotherapist">Psychoterapeut</string>
+	<string name="poi_blood_bank">Krevní banka</string>
+	<string name="poi_optometrist">Optik</string>
+	<string name="poi_physiotherapist">Fyzioterapeut</string>
+	<string name="poi_psychotherapist">Psychoterapeut</string>
 
 	<string name="poi_company">Společnost</string>
 	<string name="poi_insurance">Pojištění</string>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 4b51b52b09..da3d3be4f4 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -7,7 +7,7 @@
         <string name="poi_beverages">Drikkevarebutik</string>
         <string name="poi_butcher">Kødmarked</string>
         <string name="poi_deli">Delikatesse</string>
-        <string name="poi_shop_farm">Gårdbutik</string>
+        <string name="poi_farm">Gårdbutik</string>
         <string name="poi_greengrocer">Grønthandler</string>
         <string name="poi_seafood">Fiskehandler</string>
         <string name="poi_confectionery">Konfektureforretning</string>
@@ -30,7 +30,7 @@
         <string name="poi_carpet">Tæppeforretning</string>
         <string name="poi_chemist">Materialist</string>
         <string name="poi_clothes">Tøjbutik</string>
-        <string name="poi_children_clothes">Børnetøj</string>
+        <string name="poi_child_clothes">Børnetøj</string>
         <string name="poi_shoes">Skobutik</string>
         <string name="poi_computer">Computerbutik</string>
         <string name="poi_copyshop">Kopicenter</string>
@@ -84,8 +84,8 @@
         <string name="poi_window_blind">Persienner</string>
         <string name="poi_department_store">Stormagasin</string>
         <string name="poi_electronics">Elektronik</string>
-        <string name="poi_car_shop">Autohandel</string>
-        <string name="poi_car_parts_shop">Biltilbehør</string>
+        <string name="poi_car">Autohandel</string>
+        <string name="poi_car_parts">Biltilbehør</string>
         <string name="poi_atv">ATV</string>
         <string name="poi_cosmetics">Kosmetik</string>
         <string name="poi_marketplace">Markedsplads</string>
@@ -143,7 +143,7 @@
         <string name="poi_bus_station">Busstation</string>
         <string name="poi_railway_station">Banegård</string>
         <string name="poi_railway_platform">Perron</string>
-        <string name="poi_railway_halt">Trinbrædt (forældet)</string>
+        <string name="poi_halt">Trinbrædt (forældet)</string>
         <string name="poi_railway_subway_entrance">Metroindgang</string>
         <string name="poi_subway_station">Metrostation</string>
         <string name="poi_taxi">Taxaholdeplads</string>
@@ -252,19 +252,6 @@
         <string name="poi_baby_hatch">Babyluge</string>
         <string name="poi_veterinary">Dyrlæge</string>
         <string name="poi_sanatorium">Sanatorium</string>
-        <string name="healthcare_alternative">Sundhedspleje alternativ</string>
-        <string name="audiologist">Audiolog</string>
-        <string name="blood_bank">Blodbank</string>
-        <string name="healthcare_centre">Sundhedspleje alternativ</string>
-        <string name="midwife">Jordemoder</string>
-        <string name="occupational_therapist">Ergoterapeut</string>
-        <string name="optometrist">Optometrist</string>
-        <string name="physiotherapist">Fysioterapeut</string>
-        <string name="podiatrist">Ortopæd</string>
-        <string name="psychotherapist">Psykoterapeut</string>
-        <string name="healthcare_rehabilitation">Rehabilitering</string>
-        <string name="speech_therapist">Talepædagog</string>
-        <string name="healthcare_yes">Sundhedspleje</string>
 
         <string name="poi_company">Firma</string>
         <string name="poi_insurance">Forsikring</string>
@@ -785,7 +772,7 @@
 	<string name="poi_residential">Boligområde</string>
 
 	<string name="poi_recreation_ground">Rekreativtområde</string>
-	<string name="poi_village_green">Grønning</string>
+	<string name="poi_village_green">Forte</string>
 
 	<string name="poi_junction">Vejkryds</string>
 	</resources>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 6fd9993748..054c6f652d 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -92,11 +92,11 @@
 	<string name="poi_camp_site">Campingplatz</string>
 	<string name="poi_canoe">Kanu</string>
 	<string name="poi_cape">Kap</string>
-	<string name="poi_car_parts_shop">Autoteilehändler</string>
+	<string name="poi_car_parts">Autoteilehändler</string>
 	<string name="poi_car_rental">Autovermietung</string>
 	<string name="poi_car_repair">Kfz-Werkstatt</string>
 	<string name="poi_car_sharing">Fahrgemeinschaft</string>
-	<string name="poi_car_shop">Autohändler</string>
+	<string name="poi_car">Autohändler</string>
 	<string name="poi_car_wash">Autowaschanlage</string>
 	<string name="poi_caravan_site">Campingplatz</string>
 	<string name="poi_craft_carpenter">Tischler</string>
@@ -111,7 +111,7 @@
 	<string name="poi_charging_station">Ladestation</string>
 	<string name="poi_chemist">Drogerie</string>
 	<string name="poi_chess">Schach</string>
-	<string name="poi_children_clothes">Kinderbekleidungsgeschäft</string>
+	<string name="poi_child_clothes">Kinderbekleidungsgeschäft</string>
 	<string name="poi_cinema">Kino</string>
 	<string name="poi_circus">Zirkus</string>
 	<string name="poi_city">Stadt</string>
@@ -397,7 +397,7 @@
 	<string name="poi_raceway">Gerinne</string>
 	<string name="poi_racquet">Schläger</string>
 	<string name="poi_radiotechnics">Radiotechniker</string>
-	<string name="poi_railway_halt">Eisenbahnhaltestelle (obsolet)</string>
+	<string name="poi_halt">Eisenbahnhaltestelle (obsolet)</string>
 	<string name="poi_railway_platform">Bahnsteig (obsolet)</string>
 	<string name="poi_railway_station">Bahnhof (obsolet)</string>
 	<string name="poi_rapids">Stromschnelle</string>
@@ -482,7 +482,7 @@
 	<string name="poi_craft_shoemaker">Schuster</string>
 	<string name="poi_shoes">Schuhgeschäft</string>
 	<string name="poi_shooting">Schießbude</string>
-	<string name="poi_shop_farm">Landwirtschaft</string>
+	<string name="poi_farm">Landwirtschaft</string>
 	<string name="poi_shop_tea">Tee-Haus</string>
 	<string name="poi_sinkhole">Senkgrube</string>
 	<string name="poi_skateboard">Skateboard</string>
diff --git a/OsmAnd/res/values-fa/phrases.xml b/OsmAnd/res/values-fa/phrases.xml
index 29dd147593..50d744a943 100644
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@@ -10,7 +10,7 @@
 <string name="poi_beverages">فروشگاه محصولات غذایی</string>
 <string name="poi_butcher">قصابی</string>
 <string name="poi_deli">بقالی</string>
-<string name="poi_shop_farm">فروشگاه محصولات دامی</string>
+<string name="poi_farm">فروشگاه محصولات دامی</string>
 <string name="poi_greengrocer">سبزی فروشی</string>
 <string name="poi_seafood">فروشگاه غذاهای دریایی</string>
 <string name="poi_confectionery">شیرینی فروشی</string>
@@ -33,7 +33,7 @@
 <string name="poi_carpet">فروشگاه فرش</string>
 <string name="poi_chemist">فروشگاه مواد مخدر</string>
 <string name="poi_clothes">فروشگاه پوشاک</string>
-<string name="poi_children_clothes">\فروشگاه پوشاک کودکان</string>
+<string name="poi_child_clothes">\فروشگاه پوشاک کودکان</string>
 <string name="poi_shoes">کفش فروشی</string>
 <string name="poi_computer">فروشگاه کامپیوتر</string>
 <string name="poi_copyshop">فروشگاه چاپ و تکثیر</string>
@@ -87,8 +87,8 @@
 <string name="poi_window_blind">در و پنجره سازی</string>
 <string name="poi_department_store">بخش فروش</string>
 <string name="poi_electronics">فروشگاه های لوازم الکترونیکی</string>
-<string name="poi_car_shop">فروشگاه ماشین</string>
-<string name="poi_car_parts_shop">فروشگاه قطعات خودرو</string>
+<string name="poi_car">فروشگاه ماشین</string>
+<string name="poi_car_parts">فروشگاه قطعات خودرو</string>
 <string name="poi_atv">Quad store</string>
 <string name="poi_cosmetics">آرایشی و بهداشتی</string>
 <string name="poi_marketplace">بازار</string>
@@ -146,7 +146,7 @@
 <string name="poi_bus_station">ایستگاه اتوبوس (منسوخ)</string>
 <string name="poi_railway_station">ایستگاه راه آهن (منسوخ)</string>
 <string name="poi_railway_platform">پلت فرم راه آهن (منسوخ)</string>
-<string name="poi_railway_halt">ایستگاه راه آهن (منسوخ)</string>
+<string name="poi_halt">ایستگاه راه آهن (منسوخ)</string>
 <string name="poi_railway_subway_entrance">ورودی مترو</string>
 <string name="poi_subway_station">ایستگاه مترو</string>
 <string name="poi_taxi">ایستگاه تاکسی</string>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 5be2fa9f22..ebdcd924ba 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -65,7 +65,7 @@
 	<string name="poi_buoy_isolated_danger">Bouée de danger isolé (balise flottante)</string>
 	<string name="poi_buoy_lateral">Bouée latérale (balise flottante)</string>
 	<string name="poi_buoy_safe_water">Bouée d\'eaux saines (balise flottante)</string>
-	<string name="poi_seamark_uoy_special_purpose">Marque spéciale (balise flottante)</string>
+	<string name="poi_seamark_buoy_special_purpose">Marque spéciale (balise flottante)</string>
 	<string name="poi_bus_station">Gare routière</string>
 	<string name="poi_bus_stop">Arrêt de bus</string>
 	<string name="poi_butcher">Boucherie - Charcuterie</string>
@@ -73,8 +73,8 @@
 	<string name="poi_camp_site">Camping</string>
 	<string name="poi_canoe">Canoë-kayak</string>
 	<string name="poi_cape">Cap</string>
-	<string name="poi_car_shop">Magasin de voitures</string>
-	<string name="poi_car_parts_shop">Pièces d\'automobile</string>
+	<string name="poi_car">Magasin de voitures</string>
+	<string name="poi_car_parts">Pièces d\'automobile</string>
 	<string name="poi_car_rental">Location de voitures</string>
 	<string name="poi_car_repair">Atelier de réparation automobile</string>
 	<string name="poi_car_sharing">Autopartage</string>
@@ -275,7 +275,7 @@
 	<string name="poi_raceway">Circuit</string>
 	<string name="poi_racquet">Sport de raquette</string>
 	<string name="poi_radar_transponder">Transpondeur radar (amer)</string>
-	<string name="poi_railway_halt">Gare ferroviaire (halte)</string>
+	<string name="poi_halt">Gare ferroviaire (halte)</string>
 	<string name="poi_railway_platform">Quai de gare</string>
 	<string name="poi_railway_station">Gare ferroviaire</string>
 	<string name="poi_rapids">Rapides</string>
@@ -286,7 +286,6 @@
 	<string name="poi_restaurant">Restaurant</string>
 	<string name="poi_ridge">Crête</string>
 	<string name="poi_river">Rivière</string>
-	<string name="poi_rugby">Rugby</string>
 	<string name="poi_historic_ruins">Ruines historiques</string>
 	<string name="poi_salt_pond">Marais salants</string>
 	<string name="poi_sanatorium">Sanatorium</string>
@@ -403,7 +402,7 @@
 	<string name="poi_chess">Échecs</string>
 	<string name="poi_palaeontological_site">Site paléontologique</string>
 
-	<string name="poi_shop_farm">Vente à la ferme</string>
+	<string name="poi_farm">Vente à la ferme</string>
 	<string name="poi_anime">Librairie spécialisée en bandes dessinées</string>
 	<string name="poi_antiques">Antiquaire</string>
 	<string name="poi_hunting">Equipement de chasse</string>
@@ -536,7 +535,7 @@
 	<string name="poi_frame">Magasin d\'encadrement</string>
 	<string name="poi_bathroom_furnishing">Magasin d\'équipement pour la salle de bain</string>
 	<string name="poi_bed">Magasin d\'équipement pour la chambre</string>
-	<string name="poi_children_clothes">Vêtements pour enfants</string>
+	<string name="poi_child_clothes">Vêtements pour enfants</string>
 	<string name="poi_curtain">Boutique de rideaux</string>
 	<string name="poi_dairy">Crèmerie</string>
 	<string name="poi_baby_goods">Articles pour bébé</string>
@@ -600,8 +599,8 @@
 	<string name="poi_attraction_train">Train touristique</string>
 	<string name="poi_attraction_water_slide">Toboggan aquatique</string>
 
-	<string name="poi_rugby_union">Club de rugby</string>
-	<string name="poi_rugby_league">Ligue de rugby</string>
+	<string name="poi_halt_union">Club de rugby</string>
+	<string name="poi_halt_league">Ligue de rugby</string>
 	<string name="poi_surfing">Surf</string>
 	<string name="poi_attraction_amusement_ride">Attractions mécaniques</string>
 	<string name="poi_attraction_slide">Toboggan</string>
diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index 0ffd28b322..6058e66edd 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -17,7 +17,7 @@
 	<string name="poi_art">Tenda de arte</string>
 	<string name="poi_boutique">Tenda de moda</string>
 	<string name="poi_carpet">Tenda de alfombras</string>
-	<string name="poi_children_clothes">Roupa infantil</string>
+	<string name="poi_child_clothes">Roupa infantil</string>
 	<string name="poi_shoes">Zapataría</string>
 	<string name="poi_computer">Tenda de informática</string>
 	<string name="poi_copyshop">Copistaría</string>
@@ -48,7 +48,7 @@
 	<string name="poi_vacuum_cleaner">Tenda de aspiradoras</string>
 	<string name="poi_department_store">Grandes almacéns</string>
 	<string name="poi_electronics">Tenda de electrónica</string>
-	<string name="poi_car_parts_shop">Recambios de automóbil</string>
+	<string name="poi_car_parts">Recambios de automóbil</string>
 	<string name="poi_atv">Tenda de quads</string>
 	<string name="poi_cosmetics">Cosméticos</string>
 	<string name="poi_marketplace">Mercado</string>
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index af5313a234..f7aa895538 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -7,7 +7,7 @@
 	<string name="poi_beverages">Italbolt</string>
 	<string name="poi_butcher">Hentes</string>
 	<string name="poi_deli">Delikatesz bolt</string>
-	<string name="poi_shop_farm">Farm bolt</string>
+	<string name="poi_farm">Farm bolt</string>
 	<string name="poi_greengrocer">Zöldséges</string>
 	<string name="poi_seafood">Halárus</string>
 	<string name="poi_confectionery">Cukrászda</string>
@@ -35,8 +35,8 @@
 	<string name="poi_toys">Játékbolt</string>
 	<string name="poi_variety_store">100 forintos bolt</string>
 	<string name="poi_department_store">Áruház</string>
-	<string name="poi_car_shop">Autókereskedés</string>
-	<string name="poi_car_parts_shop">Autóalkatrész</string>
+	<string name="poi_car">Autókereskedés</string>
+	<string name="poi_car_parts">Autóalkatrész</string>
 	<string name="poi_marketplace">Piac</string>
 	<string name="poi_police">Rendőrség</string>
 	<string name="poi_fire_station">Tűzoltóság</string>
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index a25fa9bacd..f3006dde99 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -14,7 +14,7 @@
 	<string name="poi_beverages">Negozio di bevande</string>
 	<string name="poi_butcher">Macelleria</string>
 	<string name="poi_deli">Gastronomia</string>
-	<string name="poi_shop_farm">Vendita prodotti di fattoria</string>
+	<string name="poi_farm">Vendita prodotti di fattoria</string>
 	<string name="poi_greengrocer">Fruttivendolo</string>
 	<string name="poi_confectionery">Negozio di dolciumi</string>
 	<string name="poi_ice_cream">Gelateria</string>
@@ -29,7 +29,7 @@
 	<string name="poi_carpet">Negozio tappeti</string>
 	<string name="poi_chemist">Farmacia</string>
 	<string name="poi_clothes">Abbigliamento</string>
-	<string name="poi_children_clothes">Abbigliamento bambini</string>
+	<string name="poi_child_clothes">Abbigliamento bambini</string>
 	<string name="poi_shoes">Negozio calzature</string>
 	<string name="poi_computer">Negozio di computer</string>
 	<string name="poi_copyshop">Copisteria</string>
@@ -114,8 +114,8 @@
 	<string name="poi_window_blind">Negozio finestre cieche</string>
 	<string name="poi_department_store">Grande magazzino</string>
 	<string name="poi_electronics">Negozio elettronica</string>
-	<string name="poi_car_shop">Autosalone</string>
-	<string name="poi_car_parts_shop">Autoricambi</string>
+	<string name="poi_car">Autosalone</string>
+	<string name="poi_car_parts">Autoricambi</string>
 	<string name="poi_atv">Negozio quad</string>
 	<string name="poi_cosmetics">Negozio cosmetici</string>
 	<string name="poi_marketplace">Mercato</string>
diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml
index a238aae0b0..39a1f64d28 100644
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@@ -8,7 +8,7 @@
 	<string name="poi_beverages">음료 가게</string>
 	<string name="poi_butcher">고기 시장</string>
 	<string name="poi_deli">델리</string>
-	<string name="poi_shop_farm">농장 가게</string>
+	<string name="poi_farm">농장 가게</string>
 	<string name="poi_greengrocer">그린그로서리</string>
 	<string name="poi_seafood">해산물 가게</string>
 	<string name="poi_confectionery">과자</string>
@@ -31,7 +31,7 @@
 	<string name="poi_carpet">카펫 가게</string>
 	<string name="poi_chemist">약국</string>
 	<string name="poi_clothes">의류 매장</string>
-	<string name="poi_children_clothes">어린이 의류</string>
+	<string name="poi_child_clothes">어린이 의류</string>
 	<string name="poi_shoes">신발 가게</string>
 	<string name="poi_computer">컴퓨터 가게</string>
 	<string name="poi_copyshop">복사 가게</string>
@@ -85,8 +85,8 @@
 	<string name="poi_window_blind">창문 블라인드 가게</string>
 	<string name="poi_department_store">백화점</string>
 	<string name="poi_electronics">전자 제품 매장</string>
-	<string name="poi_car_shop">자동차 판매소</string>
-	<string name="poi_car_parts_shop">자동차 부품</string>
+	<string name="poi_car">자동차 판매소</string>
+	<string name="poi_car_parts">자동차 부품</string>
 	<string name="poi_atv">쿼드 가게</string>
 	<string name="poi_cosmetics">화장품</string>
 	<string name="poi_marketplace">마켓 플레이스</string>
@@ -141,7 +141,7 @@
 	<string name="poi_bus_station">버스 정류장</string>
 	<string name="poi_railway_station">기차역</string>
 	<string name="poi_railway_platform">철도 플랫폼</string>
-	<string name="poi_railway_halt">철도 정류장 (사용 되지 않음)</string>
+	<string name="poi_halt">철도 정류장 (사용 되지 않음)</string>
 	<string name="poi_railway_subway_entrance">지하철 입구</string>
 	<string name="poi_subway_station">지하철 역</string>
 	<string name="poi_taxi">택시 승차장</string>
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index 8c685e1cba..3f54c58949 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -9,7 +9,7 @@
 	<string name="poi_beverages">Drankwinkel</string>
 	<string name="poi_butcher">Vleesmarkt</string>
 	<string name="poi_deli">Delicatessenwinkel</string>
-	<string name="poi_shop_farm">Boerderijwinkel</string>
+	<string name="poi_farm">Boerderijwinkel</string>
 	<string name="poi_greengrocer">Groentewinkel</string>
 	<string name="poi_seafood">Viswinkel</string>
 	<string name="poi_confectionery">Banketbakkerij</string>
@@ -33,7 +33,7 @@
 	<string name="poi_carpet">Tapijtwinkel</string>
 	<string name="poi_chemist">Drogisterij</string>
 	<string name="poi_clothes">Kledingwinkel</string>
-	<string name="poi_children_clothes">Kinderkledingwinkel</string>
+	<string name="poi_child_clothes">Kinderkledingwinkel</string>
 	<string name="poi_shoes">Schoenenwinkel</string>
 	<string name="poi_computer">Computerwinkel</string>
 	<string name="poi_copyshop">Kopieerzaak</string>
@@ -87,8 +87,8 @@
 	<string name="poi_window_blind">Rolluikenwinkel</string>
 	<string name="poi_department_store">Warenhuis</string>
 	<string name="poi_electronics">Elektronica-winkel</string>
-	<string name="poi_car_shop">Autohandelaar</string>
-	<string name="poi_car_parts_shop">Auto-onderdelenwinkel</string>
+	<string name="poi_car">Autohandelaar</string>
+	<string name="poi_car_parts">Auto-onderdelenwinkel</string>
 	<string name="poi_atv">Quad-winkel</string>
 	<string name="poi_cosmetics">Cosmeticazaak</string>
 	<string name="poi_marketplace">Marktplaats</string>
@@ -135,7 +135,7 @@
 	<string name="poi_bus_station">Busstation</string>
 	<string name="poi_railway_station">Treinstation</string>
 	<string name="poi_railway_platform">Perron</string>
-	<string name="poi_railway_halt">Treinhalte (verouderd)</string>
+	<string name="poi_halt">Treinhalte (verouderd)</string>
 	<string name="poi_railway_subway_entrance">Metro-ingang</string>
 	<string name="poi_subway_station">Metrostation</string>
 	<string name="poi_taxi">Taxistandplaats</string>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index 2dccd756ba..ef8017b1e2 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -6,7 +6,7 @@
 	<string name="poi_beverages">Napoje</string>
 	<string name="poi_butcher">Sklep mięsny</string>
 	<string name="poi_deli">Delikatesy</string>
-	<string name="poi_shop_farm">Produkty rolne</string>
+	<string name="poi_farm">Produkty rolne</string>
 	<string name="poi_greengrocer">Warzywniak</string>
 	<string name="poi_seafood">Owoce morza</string>
 	<string name="poi_confectionery">Cukiernia</string>
@@ -31,7 +31,7 @@
 	<string name="poi_carpet">Sklep z dywanami</string>
 	<string name="poi_chemist">Sklep z narkotykami</string>
 	<string name="poi_clothes">Sklep odzieżowy</string>
-	<string name="poi_children_clothes">Sklep odzieżowy dla dzieci</string>
+	<string name="poi_child_clothes">Sklep odzieżowy dla dzieci</string>
 	<string name="poi_shoes">Sklep obuwniczy</string>
 	<string name="poi_computer">Sklep komputerowy</string>
 	<string name="poi_curtain">Sklep z zasłonami</string>
@@ -85,8 +85,8 @@
 	<string name="poi_window_blind">Zasłony</string>
 	<string name="poi_department_store">Dom handlowy</string>
 	<string name="poi_electronics">RTV</string>
-	<string name="poi_car_shop">Motoryzacyjny</string>
-	<string name="poi_car_parts_shop">Części samochodowe</string>
+	<string name="poi_car">Motoryzacyjny</string>
+	<string name="poi_car_parts">Części samochodowe</string>
 	<string name="poi_atv">Quady</string>
 	<string name="poi_cosmetics">Kosmetyki</string>
 	<string name="poi_marketplace">Bazar</string>
@@ -178,7 +178,7 @@
 	<string name="poi_speed_camera">Fotoradar</string>
 	<string name="poi_emergency_access_point">Ambulatoryjne świadczenia zdrowotne</string>
 
-	<string name="poi_railway_halt">Dworzec kolejowy (nieaktualne)</string>
+	<string name="poi_halt">Dworzec kolejowy (nieaktualne)</string>
 	<string name="poi_turning_circle">Miejsce do zawracania</string>
 	<string name="poi_motorway_junction">Zjazd z autostrady</string>
 
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index b46a023a05..ce6009fed3 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -7,7 +7,7 @@
 	<string name="poi_beverages">Напитки</string>
 	<string name="poi_butcher">Мясная лавка</string>
 	<string name="poi_deli">Деликатесы</string>
-	<string name="poi_shop_farm">Фермерские продукты</string>
+	<string name="poi_farm">Фермерские продукты</string>
 	<string name="poi_greengrocer">Овощи и фрукты</string>
 	<string name="poi_seafood">Морепродукты</string>
 	<string name="poi_confectionery">Кондитерская</string>
@@ -28,10 +28,10 @@
 	<string name="poi_bed">Спальные принадлежности</string>
 	<string name="poi_boutique">Бутик</string>
 	<string name="poi_carpet">Магазин ковров</string>
-	<string name="poi_charity_shop">Благотворительный магазин</string>
+	<string name="poi_charity">Благотворительный магазин</string>
 	<string name="poi_chemist">Бытовая химия, косметика</string>
 	<string name="poi_clothes">Одежда</string>
-	<string name="poi_children_clothes">Детская одежда</string>
+	<string name="poi_child_clothes">Детская одежда</string>
 	<string name="poi_shoes">Обувь</string>
 	<string name="poi_computer">Компьютеры</string>
 	<string name="poi_copyshop">Ксерокопия, полиграфия</string>
@@ -85,8 +85,8 @@
 	<string name="poi_window_blind">Жалюзи, ставни, маркизы</string>
 	<string name="poi_department_store">Универмаг</string>
 	<string name="poi_electronics">Электроника</string>
-	<string name="poi_car_shop">Автосалон</string>
-	<string name="poi_car_parts_shop">Автозапчасти</string>
+	<string name="poi_car">Автосалон</string>
+	<string name="poi_car_parts">Автозапчасти</string>
 	<string name="poi_atv">Квадроциклы</string>
 	<string name="poi_cosmetics">Косметика, парфюмерия</string>
 	<string name="poi_marketplace">Рынок</string>
@@ -144,7 +144,7 @@
 	<string name="poi_bus_station">Автобусная станция</string>
 	<string name="poi_railway_station">Ж/д станция</string>
 	<string name="poi_railway_platform">Ж/д платформа</string>
-	<string name="poi_railway_halt">Ж/д платформа</string>
+	<string name="poi_halt">Ж/д платформа</string>
 	<string name="poi_railway_subway_entrance">Вход в метро</string>
 	<string name="poi_subway_station">Станция метро</string>
 	<string name="poi_taxi">Стоянка такси</string>
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index b7057f83d7..aad811f624 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -8,7 +8,7 @@
 	<string name="poi_beverages">Butega de bèvidas</string>
 	<string name="poi_butcher">Bancu</string>
 	<string name="poi_deli">Gastronomia</string>
-	<string name="poi_shop_farm">Butega prodotos de fatoria</string>
+	<string name="poi_farm">Butega prodotos de fatoria</string>
 	<string name="poi_greengrocer">Bendidore de frùtora</string>
 	<string name="poi_seafood">Pischeria</string>
 	<string name="poi_confectionery">Butega de durches</string>
@@ -31,7 +31,7 @@
 	<string name="poi_carpet">Butega de tapetes</string>
 	<string name="poi_chemist">Potecaria</string>
 	<string name="poi_clothes">Bestimenta</string>
-	<string name="poi_children_clothes">Bestimenta pro pitzinnos</string>
+	<string name="poi_child_clothes">Bestimenta pro pitzinnos</string>
 	<string name="poi_shoes">Butega de iscarpas</string>
 	<string name="poi_computer">Butega de informàtica</string>
 	<string name="poi_copyshop">Copisteria</string>
@@ -78,8 +78,8 @@
 	<string name="poi_vacuum_cleaner">Butega de suspidoras</string>
 	<string name="poi_video">Videonolègiu</string>
 	<string name="poi_electronics">Butega de eletrònica</string>
-	<string name="poi_car_shop">Butega de automòbiles</string>
-	<string name="poi_car_parts_shop">Autoricàmbios</string>
+	<string name="poi_car">Butega de automòbiles</string>
+	<string name="poi_car_parts">Autoricàmbios</string>
 	<string name="poi_atv">Butega de quad</string>
 	<string name="poi_cosmetics">Butega de bellettos</string>
 	<string name="poi_marketplace">Mercadu</string>
@@ -120,7 +120,7 @@
 	<string name="poi_bus_station">Istatzione bus</string>
 	<string name="poi_railway_station">Istatzione de sos trenos</string>
 	<string name="poi_railway_platform">Piattaredda ferroviària</string>
-	<string name="poi_railway_halt">Firmada de sos trenos (disusada)</string>
+	<string name="poi_halt">Firmada de sos trenos (disusada)</string>
 	<string name="poi_railway_subway_entrance">Intrada de sa metropolitana</string>
 	<string name="poi_subway_station">Istatzione de sa metropolitana</string>
 	<string name="poi_taxi">Postèggiu de sos taxi</string>
diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index 51a6362642..e75bd1eeaf 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -8,7 +8,7 @@
 	<string name="poi_beverages">Напої</string>
 	<string name="poi_butcher">М’ясо</string>
 	<string name="poi_deli">Делікатеси</string>
-	<string name="poi_shop_farm">Продукти з села</string>
+	<string name="poi_farm">Продукти з села</string>
 	<string name="poi_greengrocer">Овочі, фрукти</string>
 	<string name="poi_seafood">Морепродукти</string>
 	<string name="poi_confectionery">Кондитерські вироби</string>
@@ -31,7 +31,7 @@
 	<string name="poi_carpet">Килими</string>
 	<string name="poi_chemist">Аптека</string>
 	<string name="poi_clothes">Магазин одягу</string>
-	<string name="poi_children_clothes">Дитячий одяг</string>
+	<string name="poi_child_clothes">Дитячий одяг</string>
 	<string name="poi_shoes">Магазин взуття</string>
 	<string name="poi_computer">Комп’ютерний магазин</string>
 	<string name="poi_copyshop">Копіювальні послуги, полігрфафія</string>
@@ -85,8 +85,8 @@
 	<string name="poi_window_blind">Жалюзі, віконниці, маркізи</string>
 	<string name="poi_department_store">Универмаг</string>
 	<string name="poi_electronics">Електороніка</string>
-	<string name="poi_car_shop">Автосалон</string>
-	<string name="poi_car_parts_shop">Автозапчастини</string>
+	<string name="poi_car">Автосалон</string>
+	<string name="poi_car_parts">Автозапчастини</string>
 	<string name="poi_atv">Квадроцикли</string>
 	<string name="poi_cosmetics">Косметика</string>
 	<string name="poi_marketplace">Ринок</string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 3e560dc426..b98704f39b 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -73,6 +73,7 @@
 	<string name="poi_bed">Bed room furnishings</string>
 	<string name="poi_boutique">Fashion boutique</string>
 	<string name="poi_carpet">Carpet shop</string>
+	<string name="poi_charity">Charity shop</string>
 	<string name="poi_chemist">Drug store</string>
 	<string name="poi_clothes">Apparel store</string>
 	<string name="poi_child_clothes">Childrens apparel</string>
@@ -442,6 +443,7 @@
 	<string name="poi_rowing">Rowing</string>
 	<string name="poi_rugby_union">Rugby union</string>
 	<string name="poi_rugby_league">Rugby league</string>
+	<string name="poi_sailing">Sailing</string>
 	<string name="poi_shooting">Shooting</string>
 	<string name="poi_skating">Skating</string>
 	<string name="poi_skateboard">Skateboard</string>