Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6657)
+++ 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 6657)
+++ 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],
Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 6657)
+++ trunk/styles/standard/elemstyles.xml	(revision 6658)
@@ -836,9 +836,9 @@
 	</rule>
 
-    <rule>
-        <condition k="waterway" v="wadi"/>
-        <line width="2" realwidth="2" colour="water#0000ff" dashed="true"/>
-        <icon annotate="true" src="misc/deprecated.png"/>
-    </rule>
+	<rule>
+		<condition k="waterway" v="wadi"/>
+		<line width="2" realwidth="2" colour="water#0000ff" dashed="true"/>
+		<icon annotate="true" src="misc/deprecated.png"/>
+	</rule>
 
 	<rule>
@@ -1280,9 +1280,9 @@
 	</rule>
 
-    <rule>
-        <condition k="power" v="substation"/>
-        <icon annotate="true" src="misc/landmark/power.png"/>
-        <area colour="power#eeeeee"/>
-    </rule>
+	<rule>
+		<condition k="power" v="substation"/>
+		<icon annotate="true" src="misc/landmark/power.png"/>
+		<area colour="power#eeeeee"/>
+	</rule>
 
 	<rule>
@@ -1833,9 +1833,15 @@
 	</rule>
 
-    <rule>
-        <condition k="emergency" v="aed"/>
-        <icon annotate="true" src="presets/aed.svg"/>
-        <area colour="amenity_light#f7efb7"/>
-    </rule>
+	<rule>
+		<condition k="emergency" v="aed"/>
+		<icon annotate="true" src="presets/aed.svg"/>
+		<area colour="amenity_light#f7efb7"/>
+	</rule>
+
+	<rule>
+		<condition k="emergency" v="defibrillator"/>
+		<icon annotate="true" src="presets/aed.svg"/>
+		<area colour="amenity_light#f7efb7"/>
+	</rule>
 
 	<rule>
@@ -3109,21 +3115,21 @@
 	</rule>
 
-    <rule>
-        <condition k="natural" v="tree"/>
-        <condition k="type" v="conifer"/>
-        <icon src="misc/landmark/trees_conifer.png" priority="10"/>
-    </rule>
-
-    <rule>
-        <condition k="natural" v="tree"/>
-        <condition k="type" v="broad_leaved"/>
-        <icon src="misc/landmark/trees_broad_leaved.png" priority="10"/>
-    </rule>
-
-    <rule>
-        <condition k="natural" v="tree"/>
-        <condition k="type" v="palm"/>
-        <icon src="misc/landmark/trees_palm.png" priority="10"/>
-    </rule>
+	<rule>
+		<condition k="natural" v="tree"/>
+		<condition k="type" v="conifer"/>
+		<icon src="misc/landmark/trees_conifer.png" priority="10"/>
+	</rule>
+
+	<rule>
+		<condition k="natural" v="tree"/>
+		<condition k="type" v="broad_leaved"/>
+		<icon src="misc/landmark/trees_broad_leaved.png" priority="10"/>
+	</rule>
+
+	<rule>
+		<condition k="natural" v="tree"/>
+		<condition k="type" v="palm"/>
+		<icon src="misc/landmark/trees_palm.png" priority="10"/>
+	</rule>
 
 <!--route tags -->