Index: /trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(revision 17824)
+++ /trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(revision 17825)
@@ -49,4 +49,7 @@
 
     private static final List<NameFormatterHook> formatHooks = new LinkedList<>();
+
+    private static final List<String> HIGHWAY_RAILWAY_WATERWAY_LANDUSE_BUILDING = Arrays.asList(
+            marktr("highway"), marktr("railway"), marktr("waterway"), marktr("landuse"), marktr("building"));
 
     /**
@@ -236,5 +239,5 @@
                 }
                 if (n == null) {
-                    for (String key : Arrays.asList(marktr("highway"), marktr("railway"), marktr("waterway"), marktr("landuse"), marktr("building"))) {
+                    for (String key : HIGHWAY_RAILWAY_WATERWAY_LANDUSE_BUILDING) {
                         if (way.hasKey(key) && !way.isKeyFalse(key)) {
                             /* I18N: first is highway, railway, waterway, landuse or building type, second is the type itself */