Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9433)
+++ trunk/data/defaultpresets.xml	(revision 9434)
@@ -6447,13 +6447,12 @@
         </item> <!-- Power Compensator -->
         <separator/>
-        <item name="Cable Distribution Cabinet" icon="styles/standard/power/cable_distribution_cabinet.svg" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable_distribution_cabinet" />
-            <space />
-            <key key="power" value="cable_distribution_cabinet" />
+        <item name="Power Street Cabinet" icon="styles/standard/power/cable_distribution_cabinet.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=street_cabinet" />
+            <space />
+            <key key="man_made" value="street_cabinet" />
+            <key key="street_cabinet" value="power" />
             <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110,low" /> <!-- Recheck values -->
             <reference ref="ref_operator_branch" />
-        </item> <!-- Cable Distribution Cabinet -->
+        </item> <!-- Power Street Cabinet -->
         <separator/>
         <item name="Transformer Tower" icon="styles/standard/power/transformer_tower.svg" type="node,closedway" preset_name_label="true">
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 9433)
+++ trunk/data/validator/deprecated.mapcss	(revision 9434)
@@ -642,2 +642,11 @@
   fixChangeKey: "type => studio";
 }
+
+/* #11507, #12297 */
+*[power=cable_distribution_cabinet] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "man_made=street_cabinet + street_cabinet=power";
+  fixAdd: "man_made=street_cabinet";
+  fixAdd: "street_cabinet=power";
+  fixRemove: "power";
+}