diff --git a/data/presets.yaml b/data/presets.yaml
index bcade88e09..c29bf6393e 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2447,12 +2447,13 @@ en:
         name: Nursing Home
       amenity/parking:
         # amenity=parking
-        name: Car Parking
-        terms: '<translate with synonyms or related terms for ''Car Parking'', separated by commas>'
+        name: Parking Lot
+        # 'terms: car,parking lot'
+        terms: '<translate with synonyms or related terms for ''Parking Lot'', separated by commas>'
       amenity/parking/multi-storey:
         # 'amenity=parking, parking=multi-storey'
         name: Multilevel Car Parking
-        # 'terms: multistorey car park,parking garage,parkade,parking structure,parking ramp,parking deck,parking building,indoor parking'
+        # 'terms: car,indoor parking,multistorey car park,parkade,parking building,parking deck,parking garage,parking ramp,parking structure'
         terms: '<translate with synonyms or related terms for ''Multilevel Car Parking'', separated by commas>'
       amenity/parking_entrance:
         # amenity=parking_entrance
diff --git a/data/presets/presets.json b/data/presets/presets.json
index b2f94a36f4..18d2d2afca 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -104,8 +104,8 @@
     "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
     "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["access_simple", "ref"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"},
     "amenity/parking_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"},
-    "amenity/parking": {"icon": "maki-parking", "fields": ["name", "operator", "parking", "capacity", "fee", "access_simple", "supervised", "park_ride", "surface", "maxstay"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": [], "name": "Car Parking"},
-    "amenity/parking/multi-storey": {"icon": "maki-parking-garage", "fields": ["name", "building", "levels", "height", "address"], "geometry": ["area"], "terms": ["multistorey car park", "parking garage", "parkade", "parking structure", "parking ramp", "parking deck", "parking building", "indoor parking"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "removeTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "name": "Multilevel Car Parking"},
+    "amenity/parking": {"icon": "maki-car", "fields": ["name", "operator", "parking", "capacity", "fee", "access_simple", "supervised", "park_ride", "surface", "maxstay"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["car", "parking lot"], "name": "Parking Lot"},
+    "amenity/parking/multi-storey": {"icon": "maki-car", "fields": ["name", "operator", "building", "levels", "height", "address", "capacity", "fee", "access_simple"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "removeTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "name": "Multilevel Car Parking"},
     "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "opening_hours", "payment_multi", "dispensing"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "removeTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug*", "med*", "prescription"], "name": "Pharmacy"},
     "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
     "amenity/place_of_worship/buddhist": {"icon": "maki-buddhism", "fields": ["name", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"},
diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json
index f26e20d789..df7f37137a 100644
--- a/data/presets/presets/amenity/parking.json
+++ b/data/presets/presets/amenity/parking.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-parking",
+    "icon": "maki-car",
     "fields": [
         "name",
         "operator",
@@ -20,6 +20,9 @@
     "tags": {
         "amenity": "parking"
     },
-    "terms": [],
-    "name": "Car Parking"
+    "terms": [
+        "car",
+        "parking lot"
+    ],
+    "name": "Parking Lot"
 }
diff --git a/data/presets/presets/amenity/parking/multi-storey.json b/data/presets/presets/amenity/parking/multi-storey.json
index 6e1fd256a9..f443cb5388 100644
--- a/data/presets/presets/amenity/parking/multi-storey.json
+++ b/data/presets/presets/amenity/parking/multi-storey.json
@@ -1,16 +1,18 @@
 {
-    "icon": "maki-parking-garage",
-    "fields": ["name", "building", "levels", "height", "address"],
-    "geometry": ["area"],
-    "terms": [
-        "multistorey car park",
-        "parking garage",
-        "parkade",
-        "parking structure",
-        "parking ramp",
-        "parking deck",
-        "parking building",
-        "indoor parking"
+    "icon": "maki-car",
+    "fields": [
+        "name",
+        "operator",
+        "building",
+        "levels",
+        "height",
+        "address",
+        "capacity",
+        "fee",
+        "access_simple"
+    ],
+    "geometry": [
+        "area"
     ],
     "tags": {
         "amenity": "parking",
@@ -30,5 +32,16 @@
         "key": "parking",
         "value": "multi-storey"
     },
+    "terms": [
+        "car",
+        "indoor parking",
+        "multistorey car park",
+        "parkade",
+        "parking building",
+        "parking deck",
+        "parking garage",
+        "parking ramp",
+        "parking structure"
+    ],
     "name": "Multilevel Car Parking"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 74d0506410..f5227d7057 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -703,16 +703,16 @@
     {
       "key": "amenity",
       "value": "parking",
-      "description": "Car Parking",
+      "description": "Parking Lot",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/parking-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"
     },
     {
       "key": "parking",
       "value": "multi-storey",
       "description": "Multilevel Car Parking, Type",
       "object_types": ["area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/parking-garage-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"
     },
     {
       "key": "amenity",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a8bc9eca84..39a1965aea 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3568,12 +3568,12 @@
                     "terms": ""
                 },
                 "amenity/parking": {
-                    "name": "Car Parking",
-                    "terms": ""
+                    "name": "Parking Lot",
+                    "terms": "car,parking lot"
                 },
                 "amenity/parking/multi-storey": {
                     "name": "Multilevel Car Parking",
-                    "terms": "multistorey car park,parking garage,parkade,parking structure,parking ramp,parking deck,parking building,indoor parking"
+                    "terms": "car,indoor parking,multistorey car park,parkade,parking building,parking deck,parking garage,parking ramp,parking structure"
                 },
                 "amenity/pharmacy": {
                     "name": "Pharmacy",