Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 9044)
+++ /trunk/data/defaultpresets.xml	(revision 9045)
@@ -1310,5 +1310,5 @@
             <key key="highway" value="turning_loop" />
         </item> <!-- Turning Loop -->
-        <item name="City Limit" icon="presets/citylimit.png" type="node" preset_name_label="true">
+        <item name="City Limit Sign" icon="presets/citylimit.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_sign"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
@@ -1323,5 +1323,5 @@
             <text key="alt_name" text="Second Name" />
         </item> <!-- City Limit -->
-        <item name="Speed Limit" icon="styles/standard/vehicle/restriction/speed.png" type="node" preset_name_label="true">
+        <item name="Speed Limit Sign" icon="styles/standard/vehicle/restriction/speed.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_sign"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
@@ -5947,5 +5947,5 @@
         </item> <!-- Bridge outline -->
     </group> <!-- Bridges -->
-    <group name="Military" icon="presets/military.png">
+    <group name="Military" name_context="preset group" icon="presets/military.png">
         <item name="Airfield" icon="styles/standard/transport/airport/airfield.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:military=airfield" />
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 9044)
+++ /trunk/data/validator/deprecated.mapcss	(revision 9045)
@@ -553,4 +553,4 @@
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "landuse=farmland";
-  fixAdd: "landuse=farmland";
-}
+  suggestAlternative: "landuse=farmyard";
+}