diff --git a/data/presets/amenity/bar.json b/data/presets/amenity/bar.json
index 78d153b1..c532e312 100644
--- a/data/presets/amenity/bar.json
+++ b/data/presets/amenity/bar.json
@@ -16,7 +16,7 @@
         "operator",
         "outdoor_seating",
         "smoking",
-        "sport_pub"
+        "sport/sport_pub"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/amenity/pub.json b/data/presets/amenity/pub.json
index 3c208ca4..d5e4fd1e 100644
--- a/data/presets/amenity/pub.json
+++ b/data/presets/amenity/pub.json
@@ -18,7 +18,7 @@
         "min_age",
         "outdoor_seating",
         "real_fire-GB-IE",
-        "sport_pub",
+        "sport/sport_pub",
         "toilets",
         "toilets/wheelchair",
         "website/menu"
diff --git a/data/presets/amenity/restaurant.json b/data/presets/amenity/restaurant.json
index 18762bf9..169b5795 100644
--- a/data/presets/amenity/restaurant.json
+++ b/data/presets/amenity/restaurant.json
@@ -26,7 +26,7 @@
         "outdoor_seating",
         "reservation",
         "smoking",
-        "sport_pub",
+        "sport/sport_pub",
         "stars",
         "takeaway",
         "toilets",
diff --git a/data/presets/highway/raceway.json b/data/presets/highway/raceway.json
index 7051363c..e7116475 100644
--- a/data/presets/highway/raceway.json
+++ b/data/presets/highway/raceway.json
@@ -4,7 +4,7 @@
         "name",
         "oneway",
         "surface",
-        "sport_racing_motor",
+        "sport/sport_racing_motor",
         "lit",
         "width",
         "lanes",
diff --git a/data/presets/leisure/ice_rink.json b/data/presets/leisure/ice_rink.json
index 8ec3a474..1d89f5c9 100644
--- a/data/presets/leisure/ice_rink.json
+++ b/data/presets/leisure/ice_rink.json
@@ -3,7 +3,7 @@
     "fields": [
         "name",
         "seasonal",
-        "sport_ice",
+        "sport/sport_ice",
         "operator",
         "address",
         "building",
diff --git a/data/presets/leisure/track.json b/data/presets/leisure/track.json
index 45962ee1..7ff2b709 100644
--- a/data/presets/leisure/track.json
+++ b/data/presets/leisure/track.json
@@ -2,7 +2,7 @@
     "icon": "temaki-racetrack_oval",
     "fields": [
         "surface",
-        "sport_racing_nonmotor",
+        "sport/sport_racing_nonmotor",
         "lit",
         "width",
         "lanes"
diff --git a/data/presets/leisure/track/cycling.json b/data/presets/leisure/track/cycling.json
index 5afaf4f1..12f3817c 100644
--- a/data/presets/leisure/track/cycling.json
+++ b/data/presets/leisure/track/cycling.json
@@ -3,7 +3,7 @@
     "fields": [
         "name",
         "surface",
-        "sport_racing_nonmotor",
+        "sport/sport_racing_nonmotor",
         "lit",
         "width",
         "lanes"
diff --git a/data/presets/leisure/track/horse_racing.json b/data/presets/leisure/track/horse_racing.json
index 03e78016..4cbc8d7d 100644
--- a/data/presets/leisure/track/horse_racing.json
+++ b/data/presets/leisure/track/horse_racing.json
@@ -3,7 +3,7 @@
     "fields": [
         "name",
         "surface",
-        "sport_racing_nonmotor",
+        "sport/sport_racing_nonmotor",
         "lit",
         "width",
         "lanes"
diff --git a/data/presets/leisure/track/running.json b/data/presets/leisure/track/running.json
index 2c09500f..973addb9 100644
--- a/data/presets/leisure/track/running.json
+++ b/data/presets/leisure/track/running.json
@@ -3,7 +3,7 @@
     "fields": [
         "name",
         "surface",
-        "sport_racing_nonmotor",
+        "sport/sport_racing_nonmotor",
         "lit",
         "width",
         "lanes"
diff --git a/data/presets/piste/ice_skate.json b/data/presets/piste/ice_skate.json
index 604acd97..1f1ec565 100644
--- a/data/presets/piste/ice_skate.json
+++ b/data/presets/piste/ice_skate.json
@@ -3,7 +3,7 @@
     "fields": [
         "name",
         "piste/type",
-        "sport_ice",
+        "sport/sport_ice",
         "oneway",
         "lit"
     ],