Use more common names for Trash Can & Recycling Bin presets (#938)

data/presets/amenity/recycling_container.json

@@ -38,5 +38,8 @@
         "key": "amenity",
         "value": "recycling"
     },
-    "name": "Recycling Container"
+    "aliases": [
+        "Recycling Container"
+    ],
+    "name": "Recycling Bin"
 }

data/presets/amenity/waste_basket.json

@@ -26,5 +26,8 @@
         "litter",
         "trash"
     ],
-    "name": "Waste Basket"
+    "aliases": [
+        "Waste Basket"
+    ],
+    "name": "Trash Can"
 }