diff --git a/data/presets.yaml b/data/presets.yaml
index dc1e87873..bc45a870b 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -630,9 +630,9 @@ en:
       date:
         # date=*
         label: Date
-      defibrillator_location:
+      defibrillator/location:
         # 'defibrillator:location=*'
-        label: Precise location of the defibrillator
+        label: Location Description
       delivery:
         # delivery=*
         label: Delivery
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 1cc8528d8..61b697162 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -108,7 +108,7 @@
   "cycleway": {"keys": ["cycleway", "cycleway:left", "cycleway:right"], "reference": {"key": "cycleway"}, "type": "cycleway", "label": "Bike Lanes", "placeholder": "none", "strings": {"types": {"cycleway:left": "Left side", "cycleway:right": "Right side"}, "options": {"none": {"title": "None", "description": "No bike lane"}, "lane": {"title": "Standard bike lane", "description": "A bike lane separated from auto traffic by a painted line"}, "shared_lane": {"title": "Shared bike lane", "description": "A bike lane with no separation from auto traffic"}, "track": {"title": "Bike track", "description": "A bike lane separated from traffic by a physical barrier"}, "share_busway": {"title": "Bike lane shared with bus", "description": "A bike lane shared with a bus lane"}, "opposite_lane": {"title": "Opposite bike lane", "description": "A bike lane that travels in the opposite direction of traffic"}, "opposite": {"title": "Contraflow bike lane", "description": "A bike lane that travels in both directions on a one-way street"}}}},
   "dance/style": {"key": "dance:style", "type": "semiCombo", "label": "Dance Styles"},
   "date": {"key": "date", "type": "check", "label": "Date"},
-  "defibrillator_location": {"key": "defibrillator:location", "type": "textarea", "label": "Precise location of the defibrillator"},
+  "defibrillator/location": {"key": "defibrillator:location", "type": "textarea", "label": "Location Description"},
   "delivery": {"key": "delivery", "type": "check", "label": "Delivery"},
   "denomination": {"key": "denomination", "type": "combo", "label": "Denomination", "prerequisiteTag": {"key": "religion", "valueNot": "none"}},
   "denotation": {"key": "denotation", "type": "combo", "label": "Denotation"},
diff --git a/data/presets/fields/defibrillator_location.json b/data/presets/fields/defibrillator/location.json
similarity index 55%
rename from data/presets/fields/defibrillator_location.json
rename to data/presets/fields/defibrillator/location.json
index 5a6086e3c..a04347396 100644
--- a/data/presets/fields/defibrillator_location.json
+++ b/data/presets/fields/defibrillator/location.json
@@ -1,5 +1,5 @@
 {
     "key": "defibrillator:location",
     "type": "textarea",
-    "label": "Precise location of the defibrillator"
+    "label": "Location Description"
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index cc8d093e1..9538a9db1 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -456,7 +456,7 @@
   "emergency/private": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "private"}, "name": "Emergency Access Private", "searchable": false, "matchScore": 0.01},
   "emergency/yes": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "yes"}, "name": "Emergency Access Yes", "searchable": false, "matchScore": 0.01},
   "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"},
-  "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator", "defibrillator_location"], "moreFields": ["level", "opening_hours", "access_simple"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
+  "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator", "defibrillator/location"], "moreFields": ["level", "opening_hours", "access_simple"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
   "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"},
   "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"},
   "emergency/fire_hose": {"icon": "fas-tape", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_hose"}, "name": "Fire Hose"},
diff --git a/data/presets/presets/emergency/defibrillator.json b/data/presets/presets/emergency/defibrillator.json
index 74d6b74f7..a3c3303a1 100644
--- a/data/presets/presets/emergency/defibrillator.json
+++ b/data/presets/presets/emergency/defibrillator.json
@@ -4,7 +4,7 @@
         "indoor",
         "ref",
         "operator",
-        "defibrillator_location"
+        "defibrillator/location"
     ],
     "moreFields": [
         "level",
diff --git a/data/taginfo.json b/data/taginfo.json
index 607c7b1d2..2813111ad 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1460,7 +1460,7 @@
     {"key": "cycleway:right", "value": "opposite", "description": "🄵 Bike Lanes"},
     {"key": "dance:style", "description": "🄵 Dance Styles"},
     {"key": "date", "description": "🄵 Date"},
-    {"key": "defibrillator:location", "description": "🄵 Precise location of the defibrillator"},
+    {"key": "defibrillator:location", "description": "🄵 Location Description"},
     {"key": "delivery", "description": "🄵 Delivery"},
     {"key": "denomination", "description": "🄵 Denomination"},
     {"key": "denotation", "description": "🄵 Denotation"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 531cc35b4..b75928e3f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3304,8 +3304,8 @@
                 "date": {
                     "label": "Date"
                 },
-                "defibrillator_location": {
-                    "label": "Precise location of the defibrillator"
+                "defibrillator/location": {
+                    "label": "Location Description"
                 },
                 "delivery": {
                     "label": "Delivery",