diff --git a/data/presets.yaml b/data/presets.yaml
index ab91773a9..b53699769 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -601,7 +601,7 @@ en:
       fixme:
         # fixme=*
         label: Fix Me
-      flag_type:
+      flag/type:
         # 'flag:type=*'
         label: Flag Type
       ford:
diff --git a/data/presets/fields.json b/data/presets/fields.json
index db79b5b4d..4abeb8afc 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -102,7 +102,7 @@
     "fireplace": {"key": "fireplace", "type": "check", "label": "Fireplace"},
     "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"},
     "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true},
-    "flag_type": {"key": "flag:type", "type": "combo", "label": "Flag Type"},
+    "flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"},
     "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
     "frequency": {"key": "frequency", "type": "combo", "label": "Operating Frequency"},
     "fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"},
diff --git a/data/presets/fields/flag_type.json b/data/presets/fields/flag/type.json
similarity index 100%
rename from data/presets/fields/flag_type.json
rename to data/presets/fields/flag/type.json
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4365dd31e..9e2d1cb92 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -545,7 +545,7 @@
     "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
     "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"},
     "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"},
-    "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag_type", "country", "lit", "height"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
+    "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country", "lit", "height"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
     "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"},
     "man_made/groyne": {"geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
     "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["building_area"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"},
diff --git a/data/presets/presets/man_made/flagpole.json b/data/presets/presets/man_made/flagpole.json
index 06aaac079..8cac99475 100644
--- a/data/presets/presets/man_made/flagpole.json
+++ b/data/presets/presets/man_made/flagpole.json
@@ -2,7 +2,7 @@
     "icon": "maki-embassy",
     "fields": [
         "operator",
-        "flag_type",
+        "flag/type",
         "country",
         "lit",
         "height"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 31c5467b1..9583a6727 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1972,7 +1972,7 @@
                 "fixme": {
                     "label": "Fix Me"
                 },
-                "flag_type": {
+                "flag/type": {
                     "label": "Flag Type"
                 },
                 "ford": {