diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3e331adf6..3e9de46ee 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -90,9 +90,6 @@
                 "mere"
             ]
         },
-        "form": [
-            "water"
-        ],
         "icon": ""
     },
     {
@@ -113,9 +110,6 @@
                 "mere"
             ]
         },
-        "form": [
-            "water"
-        ],
         "icon": ""
     },
     {
@@ -130,9 +124,6 @@
             },
             "terms": []
         },
-        "form": [
-            "water"
-        ],
         "icon": ""
     },
     {
diff --git a/data/presets/presets/leisure/pitch_baseball.json b/data/presets/presets/leisure/pitch/baseball.json
similarity index 100%
rename from data/presets/presets/leisure/pitch_baseball.json
rename to data/presets/presets/leisure/pitch/baseball.json
diff --git a/data/presets/presets/leisure/pitch_basketball.json b/data/presets/presets/leisure/pitch/basketball.json
similarity index 100%
rename from data/presets/presets/leisure/pitch_basketball.json
rename to data/presets/presets/leisure/pitch/basketball.json
diff --git a/data/presets/presets/leisure/pitch_soccer.json b/data/presets/presets/leisure/pitch/soccer.json
similarity index 100%
rename from data/presets/presets/leisure/pitch_soccer.json
rename to data/presets/presets/leisure/pitch/soccer.json
diff --git a/data/presets/presets/leisure/pitch_tennis.json b/data/presets/presets/leisure/pitch/tennis.json
similarity index 100%
rename from data/presets/presets/leisure/pitch_tennis.json
rename to data/presets/presets/leisure/pitch/tennis.json
diff --git a/data/presets/presets/order.json b/data/presets/presets/order.json
index 379f895c2..bf7293528 100644
--- a/data/presets/presets/order.json
+++ b/data/presets/presets/order.json
@@ -43,10 +43,10 @@
     "highway/footway",
     "highway/cycleway",
     "leisure/pitch",
-    "leisure/pitch_baseball",
-    "leisure/pitch_soccer",
-    "leisure/pitch_tennis",
-    "leisure/pitch_basketball",
+    "leisure/pitch/baseball",
+    "leisure/pitch/soccer",
+    "leisure/pitch/tennis",
+    "leisure/pitch/basketball",
     "building/*",
     "highway/bus_stop",
     "highway/turning_circle"