Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 2749)
+++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 2750)
@@ -47,5 +47,5 @@
 
     /** the default list of tags which are used as naming tags in relations */
-    static public final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "note"};
+    static public final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "public_transport", ":LocationCode", "note"};
 
     /** the current list of tags used as naming tags in relations */
@@ -161,4 +161,7 @@
             name = relation.get("type");
             if (name == null) {
+                name = (relation.get("public_transport") != null) ? tr("public transport") : "";
+            }
+            if (name == null) {
                 name = tr("relation");
             }
@@ -166,8 +169,6 @@
             name += " (";
             String nameTag = null;
-            Set<String> namingTags = new HashSet<String>(getNamingtagsForRelations());
-            for (String n : relation.keySet()) {
-                // #3328: "note " and " note" are name tags too
-                if (namingTags.contains(n.trim())) {
+            for (String n : getNamingtagsForRelations()) { 
+                if (n.equals("name")) { 
                     if (Main.pref.getBoolean("osm-primitives.localize-name", true)) {
                         nameTag = relation.getLocalName();
@@ -175,7 +176,13 @@
                         nameTag = relation.getName();
                     }
-                    if (nameTag == null) {
-                        nameTag = relation.get(n);
+                } else if (n.equals(":LocationCode")) {
+                    for (String m : relation.keySet()) {
+                        if (m.endsWith(n)) {
+                            nameTag = relation.get(m);
+                            break;
+                        }
                     }
+                } else {
+                    nameTag = relation.get(n);
                 }
                 if (nameTag != null) {