Index: trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java	(revision 679)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java	(revision 680)
@@ -129,13 +129,13 @@
 			HashMap<String,JMenu> submenus = new HashMap<String,JMenu>();
 			for (final TaggingPreset p : taggingPresets) {
-				if (p.getValue(Action.NAME).equals(" ")) {
+				String name = (String) p.getValue(Action.NAME);
+				if (name.equals(" ")) {
 					Main.main.menu.presetsMenu.add(new JSeparator());
 				} else {
-					String name = (String) p.getValue(Action.NAME);
 					String[] sp = name.split("/");
 					if (sp.length <= 1) {
 						Main.main.menu.presetsMenu.add(new JMenuItem(p));
 					} else {
-						p.setName(sp[1]);
+						p.setDisplayName(sp[1]);
 						JMenu submenu = submenus.get(sp[0]);
 						if (submenu == null) {
@@ -144,5 +144,8 @@
 							Main.main.menu.presetsMenu.add(submenu);
 						}
-						submenu.add(new JMenuItem(p));
+						if (sp[1].equals(" "))
+							submenu.add(new JSeparator());
+						else
+							submenu.add(p);
 					}
 				}
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 679)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 680)
@@ -332,6 +332,13 @@
 	 */
 	public void setName(String name) {
+		setDisplayName(tr(name));
+		putValue("toolbar", "tagging_"+name);
+	}
+	
+	/**
+	 * Change the display name without changing the toolbar value.
+	 */
+	public void setDisplayName(String name) {
 		putValue(Action.NAME, tr(name));
-		putValue("toolbar", "tagging_"+name);
 	}