diff --git a/data/presets.yaml b/data/presets.yaml
index d071b66cc..b06c03e68 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -53,7 +53,6 @@ en:
       address: 
         label: Address
         placeholders: 
-          housename: Housename
           number: "123"
           street: Street
           city: City
@@ -101,8 +100,6 @@ en:
         label: Building
       building_area: 
         label: Building
-      cans: 
-        label: Accepts Cans
       capacity: 
         label: Capacity
         placeholder: "50, 100, 200..."
@@ -113,8 +110,6 @@ en:
         options: 
           clockwise: Clockwise
           anticlockwise: Counterclockwise
-      clothes: 
-        label: Accepts Clothes
       collection_times: 
         label: Collection Times
       construction: 
@@ -158,8 +153,6 @@ en:
         label: Source
       generator/type: 
         label: Type
-      glass: 
-        label: Accepts Glass
       golf_hole: 
         label: Reference
         placeholder: "Hole number (1-18)"
@@ -226,8 +219,6 @@ en:
         label: Hours
       operator: 
         label: Operator
-      paper: 
-        label: Accepts Paper
       par: 
         label: Par
         placeholder: "3, 4, 5..."
@@ -250,6 +241,14 @@ en:
         label: Type
       railway: 
         label: Type
+      recycling/cans: 
+        label: Accepts Cans
+      recycling/clothes: 
+        label: Accepts Clothes
+      recycling/glass: 
+        label: Accepts Glass
+      recycling/paper: 
+        label: Accepts Paper
       ref: 
         label: Reference
       relation: 
diff --git a/data/presets/fields.json b/data/presets/fields.json
index d0bd2099f..5754ec726 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -60,7 +60,6 @@
     "address": {
         "type": "address",
         "keys": [
-            "addr:housename",
             "addr:housenumber",
             "addr:street",
             "addr:city",
@@ -71,7 +70,6 @@
         "label": "Address",
         "strings": {
             "placeholders": {
-                "housename": "Housename",
                 "number": "123",
                 "street": "Street",
                 "city": "City",
@@ -194,11 +192,6 @@
         "geometry": "area",
         "label": "Building"
     },
-    "cans": {
-        "key": "cans",
-        "type": "check",
-        "label": "Accepts Cans"
-    },
     "capacity": {
         "key": "capacity",
         "type": "number",
@@ -242,11 +235,6 @@
             }
         }
     },
-    "clothes": {
-        "key": "clothes",
-        "type": "check",
-        "label": "Accepts Clothes"
-    },
     "collection_times": {
         "key": "collection_times",
         "type": "text",
@@ -368,11 +356,6 @@
         "type": "combo",
         "label": "Type"
     },
-    "glass": {
-        "key": "glass",
-        "type": "check",
-        "label": "Accepts Glass"
-    },
     "golf_hole": {
         "key": "ref",
         "type": "text",
@@ -533,11 +516,6 @@
         "type": "text",
         "label": "Operator"
     },
-    "paper": {
-        "key": "paper",
-        "type": "check",
-        "label": "Accepts Paper"
-    },
     "par": {
         "key": "par",
         "type": "number",
@@ -601,6 +579,26 @@
         "type": "typeCombo",
         "label": "Type"
     },
+    "recycling/cans": {
+        "key": "recycling:cans",
+        "type": "check",
+        "label": "Accepts Cans"
+    },
+    "recycling/clothes": {
+        "key": "recycling:clothes",
+        "type": "check",
+        "label": "Accepts Clothes"
+    },
+    "recycling/glass": {
+        "key": "recycling:glass",
+        "type": "check",
+        "label": "Accepts Glass"
+    },
+    "recycling/paper": {
+        "key": "recycling:paper",
+        "type": "check",
+        "label": "Accepts Paper"
+    },
     "ref": {
         "key": "ref",
         "type": "text",
diff --git a/data/presets/fields/cans.json b/data/presets/fields/recycling/cans.json
similarity index 64%
rename from data/presets/fields/cans.json
rename to data/presets/fields/recycling/cans.json
index c286f2a71..8829418c6 100644
--- a/data/presets/fields/cans.json
+++ b/data/presets/fields/recycling/cans.json
@@ -1,5 +1,5 @@
 {
-    "key": "cans",
+    "key": "recycling:cans",
     "type": "check",
     "label": "Accepts Cans"
 }
diff --git a/data/presets/fields/clothes.json b/data/presets/fields/recycling/clothes.json
similarity index 63%
rename from data/presets/fields/clothes.json
rename to data/presets/fields/recycling/clothes.json
index 4b81f306a..f90dfaac6 100644
--- a/data/presets/fields/clothes.json
+++ b/data/presets/fields/recycling/clothes.json
@@ -1,5 +1,5 @@
 {
-    "key": "clothes",
+    "key": "recycling:clothes",
     "type": "check",
     "label": "Accepts Clothes"
 }
diff --git a/data/presets/fields/glass.json b/data/presets/fields/recycling/glass.json
similarity index 64%
rename from data/presets/fields/glass.json
rename to data/presets/fields/recycling/glass.json
index b61ac9bb5..df6b23073 100644
--- a/data/presets/fields/glass.json
+++ b/data/presets/fields/recycling/glass.json
@@ -1,5 +1,5 @@
 {
-    "key": "glass",
+    "key": "recycling:glass",
     "type": "check",
     "label": "Accepts Glass"
 }
diff --git a/data/presets/fields/paper.json b/data/presets/fields/recycling/paper.json
similarity index 64%
rename from data/presets/fields/paper.json
rename to data/presets/fields/recycling/paper.json
index 977a52730..49e09c46e 100644
--- a/data/presets/fields/paper.json
+++ b/data/presets/fields/recycling/paper.json
@@ -1,5 +1,5 @@
 {
-    "key": "paper",
+    "key": "recycling:paper",
     "type": "check",
     "label": "Accepts Paper"
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 5de3936ba..9a751caa5 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1241,10 +1241,10 @@
     "amenity/recycling": {
         "icon": "recycling",
         "fields": [
-            "cans",
-            "glass",
-            "paper",
-            "clothes"
+            "recycling/cans",
+            "recycling/glass",
+            "recycling/paper",
+            "recycling/clothes"
         ],
         "geometry": [
             "point",
diff --git a/data/presets/presets/amenity/recycling.json b/data/presets/presets/amenity/recycling.json
index 1d9082294..975b641b5 100644
--- a/data/presets/presets/amenity/recycling.json
+++ b/data/presets/presets/amenity/recycling.json
@@ -1,10 +1,10 @@
 {
     "icon": "recycling",
     "fields": [
-        "cans",
-        "glass",
-        "paper",
-        "clothes"
+        "recycling/cans",
+        "recycling/glass",
+        "recycling/paper",
+        "recycling/clothes"
     ],
     "geometry": [
         "point",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 1b40481ad..894eaf3a1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -470,7 +470,6 @@
             "address": {
                 "label": "Address",
                 "placeholders": {
-                    "housename": "Housename",
                     "number": "123",
                     "street": "Street",
                     "city": "City",
@@ -540,9 +539,6 @@
             "building_area": {
                 "label": "Building"
             },
-            "cans": {
-                "label": "Accepts Cans"
-            },
             "capacity": {
                 "label": "Capacity",
                 "placeholder": "50, 100, 200..."
@@ -557,9 +553,6 @@
                     "anticlockwise": "Counterclockwise"
                 }
             },
-            "clothes": {
-                "label": "Accepts Clothes"
-            },
             "collection_times": {
                 "label": "Collection Times"
             },
@@ -624,9 +617,6 @@
             "generator/type": {
                 "label": "Type"
             },
-            "glass": {
-                "label": "Accepts Glass"
-            },
             "golf_hole": {
                 "label": "Reference",
                 "placeholder": "Hole number (1-18)"
@@ -721,9 +711,6 @@
             "operator": {
                 "label": "Operator"
             },
-            "paper": {
-                "label": "Accepts Paper"
-            },
             "par": {
                 "label": "Par",
                 "placeholder": "3, 4, 5..."
@@ -756,6 +743,18 @@
             "railway": {
                 "label": "Type"
             },
+            "recycling/cans": {
+                "label": "Accepts Cans"
+            },
+            "recycling/clothes": {
+                "label": "Accepts Clothes"
+            },
+            "recycling/glass": {
+                "label": "Accepts Glass"
+            },
+            "recycling/paper": {
+                "label": "Accepts Paper"
+            },
             "ref": {
                 "label": "Reference"
             },