Index: src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(Revision 18439)
+++ src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(Arbeitskopie)
@@ -105,9 +105,10 @@
             "wetland",
             //
             ":LocationCode",
-            "note",
+            "description",
             "?building",
             "?building:part",
+            "note",
     };
 
     /** the current list of tags used as naming tags in relations */