diff --git a/data/fields/toilets.json b/data/fields/toilets.json
index 56ee1764..81626371 100644
--- a/data/fields/toilets.json
+++ b/data/fields/toilets.json
@@ -1,5 +1,16 @@
 {
     "key": "toilets",
     "type": "check",
-    "label": "Toilets"
+    "label": "Restroom",
+    "terms": [
+        "bathroom",
+        "latrine",
+        "lavatory",
+        "outhouse",
+        "privy",
+        "toilet",
+        "water closet",
+        "W.C.",
+        "WC"
+    ]
 }
diff --git a/data/presets/amenity/toilets.json b/data/presets/amenity/toilets.json
index ef29db66..5821f4c0 100644
--- a/data/presets/amenity/toilets.json
+++ b/data/presets/amenity/toilets.json
@@ -30,17 +30,17 @@
         "privy",
         "head",
         "latrine",
+        "water closet",
         "WC",
         "W.C."
     ],
     "tags": {
         "amenity": "toilets"
     },
-    "name": "Restroom",
+    "name": "Toilets",
     "aliases": [
-        "Toilets",
+        "Restroom",
         "Bathroom",
-        "Lavatory",
-        "Water Closet"
+        "Lavatory"
     ]
 }
diff --git a/data/presets/amenity/toilets/disposal/flush.json b/data/presets/amenity/toilets/disposal/flush.json
index f681e9e9..f2bc74d0 100644
--- a/data/presets/amenity/toilets/disposal/flush.json
+++ b/data/presets/amenity/toilets/disposal/flush.json
@@ -30,5 +30,8 @@
         "key": "toilets:disposal",
         "value": "flush"
     },
-    "name": "Flush Toilets"
+    "name": "Flush Toilets",
+    "aliases": [
+        "Water Closet"
+    ]
 }
diff --git a/data/presets/amenity/toilets/portable.json b/data/presets/amenity/toilets/portable.json
deleted file mode 100644
index 2d892bd3..00000000
--- a/data/presets/amenity/toilets/portable.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "icon": "temaki-latrine",
-    "fields": [
-        "toilets/disposal",
-        "{amenity/toilets}",
-        "toilets/handwashing"
-    ],
-    "moreFields": [
-        "{amenity/toilets}"
-    ],
-    "geometry": [
-        "point",
-        "area",
-        "vertex"
-    ],
-    "terms": [
-        "restroom",
-        "privy",
-        "porta john",
-        "porta potty",
-        "portapot",
-        "chemical toilet"
-    ],
-    "tags": {
-        "amenity": "toilets",
-        "portable": "yes"
-    },
-    "name": "Portable Toilet"
-}