Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 12907)
+++ /trunk/data/defaultpresets.xml	(revision 12908)
@@ -180,4 +180,15 @@
             <text key="maxheight" text="Max. height (meters)" length="7" />
             <text key="maxwidth" text="Max. width (meters)" length="7" />
+        </optional>
+    </chunk>
+    <chunk id="optional_name">
+        <optional>
+            <text key="name" text="Name" />
+        </optional>
+    </chunk>
+    <chunk id="optional_name_operator">
+        <optional>
+            <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
         </optional>
     </chunk>
@@ -2293,6 +2304,6 @@
             <space />
             <key key="landuse" value="basin" />
-            <text key="name" text="Name" />
             <combo key="basin" text="Type" values="retention,infiltration,detention" />
+            <reference ref="optional_name" />
         </item> <!-- Basin -->
         <item name="Reservoir" icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -2306,6 +2317,6 @@
             <space />
             <key key="landuse" value="reservoir" />
-            <text key="name" text="Name" />
             <combo key="reservoir_type" text="Type" values="evaporator,sewage,tailings,water_storage" />
+            <reference ref="optional_name" />
         </item> <!-- Reservoir -->
         <item name="Covered Reservoir" icon="presets/landmark/reservoir_covered.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -2320,5 +2331,5 @@
             <space />
             <key key="man_made" value="reservoir_covered" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Covered Reservoir -->
         <separator/>
@@ -10274,6 +10285,6 @@
             <space />
             <key key="landuse" value="forest" />
-            <text key="name" text="Name" />
             <reference ref="leaf" />
+            <reference ref="optional_name" />
         </item> <!-- Forest -->
         <item name="Cutline" icon="presets/landmark/cutline.svg" type="way" preset_name_label="true">
@@ -10475,5 +10486,5 @@
             <space />
             <key key="landuse" value="farmyard" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Farmyard -->
         <item name="Farmland" icon="presets/landuse/farmland.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10488,6 +10499,6 @@
             <space />
             <key key="landuse" value="farmland" />
-            <text key="name" text="Name" />
             <combo key="crop" text="Crop" values="corn,grass,rice,wheat,hop" values_context="crop" />
+            <reference ref="optional_name" />
         </item> <!-- Farmland -->
         <item name="Meadow" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10502,5 +10513,5 @@
             <space />
             <key key="landuse" value="meadow" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Meadow -->
         <item name="Orchard" icon="presets/landuse/orchard.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10515,6 +10526,6 @@
             <space />
             <key key="landuse" value="orchard" />
-            <text key="name" text="Name" />
             <combo key="trees" text="Trees" values="olive_trees,apple_trees,oil_palms,orange_trees,almond_trees,banana_plants,coconut_palms,hazel_plants,cherry_trees,persimmon_trees,walnut_trees,plum_trees,peach_trees,tea_plants" />
+            <reference ref="optional_name" />
         </item> <!-- Orchard -->
         <item name="Vineyard" icon="presets/landuse/vineyard.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10527,5 +10538,5 @@
             <space />
             <key key="landuse" value="vineyard" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Vineyard -->
         <item name="Greenhouse Horticulture" icon="presets/landuse/greenhouse_horticulture.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10542,6 +10553,5 @@
             <space />
             <key key="landuse" value="greenhouse_horticulture" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="optional_name_operator" />
         </item> <!-- Greenhouse Horticulture -->
         <item name="Plant Nursery" icon="presets/landuse/plant_nursery.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10555,7 +10565,6 @@
             <space />
             <key key="landuse" value="plant_nursery" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
             <reference ref="genus_species_taxon" />
+            <reference ref="optional_name_operator" />
         </item> <!-- Plant Nursery -->
         <item name="Aquaculture" icon="presets/landuse/aquaculture.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10566,7 +10575,6 @@
             <space />
             <key key="landuse" value="aquaculture" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
             <combo key="aquaculture" text="Aquaculture" values="shrimp,fish,mussels" />
+            <reference ref="optional_name_operator" />
         </item> <!-- Aquaculture -->
         <item name="Allotments" icon="presets/landuse/allotments.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10582,5 +10590,5 @@
             <space />
             <key key="landuse" value="allotments" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Allotments -->
         <separator/>
@@ -10595,5 +10603,5 @@
             <space />
             <key key="leisure" value="garden" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Garden -->
         <item name="Grass" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10610,5 +10618,5 @@
             <space />
             <key key="landuse" value="grass" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Grass -->
         <item name="Village Green" icon="presets/leisure/common.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10625,5 +10633,5 @@
             <space />
             <key key="landuse" value="village_green" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Village Green -->
         <item name="Common" icon="presets/leisure/common.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10639,5 +10647,5 @@
             <space />
             <key key="leisure" value="common" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Common -->
         <item name="Park" icon="presets/leisure/park.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10653,5 +10661,5 @@
             <space />
             <key key="leisure" value="park" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Park -->
         <item name="Recreation Ground" icon="presets/leisure/common.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10666,5 +10674,5 @@
             <space />
             <key key="landuse" value="recreation_ground" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Recreation Ground -->
         <separator/>
@@ -10681,5 +10689,5 @@
             <space />
             <key key="landuse" value="residential" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Residential Area -->
         <item name="Graveyard" icon="presets/landuse/graveyard.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -10735,5 +10743,5 @@
             <space />
             <key key="landuse" value="retail" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Retail -->
         <item name="Commercial" icon="presets/landuse/commercial.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10748,5 +10756,5 @@
             <space />
             <key key="landuse" value="commercial" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Commercial -->
         <item name="Industrial" icon="presets/landmark/works.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10762,6 +10770,6 @@
             <space />
             <key key="landuse" value="industrial" />
-            <text key="name" text="Name" />
             <combo key="industrial" text="Type" values="bakery,brewery,brickyard,depot,distributor,factory,grinding_mill,heating_station,machine_shop,mine,oil,port,salt_pond,sawmill,scrap_yard,shipyard,slaughterhouse,warehouse" values_context="industrial" />
+            <reference ref="optional_name" />
         </item> <!-- Industrial -->
         <item name="Garages" icon="presets/landuse/garages.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10776,6 +10784,5 @@
             <space />
             <key key="landuse" value="garages" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="optional_name_operator" />
         </item> <!-- Garages -->
         <item name="Railway Land" icon="presets/landuse/railway.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10789,5 +10796,5 @@
             <space />
             <key key="landuse" value="railway" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Railway Land -->
         <item name="Military" icon="presets/landuse/military.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10800,5 +10807,5 @@
             <space />
             <key key="landuse" value="military" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Military -->
         <separator/>
@@ -10815,5 +10822,5 @@
             <space />
             <key key="landuse" value="construction" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Construction Area -->
         <item name="Brownfield" icon="presets/landuse/brownfield.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10828,5 +10835,5 @@
             <space />
             <key key="landuse" value="brownfield" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Brownfield -->
         <item name="Greenfield" icon="presets/landuse/greenfield.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10840,5 +10847,5 @@
             <space />
             <key key="landuse" value="greenfield" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Greenfield -->
         <item name="Landfill" icon="presets/landuse/landfill.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -10853,5 +10860,5 @@
             <space />
             <key key="landuse" value="landfill" />
-            <text key="name" text="Name" />
+            <reference ref="optional_name" />
         </item> <!-- Landfill -->
         <item name="Quarry" icon="presets/landmark/mine.svg" type="closedway,multipolygon" preset_name_label="true">