Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7116)
+++ trunk/data/defaultpresets.xml	(revision 7118)
@@ -59,4 +59,5 @@
   match: none/key/key!/keyvalue (default is "none", see below for more information)
   length: length of input box (number of characters allowed)
+  alternative_autocomplete_keys: comma separated list of alternative keys to use for autocompletion
 
 combo: combo box, with multiple choices and possible to enter free form text
@@ -6682,6 +6683,6 @@
             <text key="addr:housenumber" text="House number" match="key" auto_increment="-2,-1,+1,+2" />
             <optional>
-                <text key="addr:housename" text="House name" match="key" />
-                <text key="addr:street" text="Street name" use_last_as_default="force" match="key" />
+                <text key="addr:housename" text="House name" match="key" alternative_autocomplete_keys="name" />
+                <text key="addr:street" text="Street name" use_last_as_default="force" match="key" alternative_autocomplete_keys="name" />
                 <text key="addr:city" text="City name" use_last_as_default="force" match="key" />
                 <text key="addr:postcode" text="Post code" use_last_as_default="force" match="key" />
Index: trunk/data/tagging-preset.xsd
===================================================================
--- trunk/data/tagging-preset.xsd	(revision 7116)
+++ trunk/data/tagging-preset.xsd	(revision 7118)
@@ -157,4 +157,5 @@
 		<attribute name="match" type="tns:match" />
 		<attribute name="length" type="positiveInteger" />
+		<attribute name="alternative_autocomplete_keys" type="string" />
 
 		<attribute name="type" use="prohibited" />