diff --git a/data/presets.yaml b/data/presets.yaml
index 1784179b3..ce4ff2ba5 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3087,8 +3087,8 @@ en:
         name: Fire Hydrant
         # 'terms: fire plug'
         terms: '<translate with synonyms or related terms for ''Fire Hydrant'', separated by commas>'
-      emergency/first_aid:
-        # emergency=first_aid
+      emergency/first_aid_kit:
+        # emergency=first_aid_kit
         name: First Aid Kit
         # 'terms: bandage,first aid,med,med kit,medic*,medkit'
         terms: '<translate with synonyms or related terms for ''First Aid Kit'', separated by commas>'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 81768a3df..246904114 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -314,7 +314,7 @@
     "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
     "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"},
     "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["fire_hydrant/type", "fire_hydrant/position", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["fire plug"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"},
-    "emergency/first_aid": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid"}, "name": "First Aid Kit"},
+    "emergency/first_aid_kit": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid_kit"}, "name": "First Aid Kit"},
     "emergency/life_ring": {"icon": "fas-life-ring", "fields": ["ref", "operator"], "geometry": ["point", "vertex"], "terms": ["life buoy", "kisby ring", "kisbie ring", "perry buoy"], "tags": {"emergency": "life_ring"}, "name": "Life Ring"},
     "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"},
     "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"},
diff --git a/data/presets/presets/emergency/first_aid.json b/data/presets/presets/emergency/first_aid_kit.json
similarity index 90%
rename from data/presets/presets/emergency/first_aid.json
rename to data/presets/presets/emergency/first_aid_kit.json
index 22fbec12b..0ec0fe38d 100644
--- a/data/presets/presets/emergency/first_aid.json
+++ b/data/presets/presets/emergency/first_aid_kit.json
@@ -18,7 +18,7 @@
         "medkit"
     ],
    "tags": {
-        "emergency": "first_aid"
+        "emergency": "first_aid_kit"
     },
     "name": "First Aid Kit"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index f5d8bda16..ae916f483 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2145,7 +2145,7 @@
     },
     {
       "key": "emergency",
-      "value": "first_aid",
+      "value": "first_aid_kit",
       "description": "First Aid Kit",
       "object_types": ["node"],
       "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-medkit.svg?sanitize=true"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 04781cbbf..06c75e35f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4084,7 +4084,7 @@
                     "name": "Fire Hydrant",
                     "terms": "fire plug"
                 },
-                "emergency/first_aid": {
+                "emergency/first_aid_kit": {
                     "name": "First Aid Kit",
                     "terms": "bandage,first aid,med,med kit,medic*,medkit"
                 },