diff --git a/data/presets.yaml b/data/presets.yaml
index 7471e99f7..eb7421c5d 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3960,10 +3960,10 @@ en:
         # '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, toilets:disposal=chemical, portable=yes'
-        name: Porta Potty
-        # 'terms: restroom,privy,portable toilet,chemical toilet'
-        terms: '<translate with synonyms or related terms for ''Porta Potty'', separated by commas>'
+        # 'amenity=toilets, portable=yes'
+        name: Portable Toilet
+        # 'terms: restroom,privy,porta potty,chemical toilet'
+        terms: '<translate with synonyms or related terms for ''Portable Toilet'', separated by commas>'
       amenity/townhall:
         # amenity=townhall
         name: Town Hall
diff --git a/data/presets/presets.json b/data/presets/presets.json
index f578e2adf..9aef69c0f 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -241,7 +241,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", "portable toilet", "chemical toilet"], "tags": {"amenity": "toilets", "toilets:disposal": "chemical", "portable": "yes"}, "reference": {"key": "toilets:disposal", "value": "chemical"}, "name": "Porta Potty"},
+  "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/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/disposal/portapotty.json
index 45fcefe29..7882ae8d2 100644
--- a/data/presets/presets/amenity/toilets/disposal/portapotty.json
+++ b/data/presets/presets/amenity/toilets/disposal/portapotty.json
@@ -15,17 +15,21 @@
     "terms": [
         "restroom",
         "privy",
-        "portable toilet",
+        "porta potty",
         "chemical toilet"
     ],
-    "tags": {
+    "addTags": {
         "amenity": "toilets",
         "toilets:disposal": "chemical",
         "portable": "yes"
     },
+    "tags": {
+        "amenity": "toilets",
+        "portable": "yes"
+    },
     "reference": {
         "key": "toilets:disposal",
         "value": "chemical"
     },
-    "name": "Porta Potty"
+    "name": "Portable Toilet"
 }
\ No newline at end of file
diff --git a/data/taginfo.json b/data/taginfo.json
index ca57667bd..0d6d05033 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -239,7 +239,7 @@
     {"key": "amenity", "value": "toilets", "description": "🄿 Toilets", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/toilet-15.svg"},
     {"key": "toilets:disposal", "value": "flush", "description": "🄿 Flush Toilets, 🄵 Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-toilet.svg"},
     {"key": "toilets:disposal", "value": "pitlatrine", "description": "🄿 Pit Latrine, 🄵 Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/the-noun-project/2009541.svg"},
-    {"key": "portable", "value": "yes", "description": "🄿 Porta Potty", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/the-noun-project/2009541.svg"},
+    {"key": "portable", "value": "yes", "description": "🄿 Portable Toilet", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/the-noun-project/2009541.svg"},
     {"key": "amenity", "value": "townhall", "description": "🄿 Town Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/town_hall.svg"},
     {"key": "townhall:type", "value": "city", "description": "🄿 City Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/capitol.svg"},
     {"key": "amenity", "value": "toy_library", "description": "🄿 Toy Library", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-chess-knight.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index def71fe93..0da8aa351 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -6142,8 +6142,8 @@
                     "terms": "head,lavatory,long drop,outhouse,pit toilet,privy"
                 },
                 "amenity/toilets/disposal/portapotty": {
-                    "name": "Porta Potty",
-                    "terms": "restroom,privy,portable toilet,chemical toilet"
+                    "name": "Portable Toilet",
+                    "terms": "restroom,privy,porta potty,chemical toilet"
                 },
                 "amenity/townhall": {
                     "name": "Town Hall",