Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6649)
+++ trunk/data/defaultpresets.xml	(revision 6658)
@@ -4175,11 +4175,11 @@
         </item>
         <item name="Automated Defibrillator" icon="presets/aed.svg" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=aed"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=aed"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=aed"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=aed" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=defibrillator"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=defibrillator"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=defibrillator"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=defibrillator" />
             <label text="Edit Automated External Defibrillator" />
             <space />
-            <key key="emergency" value="aed" />
+            <key key="emergency" value="defibrillator" />
             <reference ref="oh" />
             <text  key="operator" text="Operator" />
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 6649)
+++ trunk/data/validator/deprecated.mapcss	(revision 6658)
@@ -178,4 +178,10 @@
 }
 
+*[emergency=aed] {
+  /* see #9554 - http://wiki.openstreetmap.org/wiki/Proposed_features/automated_external_defibrillator */
+  throwWarning: tr("{0}={1} is deprecated", "emergency", "aed");
+  fixAdd: "emergency=defibrillator";
+}
+
 /* from http://wiki.openstreetmap.org/wiki/Conditional_restrictions#Deprecated_tags */
 *[day_on][!restriction],