diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml
index ada7eaeab..c3cc2955b 100644
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -52,7 +52,7 @@
     <string name="type.amenity.charging_station.motorcar.small">Car Charging Point</string>
     <string name="type.amenity.childcare">Nursery</string>
     <string name="type.amenity.cinema">Cinema</string>
-    <string name="type.amenity.studio">Studio</string>
+    <string name="type.amenity.studio">Media Studio</string>
     <string name="type.leisure.bowling_alley">Bowling Alley</string>
     <string name="type.amenity.clinic">Clinic</string>
     <string name="type.amenity.college">College</string>
@@ -1187,7 +1187,7 @@
     <string name="type.shop.chemist">Chemist</string>
     <string name="type.shop.chocolate">Chocolate Shop</string>
     <string name="type.shop.clothes">Clothes Shop</string>
-    <string name="type.shop.coffee">Coffee Shop</string>
+    <string name="type.shop.coffee">Coffee Retailer</string>
     <string name="type.shop.computer">Computer Store</string>
     <string name="type.shop.confectionery">Candy Shop</string>
     <string name="type.shop.convenience">Convenience Store</string>
diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json
index a3d59959e..942d6a66c 100644
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -18,7 +18,7 @@
 "amenity-bank|@category_bank": "money|U+1F3E6|U+1F4B0|U+1F4B2|U+1F4B3|U+1F4B4|U+1F4B5|U+1F4B6|U+1F4B7",
 "@category_recycling": "4Recycling|Waste utilization|Waste disposal|Recyclables|Separate garbage collection|Waste sorting|Reuse",
 "amenity-bureau_de_change": "3Currency Exchange|3exchange|money|U+1F4B1|U+1F4B2|U+1F4B4|U+1F4B5|U+1F4B6|U+1F4B7",
-"amenity-studio": "Studio",
+"amenity-studio": "Media Studio|Studio",
 "amenity-bar|amenity-pub|@category_eat|@category_nightlife": "2Bar|2pub|beer|drink|U+1F37A|U+1F37B|U+1F376|tavern|bars and pubs|brew pub|cocktail lounge",
 "amenity-cafe|@category_eat": "3Cafe|U+2615|U+1F356|U+1F357|U+1F35A|U+1F35B|U+1F35C|U+1F35D|U+1F363|U+1F366|U+1F367|U+1F368|U+1F369|U+1F370|U+1F372|U+1F374|U+1F377|U+1F60B|U+1F375|coffee|cafeteria",
 "amenity-fast_food|@category_eat": "4Fast Food|takeaway|U+1F354|U+1F355|U+1F35F|U+1F363|U+1F366|U+1F367|U+1F368|U+1F369|U+1F370|U+1F372|U+1F374|food to go|junk food",
@@ -453,7 +453,7 @@
 "piste:type-downhill|piste:type-nordic": "Skiing|3Ski run|4Piste",
 "amenity-events_venue": "Events Venue",
 "shop-chocolate|@category_food|@shop": "Chocolate",
-"shop-coffee|@category_food|@shop": "Coffee",
+"shop-coffee|@category_food|@shop": "Coffee Retailer|Coffee",
 "shop-fabric|@shop": "Fabric",
 "shop-money_lender": "Money lender",
 "shop-music|@shop": "Record|vinyl|Music",
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index 38f51ccd0..39622a9f2 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -45,7 +45,7 @@
 "type.amenity.car_wash" = "Car Wash";
 "type.amenity.casino" = "Casino";
 "type.amenity.gambling" = "Gambling";
-"type.amenity.studio" = "Studio";
+"type.amenity.studio" = "Media Studio";
 "type.leisure.adult_gaming_centre" = "Adult Gaming Centre";
 "type.leisure.amusement_arcade" = "Arcade";
 "type.amenity.charging_station" = "Charging Station";
@@ -1282,7 +1282,7 @@
 "type.shop.chemist" = "Chemist";
 "type.shop.chocolate" = "Chocolate Shop";
 "type.shop.clothes" = "Clothes Shop";
-"type.shop.coffee" = "Coffee Shop";
+"type.shop.coffee" = "Coffee Retailer";
 "type.shop.computer" = "Computer Store";
 "type.shop.confectionery" = "Candy Shop";
 "type.shop.convenience" = "Convenience Store";