diff --git a/data/presets/amenity/waste/_waste.json b/data/presets/amenity/waste/_waste.json
deleted file mode 100644
index 6bfef5c1..00000000
--- a/data/presets/amenity/waste/_waste.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "icon": "maki-waste-basket",
-    "fields": [
-        "{amenity/waste_basket}"
-    ],
-    "moreFields": [
-        "{amenity/waste_basket}"
-    ],
-    "geometry": [
-        "point",
-        "vertex"
-    ],
-    "tags": {
-        "amenity": "waste_basket",
-        "waste": "*"
-    },
-    "reference": {
-        "key": "amenity",
-        "value": "waste_basket"
-    },
-    "name": "Waste Bin",
-    "searchable": false,
-    "matchScore": 0.95
-}
diff --git a/data/presets/amenity/waste/trash.json b/data/presets/amenity/waste/trash.json
deleted file mode 100644
index 1f1c99ac..00000000
--- a/data/presets/amenity/waste/trash.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "icon": "maki-waste-basket",
-    "fields": [
-        "{amenity/waste_basket}"
-    ],
-    "moreFields": [
-        "{amenity/waste_basket}"
-    ],
-    "geometry": [
-        "point",
-        "vertex"
-    ],
-    "tags": {
-        "amenity": "waste_basket",
-        "waste": "trash"
-    },
-    "reference": {
-        "key": "waste",
-        "value": "trash"
-    },
-    "terms": [
-        "garbage",
-        "landfill",
-        "rubbish",
-        "litter",
-        "trash"
-    ],
-    "name": "Trash Can"
-}
diff --git a/data/presets/amenity/waste_basket.json b/data/presets/amenity/waste_basket.json
index ee8ac135..ec76b181 100644
--- a/data/presets/amenity/waste_basket.json
+++ b/data/presets/amenity/waste_basket.json
@@ -20,11 +20,14 @@
         "amenity": "waste_basket"
     },
     "terms": [
-        "bin"
+        "bin",
+        "garbage",
+        "rubbish",
+        "litter",
+        "trash"
     ],
     "aliases": [
         "Waste Basket"
     ],
-    "name": "Waste Bin (unspecified type)",
-    "matchScore": 0.9
+    "name": "Trash Can"
 }