Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 11899)
+++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 11900)
@@ -96,5 +96,5 @@
      */
     private static final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "landuse", "natural",
-        "public_transport", ":LocationCode", "note", "?building"};
+        "leisure", "amenity", "public_transport", ":LocationCode", "note", "?building"};
 
     /** the current list of tags used as naming tags in relations */