diff --git a/data/presets/amenity/ticket_validator b/data/presets/amenity/ticket_validator.json
similarity index 86%
rename from data/presets/amenity/ticket_validator
rename to data/presets/amenity/ticket_validator.json
index f749873c3..d563240d8 100644
--- a/data/presets/amenity/ticket_validator
+++ b/data/presets/amenity/ticket_validator.json
@@ -2,7 +2,7 @@
     "icon": "temaki-vending_machine",
     "fields": [
         "ref",
-        "operator",
+        "operator"
     ],
     "moreFields": [
         "colour",
@@ -20,13 +20,12 @@
     "terms": [
         "ticket",
         "validator",
-        "puncher",
+        "puncher"
     ],
-        },
     "aliases": [
         "ticket puncher",
         "punching machine",
-        "ticket marker",
+        "ticket marker"
     ],
     "name": "Ticket Validator"
 }
diff --git a/data/presets/disc_golf/basket.json b/data/presets/disc_golf/basket.json
index 846af1b04..6e11b5781 100644
--- a/data/presets/disc_golf/basket.json
+++ b/data/presets/disc_golf/basket.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-disc_golf_basket",
+    "icon": "temaki-disc_golf_basket",
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/disc_golf/tee.json b/data/presets/disc_golf/tee.json
index 72bfc64a1..3a5502527 100644
--- a/data/presets/disc_golf/tee.json
+++ b/data/presets/disc_golf/tee.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-disc_golf_basket",
+    "icon": "temaki-disc_golf_basket",
     "fields": [
         "surface"
     ],
diff --git a/data/presets/emergency/water_reservoir covered.json b/data/presets/emergency/water_reservoir_covered.json
similarity index 100%
rename from data/presets/emergency/water_reservoir covered.json
rename to data/presets/emergency/water_reservoir_covered.json
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index b06206dc6..2799cd2bc 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -5640,7 +5640,7 @@ en:
         name: Emergency Water Reservoir
         # 'terms: basin,reservoir,extinguishing,firefighting'
         terms: <translate with synonyms or related terms for 'Emergency Water Reservoir', separated by commas>
-      emergency/water_reservoir covered:
+      emergency/water_reservoir_covered:
         # emergency=water_tank + man_made=reservoir_covered | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Emergency Water Reservoir (Underground)
         # 'terms: cistern,reservoir,extinguishing,firefighting'