diff --git a/data/presets.yaml b/data/presets.yaml
index 40824fb22..78ed66fb2 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -523,8 +523,8 @@ en:
         name: Doctor
         terms: "<translate with synonyms or related terms for 'Doctor', separated by commas>"
       amenity/dojo: 
-        name: Martial Arts Training Hall
-        terms: "<translate with synonyms or related terms for 'Martial Arts Training Hall', separated by commas>"
+        name: Dojo / Martial Arts Academy
+        terms: "<translate with synonyms or related terms for 'Dojo / Martial Arts Academy', separated by commas>"
       amenity/drinking_water: 
         name: Drinking Water
         terms: "<translate with synonyms or related terms for 'Drinking Water', separated by commas>"
@@ -1258,8 +1258,8 @@ en:
         name: Slipway
         terms: "<translate with synonyms or related terms for 'Slipway', separated by commas>"
       leisure/sports_center: 
-        name: Sports Center
-        terms: "<translate with synonyms or related terms for 'Sports Center', separated by commas>"
+        name: Sports Center / Gym
+        terms: "<translate with synonyms or related terms for 'Sports Center / Gym', separated by commas>"
       leisure/stadium: 
         name: Stadium
         terms: "<translate with synonyms or related terms for 'Stadium', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 16c3d5f8f..45c942f02 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -764,7 +764,7 @@
         ]
     },
     "amenity/dojo": {
-        "name": "Martial Arts Training Hall",
+        "icon": "pitch",
         "geometry": [
             "point",
             "area"
@@ -777,11 +777,11 @@
         "tags": {
             "amenity": "dojo"
         },
-        "icon": "pitch",
         "fields": [
             "address",
             "sport"
-        ]
+        ],
+        "name": "Dojo / Martial Arts Academy"
     },
     "amenity/drinking_water": {
         "icon": "water",
@@ -5065,6 +5065,7 @@
         "name": "Slipway"
     },
     "leisure/sports_center": {
+        "icon": "pitch",
         "geometry": [
             "point",
             "area"
@@ -5075,10 +5076,13 @@
         "terms": [
             "gym"
         ],
-        "icon": "sports",
-        "name": "Sports Center"
+        "fields": [
+            "sport"
+        ],
+        "name": "Sports Center / Gym"
     },
     "leisure/stadium": {
+        "icon": "pitch",
         "geometry": [
             "point",
             "area"
diff --git a/data/presets/presets/amenity/dojo.json b/data/presets/presets/amenity/dojo.json
index 2577c189e..9540b26d1 100644
--- a/data/presets/presets/amenity/dojo.json
+++ b/data/presets/presets/amenity/dojo.json
@@ -1,5 +1,5 @@
 {
-    "name": "Martial Arts Training Hall",
+    "icon": "pitch",
     "geometry" : [
         "point", "area"
     ],
@@ -11,9 +11,9 @@
     "tags": {
         "amenity": "dojo"
     },
-    "icon": "pitch",
     "fields": [
         "address",
         "sport"
-    ]
+    ],
+    "name": "Dojo / Martial Arts Academy"
 }
diff --git a/data/presets/presets/leisure/sports_center.json b/data/presets/presets/leisure/sports_center.json
index 06cb0245f..875901a6d 100644
--- a/data/presets/presets/leisure/sports_center.json
+++ b/data/presets/presets/leisure/sports_center.json
@@ -1,4 +1,5 @@
 {
+    "icon": "pitch",
     "geometry": [
         "point",
         "area"
@@ -9,6 +10,8 @@
     "terms": [
         "gym"
     ],
-    "icon": "sports",
-    "name": "Sports Center"
+    "fields": [
+        "sport"
+    ],
+    "name": "Sports Center / Gym"
 }
diff --git a/data/presets/presets/leisure/stadium.json b/data/presets/presets/leisure/stadium.json
index cb3a1de3f..d62faa032 100644
--- a/data/presets/presets/leisure/stadium.json
+++ b/data/presets/presets/leisure/stadium.json
@@ -1,4 +1,5 @@
 {
+    "icon": "pitch",
     "geometry": [
         "point",
         "area"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 34c595629..5bce147f0 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1150,7 +1150,7 @@
                 "terms": "doctor,doctor's office"
             },
             "amenity/dojo": {
-                "name": "Martial Arts Training Hall",
+                "name": "Dojo / Martial Arts Academy",
                 "terms": "martial arts,dojo,dojang"
             },
             "amenity/drinking_water": {
@@ -2130,7 +2130,7 @@
                 "terms": ""
             },
             "leisure/sports_center": {
-                "name": "Sports Center",
+                "name": "Sports Center / Gym",
                 "terms": "gym"
             },
             "leisure/stadium": {