Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 1207)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 1208)
@@ -751,4 +751,14 @@
             } else
                 g.drawRect(p.x - radius, p.y - radius, size, size);
+
+			String name = getNodeName(n);
+			if (name!=null /* && annotate */)
+			{
+				g.setColor(textColor);
+				Font defaultFont = g.getFont();
+				g.setFont (orderFont);
+				g.drawString (name, p.x+radius+2, p.y+radius+2);
+				g.setFont(defaultFont);
+			}
         }
     }
@@ -769,5 +779,5 @@
         orderFont = new Font(Main.pref.get("mappaint.font","Helvetica"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
         String currentLocale = Locale.getDefault().getLanguage();
-        regionalNameOrder = Main.pref.get("mappaint.nameOrder", "name:"+currentLocale+";name;int_name").split(";");
+        regionalNameOrder = Main.pref.get("mappaint.nameOrder", "name:"+currentLocale+";name;int_name;ref;operator;brand").split(";");
 
         alreadyDrawn = new LinkedList<OsmPrimitive>();