diff --git a/data/presets.yaml b/data/presets.yaml
index 10fbee7e9..5a96319c7 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1375,8 +1375,8 @@ en:
         terms: '<translate with synonyms or related terms for ''Apron'', separated by commas>'
       aeroway/gate:
         # aeroway=gate
-        name: Airport gate
-        terms: '<translate with synonyms or related terms for ''Airport gate'', separated by commas>'
+        name: Airport Gate
+        terms: '<translate with synonyms or related terms for ''Airport Gate'', separated by commas>'
       aeroway/hangar:
         # aeroway=hangar
         name: Hangar
@@ -1397,9 +1397,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Taxiway'', separated by commas>'
       aeroway/terminal:
         # aeroway=terminal
-        name: Airport terminal
+        name: Airport Terminal
         # 'terms: airport,aerodrome'
-        terms: '<translate with synonyms or related terms for ''Airport terminal'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Airport Terminal'', separated by commas>'
       amenity:
         # amenity=*
         name: Amenity
diff --git a/data/presets/presets.json b/data/presets/presets.json
index a157cee69..0a27389bf 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -327,6 +327,7 @@
             "name": "Rope Tow Lift"
         },
         "aerialway/station": {
+            "icon": "aerialway",
             "geometry": [
                 "point",
                 "vertex"
@@ -407,7 +408,7 @@
             "tags": {
                 "aeroway": "gate"
             },
-            "name": "Airport gate"
+            "name": "Airport Gate"
         },
         "aeroway/hangar": {
             "geometry": [
@@ -427,6 +428,9 @@
                 "point",
                 "area"
             ],
+            "fields": [
+                "ref"
+            ],
             "terms": [
                 "helicopter",
                 "helipad",
@@ -470,6 +474,7 @@
             "name": "Taxiway"
         },
         "aeroway/terminal": {
+            "icon": "airport",
             "geometry": [
                 "point",
                 "area"
@@ -485,7 +490,7 @@
             "tags": {
                 "aeroway": "terminal"
             },
-            "name": "Airport terminal"
+            "name": "Airport Terminal"
         },
         "amenity/coworking_space": {
             "icon": "commercial",
@@ -1672,7 +1677,7 @@
             "name": "Place of Worship"
         },
         "amenity/place_of_worship/buddhist": {
-            "icon": "place-of-worship",
+            "icon": "buddhism",
             "fields": [
                 "denomination",
                 "building_area",
@@ -2013,7 +2018,7 @@
             "name": "Recycling Center"
         },
         "amenity/recycling": {
-            "icon": "waste-basket",
+            "icon": "recycling",
             "fields": [
                 "recycling_type",
                 "recycling_accepts",
@@ -2125,6 +2130,7 @@
             "name": "School Grounds"
         },
         "amenity/shelter": {
+            "icon": "shelter",
             "fields": [
                 "shelter_type",
                 "bin"
@@ -2240,7 +2246,7 @@
             "name": "Homeless Shelter"
         },
         "amenity/studio": {
-            "icon": "music",
+            "icon": "karaoke",
             "fields": [
                 "studio",
                 "address",
@@ -2593,7 +2599,7 @@
             "name": "Vending Machine"
         },
         "amenity/veterinary": {
-            "icon": "dog-park",
+            "icon": "veterinary",
             "fields": [
                 "operator",
                 "address",
@@ -3820,7 +3826,7 @@
             "name": "Carpet Layer"
         },
         "craft/caterer": {
-            "icon": "bakery",
+            "icon": "restaurant",
             "fields": [
                 "cuisine",
                 "operator",
@@ -4807,7 +4813,7 @@
             "name": "Water Hazard"
         },
         "healthcare/blood_donation": {
-            "icon": "hospital",
+            "icon": "blood-bank",
             "fields": [
                 "operator",
                 "address",
@@ -5777,6 +5783,7 @@
             "name": "Boundary Stone"
         },
         "historic/castle": {
+            "icon": "castle",
             "fields": [
                 "castle_type",
                 "building_area"
@@ -5838,6 +5845,7 @@
             "name": "Wayside Cross"
         },
         "historic/wayside_shrine": {
+            "icon": "landmark",
             "geometry": [
                 "point",
                 "vertex",
@@ -5902,6 +5910,7 @@
             "name": "Community Garden"
         },
         "landuse/basin": {
+            "icon": "water",
             "geometry": [
                 "area"
             ],
@@ -6501,6 +6510,7 @@
             "name": "Quarry"
         },
         "landuse/recreation_ground": {
+            "icon": "pitch",
             "geometry": [
                 "area"
             ],
@@ -6920,6 +6930,7 @@
             "name": "Park"
         },
         "leisure/picnic_table": {
+            "icon": "picnic-site",
             "geometry": [
                 "point"
             ],
@@ -7389,14 +7400,14 @@
             "name": "Cut line"
         },
         "man_made/flagpole": {
+            "icon": "embassy",
             "geometry": [
                 "point"
             ],
             "tags": {
                 "man_made": "flagpole"
             },
-            "name": "Flagpole",
-            "icon": "embassy"
+            "name": "Flagpole"
         },
         "man_made/gasometer": {
             "geometry": [
@@ -7698,6 +7709,7 @@
             "name": "Water Tower"
         },
         "man_made/water_well": {
+            "icon": "water",
             "fields": [
                 "operator"
             ],
@@ -7899,7 +7911,7 @@
             "name": "Heath"
         },
         "natural/peak": {
-            "icon": "triangle",
+            "icon": "mountain",
             "fields": [
                 "elevation"
             ],
@@ -8040,7 +8052,7 @@
             "name": "Tree"
         },
         "natural/volcano": {
-            "icon": "triangle",
+            "icon": "volcano",
             "fields": [
                 "elevation"
             ],
@@ -8898,6 +8910,7 @@
             "name": "Transformer"
         },
         "public_transport/platform": {
+            "icon": "bus",
             "fields": [
                 "ref",
                 "network",
@@ -8980,6 +8993,7 @@
             "name": "Disused Railway"
         },
         "railway/funicular": {
+            "icon": "railway-rail",
             "geometry": [
                 "line"
             ],
@@ -8998,7 +9012,6 @@
             "tags": {
                 "railway": "funicular"
             },
-            "icon": "railway-rail",
             "name": "Funicular"
         },
         "railway/halt": {
@@ -9074,6 +9087,7 @@
             "name": "Narrow Gauge Rail"
         },
         "railway/platform": {
+            "icon": "rail",
             "geometry": [
                 "point",
                 "vertex",
@@ -10165,7 +10179,7 @@
             "name": "Fashion Store"
         },
         "shop/florist": {
-            "icon": "shop",
+            "icon": "florist",
             "fields": [
                 "operator",
                 "address",
@@ -10273,7 +10287,7 @@
             "name": "Furniture Store"
         },
         "shop/garden_centre": {
-            "icon": "shop",
+            "icon": "garden-center",
             "fields": [
                 "operator",
                 "address",
@@ -11186,7 +11200,7 @@
             "name": "Tattoo Parlor"
         },
         "shop/tea": {
-            "icon": "cafe",
+            "icon": "teahouse",
             "fields": [
                 "operator",
                 "address",
@@ -11322,7 +11336,7 @@
             "name": "Variety Store"
         },
         "shop/video_games": {
-            "icon": "shop",
+            "icon": "gaming",
             "fields": [
                 "operator",
                 "address",
@@ -11487,7 +11501,7 @@
             "name": "Guest Apartment / Condo"
         },
         "tourism/aquarium": {
-            "icon": "water",
+            "icon": "aquarium",
             "fields": [
                 "operator",
                 "address",
@@ -11711,6 +11725,7 @@
             "name": "Hotel"
         },
         "tourism/information": {
+            "icon": "information",
             "fields": [
                 "information",
                 "operator",
@@ -11728,6 +11743,7 @@
             "name": "Information"
         },
         "tourism/information/board": {
+            "icon": "information",
             "fields": [
                 "operator",
                 "board_type"
@@ -11743,6 +11759,7 @@
             "name": "Information Board"
         },
         "tourism/information/guidepost": {
+            "icon": "information",
             "fields": [
                 "operator",
                 "ref"
@@ -11758,6 +11775,7 @@
             "name": "Guidepost"
         },
         "tourism/information/map": {
+            "icon": "information",
             "fields": [
                 "operator",
                 "map_type",
@@ -11841,7 +11859,7 @@
             "name": "Museum"
         },
         "tourism/picnic_site": {
-            "icon": "park",
+            "icon": "picnic_site",
             "fields": [
                 "operator",
                 "address",
@@ -11861,6 +11879,7 @@
             "name": "Picnic Site"
         },
         "tourism/theme_park": {
+            "icon": "amusement-park",
             "fields": [
                 "operator",
                 "address",
@@ -12703,7 +12722,7 @@
             "name": "Stream"
         },
         "waterway/water_point": {
-            "icon": "water",
+            "icon": "drinking-water",
             "geometry": [
                 "area",
                 "vertex",
diff --git a/data/presets/presets/aerialway/station.json b/data/presets/presets/aerialway/station.json
index b8019c2a5..19e31c2d9 100644
--- a/data/presets/presets/aerialway/station.json
+++ b/data/presets/presets/aerialway/station.json
@@ -1,4 +1,5 @@
 {
+    "icon": "aerialway",
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/presets/aeroway/gate.json b/data/presets/presets/aeroway/gate.json
index 1926c5364..1a1bdb2f3 100644
--- a/data/presets/presets/aeroway/gate.json
+++ b/data/presets/presets/aeroway/gate.json
@@ -3,9 +3,11 @@
     "geometry": [
         "point"
     ],
-    "fields": ["ref"],
+    "fields": [
+        "ref"
+    ],
     "tags": {
         "aeroway": "gate"
     },
-    "name": "Airport gate"
+    "name": "Airport Gate"
 }
diff --git a/data/presets/presets/aeroway/helipad.json b/data/presets/presets/aeroway/helipad.json
index 96eba12e1..3092f5eb8 100644
--- a/data/presets/presets/aeroway/helipad.json
+++ b/data/presets/presets/aeroway/helipad.json
@@ -4,6 +4,9 @@
         "point",
         "area"
     ],
+    "fields": [
+        "ref"
+    ],
     "terms": [
         "helicopter",
         "helipad",
@@ -13,4 +16,4 @@
         "aeroway": "helipad"
     },
     "name": "Helipad"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/aeroway/terminal.json b/data/presets/presets/aeroway/terminal.json
index bebf16c71..cf83b5dea 100644
--- a/data/presets/presets/aeroway/terminal.json
+++ b/data/presets/presets/aeroway/terminal.json
@@ -1,4 +1,5 @@
 {
+    "icon": "airport",
     "geometry": [
         "point",
         "area"
@@ -14,5 +15,5 @@
     "tags": {
         "aeroway": "terminal"
     },
-    "name": "Airport terminal"
+    "name": "Airport Terminal"
 }
diff --git a/data/presets/presets/amenity/place_of_worship/buddhist.json b/data/presets/presets/amenity/place_of_worship/buddhist.json
index bb3f084f9..3cfea5548 100644
--- a/data/presets/presets/amenity/place_of_worship/buddhist.json
+++ b/data/presets/presets/amenity/place_of_worship/buddhist.json
@@ -1,5 +1,5 @@
 {
-    "icon": "place-of-worship",
+    "icon": "buddhism",
     "fields": [
         "denomination",
         "building_area",
diff --git a/data/presets/presets/amenity/recycling.json b/data/presets/presets/amenity/recycling.json
index d6ca8d20f..4648e3b62 100644
--- a/data/presets/presets/amenity/recycling.json
+++ b/data/presets/presets/amenity/recycling.json
@@ -1,5 +1,5 @@
 {
-    "icon": "waste-basket",
+    "icon": "recycling",
     "fields": [
         "recycling_type",
         "recycling_accepts",
diff --git a/data/presets/presets/amenity/shelter.json b/data/presets/presets/amenity/shelter.json
index 08c0e8cac..068728f6f 100644
--- a/data/presets/presets/amenity/shelter.json
+++ b/data/presets/presets/amenity/shelter.json
@@ -1,4 +1,5 @@
 {
+    "icon": "shelter",
     "fields": [
         "shelter_type",
         "bin"
diff --git a/data/presets/presets/amenity/studio.json b/data/presets/presets/amenity/studio.json
index 3d5cfbaf9..1b43c401d 100644
--- a/data/presets/presets/amenity/studio.json
+++ b/data/presets/presets/amenity/studio.json
@@ -1,5 +1,5 @@
 {
-    "icon": "music",
+    "icon": "karaoke",
     "fields": [
         "studio",
         "address",
diff --git a/data/presets/presets/amenity/veterinary.json b/data/presets/presets/amenity/veterinary.json
index 082505c54..34af360ec 100644
--- a/data/presets/presets/amenity/veterinary.json
+++ b/data/presets/presets/amenity/veterinary.json
@@ -1,5 +1,5 @@
 {
-    "icon": "dog-park",
+    "icon": "veterinary",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/craft/caterer.json b/data/presets/presets/craft/caterer.json
index 0f86cc677..ea09c8d1e 100644
--- a/data/presets/presets/craft/caterer.json
+++ b/data/presets/presets/craft/caterer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "bakery",
+    "icon": "restaurant",
     "fields": [
         "cuisine",
         "operator",
diff --git a/data/presets/presets/healthcare/blood_donation.json b/data/presets/presets/healthcare/blood_donation.json
index cda95b706..877f3f90d 100644
--- a/data/presets/presets/healthcare/blood_donation.json
+++ b/data/presets/presets/healthcare/blood_donation.json
@@ -1,5 +1,5 @@
 {
-    "icon": "hospital",
+    "icon": "blood-bank",
     "fields": [
         "operator",
         "address",
@@ -25,4 +25,3 @@
     },
     "name": "Blood Donor Center"
 }
- 
diff --git a/data/presets/presets/historic/castle.json b/data/presets/presets/historic/castle.json
index 0d9960576..8b38554ae 100644
--- a/data/presets/presets/historic/castle.json
+++ b/data/presets/presets/historic/castle.json
@@ -1,4 +1,5 @@
 {
+    "icon": "castle",
     "fields": [
         "castle_type",
         "building_area"
diff --git a/data/presets/presets/historic/wayside_shrine.json b/data/presets/presets/historic/wayside_shrine.json
index 498fd37cc..b1b070215 100644
--- a/data/presets/presets/historic/wayside_shrine.json
+++ b/data/presets/presets/historic/wayside_shrine.json
@@ -1,4 +1,5 @@
 {
+    "icon": "landmark",
     "geometry": [
         "point",
         "vertex",
@@ -8,4 +9,4 @@
         "historic": "wayside_shrine"
     },
     "name": "Wayside Shrine"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/landuse/basin.json b/data/presets/presets/landuse/basin.json
index 8e1895a33..4b06aa119 100644
--- a/data/presets/presets/landuse/basin.json
+++ b/data/presets/presets/landuse/basin.json
@@ -1,4 +1,5 @@
 {
+    "icon": "water",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/landuse/recreation_ground.json b/data/presets/presets/landuse/recreation_ground.json
index 011391d1e..892d0eefd 100644
--- a/data/presets/presets/landuse/recreation_ground.json
+++ b/data/presets/presets/landuse/recreation_ground.json
@@ -1,4 +1,5 @@
 {
+    "icon": "pitch",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/leisure/picnic_table.json b/data/presets/presets/leisure/picnic_table.json
index f24643f9d..9ddd623c8 100644
--- a/data/presets/presets/leisure/picnic_table.json
+++ b/data/presets/presets/leisure/picnic_table.json
@@ -1,4 +1,5 @@
 {
+    "icon": "picnic-site",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/man_made/adit.json b/data/presets/presets/man_made/adit.json
index b8f3988aa..0ef5998a8 100644
--- a/data/presets/presets/man_made/adit.json
+++ b/data/presets/presets/man_made/adit.json
@@ -6,10 +6,12 @@
     "fields": [
         "operator"
     ],
-    "terms": ["entrance",
+    "terms": [
+        "entrance",
         "underground",
         "mine",
-        "cave"],
+        "cave"
+    ],
     "tags": {
         "man_made": "adit"
     },
diff --git a/data/presets/presets/man_made/flagpole.json b/data/presets/presets/man_made/flagpole.json
index 49a64cb7b..7cc243513 100644
--- a/data/presets/presets/man_made/flagpole.json
+++ b/data/presets/presets/man_made/flagpole.json
@@ -1,10 +1,10 @@
 {
+    "icon": "embassy",
     "geometry": [
         "point"
     ],
     "tags": {
         "man_made": "flagpole"
     },
-    "name": "Flagpole",
-    "icon": "embassy"
+    "name": "Flagpole"
 }
diff --git a/data/presets/presets/man_made/water_well.json b/data/presets/presets/man_made/water_well.json
index a45d9db70..25f2f1d7b 100644
--- a/data/presets/presets/man_made/water_well.json
+++ b/data/presets/presets/man_made/water_well.json
@@ -1,4 +1,5 @@
 {
+    "icon": "water",
     "fields": [
         "operator"
     ],
diff --git a/data/presets/presets/natural/peak.json b/data/presets/presets/natural/peak.json
index 718a68c21..de61c6702 100644
--- a/data/presets/presets/natural/peak.json
+++ b/data/presets/presets/natural/peak.json
@@ -1,5 +1,5 @@
 {
-    "icon": "triangle",
+    "icon": "mountain",
     "fields": [
         "elevation"
     ],
@@ -26,4 +26,4 @@
         "top"
     ],
     "name": "Peak"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/natural/volcano.json b/data/presets/presets/natural/volcano.json
index 715e037c6..09abc648c 100644
--- a/data/presets/presets/natural/volcano.json
+++ b/data/presets/presets/natural/volcano.json
@@ -1,5 +1,5 @@
 {
-    "icon": "triangle",
+    "icon": "volcano",
     "fields": [
         "elevation"
     ],
diff --git a/data/presets/presets/public_transport/platform.json b/data/presets/presets/public_transport/platform.json
index a0623ba08..df40cd78e 100644
--- a/data/presets/presets/public_transport/platform.json
+++ b/data/presets/presets/public_transport/platform.json
@@ -1,4 +1,5 @@
 {
+    "icon": "bus",
     "fields": [
         "ref",
         "network",
diff --git a/data/presets/presets/railway/funicular.json b/data/presets/presets/railway/funicular.json
index 48016ba43..392320523 100644
--- a/data/presets/presets/railway/funicular.json
+++ b/data/presets/presets/railway/funicular.json
@@ -1,4 +1,5 @@
 {
+    "icon": "railway-rail",
     "geometry": [
         "line"
     ],
@@ -17,6 +18,5 @@
     "tags": {
         "railway": "funicular"
     },
-    "icon": "railway-rail",
     "name": "Funicular"
 }
diff --git a/data/presets/presets/railway/platform.json b/data/presets/presets/railway/platform.json
index 77b1060b7..5063a282d 100644
--- a/data/presets/presets/railway/platform.json
+++ b/data/presets/presets/railway/platform.json
@@ -1,4 +1,5 @@
 {
+    "icon": "rail",
     "geometry": [
         "point",
         "vertex",
@@ -9,4 +10,4 @@
         "railway": "platform"
     },
     "name": "Railway Platform"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/florist.json b/data/presets/presets/shop/florist.json
index 504a8c3e5..efa9a54f8 100644
--- a/data/presets/presets/shop/florist.json
+++ b/data/presets/presets/shop/florist.json
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "florist",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/shop/garden_centre.json b/data/presets/presets/shop/garden_centre.json
index 363fa60ff..43cd8b500 100644
--- a/data/presets/presets/shop/garden_centre.json
+++ b/data/presets/presets/shop/garden_centre.json
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "garden-center",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/shop/tea.json b/data/presets/presets/shop/tea.json
index 2afb7d62a..3dddcc4d3 100644
--- a/data/presets/presets/shop/tea.json
+++ b/data/presets/presets/shop/tea.json
@@ -1,5 +1,5 @@
 {
-    "icon": "cafe",
+    "icon": "teahouse",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/shop/video_games.json b/data/presets/presets/shop/video_games.json
index ceab1cdab..cbb1dbeca 100644
--- a/data/presets/presets/shop/video_games.json
+++ b/data/presets/presets/shop/video_games.json
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "gaming",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/tourism/aquarium.json b/data/presets/presets/tourism/aquarium.json
index 622245b06..8e019bb3e 100644
--- a/data/presets/presets/tourism/aquarium.json
+++ b/data/presets/presets/tourism/aquarium.json
@@ -1,5 +1,5 @@
 {
-    "icon": "water",
+    "icon": "aquarium",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/tourism/information.json b/data/presets/presets/tourism/information.json
index 7beee9480..b8b17ef39 100644
--- a/data/presets/presets/tourism/information.json
+++ b/data/presets/presets/tourism/information.json
@@ -1,4 +1,5 @@
 {
+    "icon": "information",
     "fields": [
         "information",
         "operator",
diff --git a/data/presets/presets/tourism/information/board.json b/data/presets/presets/tourism/information/board.json
index 5333b01f0..13c92db5b 100644
--- a/data/presets/presets/tourism/information/board.json
+++ b/data/presets/presets/tourism/information/board.json
@@ -1,4 +1,5 @@
 {
+    "icon": "information",
     "fields": [
         "operator",
         "board_type"
diff --git a/data/presets/presets/tourism/information/guidepost.json b/data/presets/presets/tourism/information/guidepost.json
index 88f35e4a6..e28b40e7f 100644
--- a/data/presets/presets/tourism/information/guidepost.json
+++ b/data/presets/presets/tourism/information/guidepost.json
@@ -1,4 +1,5 @@
 {
+    "icon": "information",
     "fields": [
         "operator",
         "ref"
diff --git a/data/presets/presets/tourism/information/map.json b/data/presets/presets/tourism/information/map.json
index 179def1fc..e2caf069c 100644
--- a/data/presets/presets/tourism/information/map.json
+++ b/data/presets/presets/tourism/information/map.json
@@ -1,4 +1,5 @@
 {
+    "icon": "information",
     "fields": [
         "operator",
         "map_type",
diff --git a/data/presets/presets/tourism/picnic_site.json b/data/presets/presets/tourism/picnic_site.json
index 7322d882d..b27542c29 100644
--- a/data/presets/presets/tourism/picnic_site.json
+++ b/data/presets/presets/tourism/picnic_site.json
@@ -1,5 +1,5 @@
 {
-    "icon": "park",
+    "icon": "picnic_site",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/tourism/theme_park.json b/data/presets/presets/tourism/theme_park.json
index 298f0115f..046b197a8 100644
--- a/data/presets/presets/tourism/theme_park.json
+++ b/data/presets/presets/tourism/theme_park.json
@@ -1,4 +1,5 @@
 {
+    "icon": "amusement-park",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/waterway/water_point.json b/data/presets/presets/waterway/water_point.json
index ddebec811..07803dc63 100644
--- a/data/presets/presets/waterway/water_point.json
+++ b/data/presets/presets/waterway/water_point.json
@@ -1,5 +1,5 @@
 {
-     "icon": "water",
+     "icon": "drinking-water",
      "geometry": [
         "area",
         "vertex",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 4dc8e45f4..0ba0ef32d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1914,7 +1914,7 @@
                     "terms": "ramp"
                 },
                 "aeroway/gate": {
-                    "name": "Airport gate",
+                    "name": "Airport Gate",
                     "terms": ""
                 },
                 "aeroway/hangar": {
@@ -1934,7 +1934,7 @@
                     "terms": ""
                 },
                 "aeroway/terminal": {
-                    "name": "Airport terminal",
+                    "name": "Airport Terminal",
                     "terms": "airport,aerodrome"
                 },
                 "amenity/coworking_space": {