diff --git a/data/presets.yaml b/data/presets.yaml
index 15ea0bc60..cf66a1f93 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3995,10 +3995,10 @@ en:
         name: Pit Latrine
         # 'terms: head,lavatory,long drop,outhouse,pit toilet,privy'
         terms: '<translate with synonyms or related terms for ''Pit Latrine'', separated by commas>'
-      amenity/toilets/disposal/portapotty:
+      amenity/toilets/portable:
         # 'amenity=toilets, portable=yes'
         name: Portable Toilet
-        # 'terms: restroom,privy,porta potty,chemical toilet'
+        # 'terms: restroom,privy,porta john,porta potty,portapot,chemical toilet'
         terms: '<translate with synonyms or related terms for ''Portable Toilet'', separated by commas>'
       amenity/townhall:
         # amenity=townhall
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e06076472..5fd544841 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -244,7 +244,7 @@
   "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "opening_hours/covid19", "operator", "payment_multi_fee", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
   "amenity/toilets/disposal/flush": {"icon": "fas-toilet", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "lavatory", "privy", "restroom", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets", "toilets:disposal": "flush"}, "reference": {"key": "toilets:disposal", "value": "flush"}, "name": "Flush Toilets"},
   "amenity/toilets/disposal/pitlatrine": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "reference": {"key": "toilets:disposal", "value": "pitlatrine"}, "name": "Pit Latrine"},
-  "amenity/toilets/disposal/portapotty": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "area", "vertex"], "terms": ["restroom", "privy", "porta potty", "chemical toilet"], "addTags": {"amenity": "toilets", "toilets:disposal": "chemical", "portable": "yes"}, "tags": {"amenity": "toilets", "portable": "yes"}, "reference": {"key": "toilets:disposal", "value": "chemical"}, "name": "Portable Toilet"},
+  "amenity/toilets/portable": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "area", "vertex"], "terms": ["restroom", "privy", "porta john", "porta potty", "portapot", "chemical toilet"], "addTags": {"amenity": "toilets", "toilets:disposal": "chemical", "portable": "yes"}, "tags": {"amenity": "toilets", "portable": "yes"}, "reference": {"key": "toilets:disposal", "value": "chemical"}, "name": "Portable Toilet"},
   "amenity/townhall": {"icon": "temaki-town_hall", "fields": ["name", "operator", "townhall/type", "address", "building_area"], "moreFields": ["baby_feeding", "email", "fax", "gnis/feature_id", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
   "amenity/townhall/city": {"icon": "temaki-capitol", "geometry": ["point", "area"], "terms": ["council", "courthouse", "government", "mayor", "municipality"], "tags": {"amenity": "townhall", "townhall:type": "city"}, "reference": {"key": "townhall:type", "value": "city"}, "name": "City Hall"},
   "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["level", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"},
diff --git a/data/presets/presets/amenity/toilets/disposal/portapotty.json b/data/presets/presets/amenity/toilets/portable.json
similarity index 86%
rename from data/presets/presets/amenity/toilets/disposal/portapotty.json
rename to data/presets/presets/amenity/toilets/portable.json
index 7882ae8d2..85ae5e3ee 100644
--- a/data/presets/presets/amenity/toilets/disposal/portapotty.json
+++ b/data/presets/presets/amenity/toilets/portable.json
@@ -2,7 +2,8 @@
     "icon": "tnp-2009541",
     "fields": [
         "toilets/disposal",
-        "{amenity/toilets}"
+        "{amenity/toilets}",
+        "toilets/handwashing"
     ],
     "moreFields": [
         "{amenity/toilets}"
@@ -15,7 +16,9 @@
     "terms": [
         "restroom",
         "privy",
+        "porta john",
         "porta potty",
+        "portapot",
         "chemical toilet"
     ],
     "addTags": {
@@ -32,4 +35,4 @@
         "value": "chemical"
     },
     "name": "Portable Toilet"
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index d407d0fa0..8af61c3ce 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -6174,9 +6174,9 @@
                     "name": "Pit Latrine",
                     "terms": "head,lavatory,long drop,outhouse,pit toilet,privy"
                 },
-                "amenity/toilets/disposal/portapotty": {
+                "amenity/toilets/portable": {
                     "name": "Portable Toilet",
-                    "terms": "restroom,privy,porta potty,chemical toilet"
+                    "terms": "restroom,privy,porta john,porta potty,portapot,chemical toilet"
                 },
                 "amenity/townhall": {
                     "name": "Town Hall",