Index: trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java	(revision 14161)
+++ trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java	(revision 14165)
@@ -5,10 +5,11 @@
 
 import java.util.Collection;
-import java.util.Optional;
 
 import javax.swing.Icon;
 import javax.swing.JLabel;
 
+import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -23,5 +24,5 @@
      * Maximum displayed length, in characters.
      */
-    public static final int MULTIPLE_NAME_MAX_LENGTH = 80;
+    public static final IntegerProperty MULTIPLE_NAME_MAX_LENGTH = new IntegerProperty("multiple.name.max.length", 140);
 
     /** The class name of the combined primitives */
@@ -43,6 +44,6 @@
         multipleClassname = null;
         for (OsmPrimitive osm : data) {
-            String name = Optional.ofNullable(osm.get("name")).orElseGet(() -> osm.get("ref"));
-            if (name != null && !name.isEmpty() && multipleName.length() <= MULTIPLE_NAME_MAX_LENGTH) {
+            String name = osm.getDisplayName(DefaultNameFormatter.getInstance());
+            if (name != null && !name.isEmpty() && multipleName.length() <= MULTIPLE_NAME_MAX_LENGTH.get()) {
                 if (multipleName.length() > 0) {
                     multipleName.append(", ");
@@ -67,8 +68,8 @@
             if (multipleName.length() > 0) {
                 sb.append(": ");
-                if (multipleName.length() <= MULTIPLE_NAME_MAX_LENGTH) {
+                if (multipleName.length() <= MULTIPLE_NAME_MAX_LENGTH.get()) {
                     sb.append(multipleName);
                 } else {
-                    sb.append(multipleName.substring(0, MULTIPLE_NAME_MAX_LENGTH)).append("...");
+                    sb.append(multipleName.substring(0, MULTIPLE_NAME_MAX_LENGTH.get())).append("...");
                 }
             }