Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 10825)
+++ trunk/data/defaultpresets.xml	(revision 10854)
@@ -376,9 +376,9 @@
   <chunk id="link_contact_address">
     <preset_link preset_name="Contact (Common Schema)" />
-    <preset_link preset_name="Addresses" />
+    <preset_link preset_name="Address" />
   </chunk>
   <chunk id="link_contact_address_payment">
     <preset_link preset_name="Contact (Common Schema)" />
-    <preset_link preset_name="Addresses" />
+    <preset_link preset_name="Address" />
     <preset_link preset_name="Payment Methods" />
   </chunk>
@@ -6081,5 +6081,5 @@
                 <text key="height" text="Height (meters)" />
             </optional>
-            <preset_link preset_name="Addresses" />
+            <preset_link preset_name="Address" />
         </item> <!-- Building -->
         <item name="Residential Building" icon="presets/landmark/building.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -6104,5 +6104,5 @@
                 <text key="height" text="Height (meters)" />
             </optional>
-            <preset_link preset_name="Addresses" />
+            <preset_link preset_name="Address" />
         </item> <!-- Residential Building -->
         <item name="Building part" icon="presets/landmark/building.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -9678,5 +9678,5 @@
             </optional>
         </item> <!-- Name -->
-        <item name="Addresses" icon="presets/misc/housenumber.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Address" icon="presets/misc/housenumber.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:addr"
@@ -9713,5 +9713,5 @@
                 <combo key="addr:state" text="State" text_context="addr:" values="AL,AK,AZ,AR,CA,CO,CT,DE,FL,GA,HI,ID,IL,IN,IA,KS,KY,LA,ME,MD,MA,MI,MN,MS,MO,MT,NE,NV,NH,NJ,NM,NY,NC,ND,OH,OK,OR,PA,RI,SC,SD,TN,TX,UT,VT,VA,WA,WV,WI,DC,AS,GU,MP,PR,UM,VI" use_last_as_default="force" match="key" />
             </optional>
-        </item> <!-- Addresses -->
+        </item> <!-- Address -->
         <item name="Address Interpolation" icon="presets/misc/interpolation.svg" type="way" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Key:addr"