Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/ConfigKeys.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/ConfigKeys.java	(revision 14793)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/ConfigKeys.java	(revision 14816)
@@ -31,10 +31,12 @@
     public static final String OSB_API_DISABLED = "osb.api.disabled";
     public static final String OSB_API_URI_CLOSE = "osb.uri.close";
+    public static final String OSB_API_URI_DOWNLOAD = "osb.uri.download";
     public static final String OSB_API_URI_EDIT = "osb.uri.edit";
-    public static final String OSB_API_URI_DOWNLOAD = "osb.uri.download";
     public static final String OSB_API_URI_NEW = "osb.uri.new";
-    public static final String OSB_NICKNAME = "osb.nickname";
     public static final String OSB_AUTO_DOWNLOAD = "osb.auto_download";
     public static final String OSB_BUTTON_LABELS = "osb.button_labels";
+    public static final String OSB_COMMENT_HISTORY = "osb.comment.history";
     public static final String OSB_INCLUDE_DATE = "osb.include_date";
+    public static final String OSB_NEW_HISTORY = "osb.new.history";
+    public static final String OSB_NICKNAME = "osb.nickname";
 }
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java	(revision 14793)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java	(revision 14816)
@@ -34,4 +34,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.osb.ConfigKeys;
 import org.openstreetmap.josm.plugins.osb.OsbPlugin;
 import org.openstreetmap.josm.plugins.osb.api.EditAction;
@@ -52,8 +53,8 @@
     @Override
     protected void doActionPerformed(ActionEvent e) throws Exception {
-        List<String> history = StringUtils.stringToList(Main.pref.get("osb.comment.history"), "§§§");
+        List<String> history = StringUtils.stringToList(Main.pref.get(ConfigKeys.OSB_COMMENT_HISTORY), "§§§");
         HistoryChangedListener l = new HistoryChangedListener() {
             public void historyChanged(List<String> history) {
-                Main.pref.put("osb.comment.history", StringUtils.listToString(history, "§§§"));
+                Main.pref.put(ConfigKeys.OSB_COMMENT_HISTORY, StringUtils.listToString(history, "§§§"));
             }
         };
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java	(revision 14793)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java	(revision 14816)
@@ -34,4 +34,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.osb.ConfigKeys;
 import org.openstreetmap.josm.plugins.osb.OsbPlugin;
 import org.openstreetmap.josm.plugins.osb.api.CloseAction;
@@ -54,8 +55,8 @@
     @Override
     protected void doActionPerformed(ActionEvent e) throws Exception {
-        List<String> history = StringUtils.stringToList(Main.pref.get("osb.comment.history"), "§§§");
+        List<String> history = StringUtils.stringToList(Main.pref.get(ConfigKeys.OSB_COMMENT_HISTORY), "§§§");
         HistoryChangedListener l = new HistoryChangedListener() {
             public void historyChanged(List<String> history) {
-                Main.pref.put("osb.comment.history", StringUtils.listToString(history, "§§§"));
+                Main.pref.put(ConfigKeys.OSB_COMMENT_HISTORY, StringUtils.listToString(history, "§§§"));
             }
         };
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java	(revision 14793)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java	(revision 14816)
@@ -97,8 +97,8 @@
 
     private void addNewIssue(MouseEvent e) {
-        List<String> history = StringUtils.stringToList(Main.pref.get("osb.new.history"), "§§§");
+        List<String> history = StringUtils.stringToList(Main.pref.get(ConfigKeys.OSB_NEW_HISTORY), "§§§");
         HistoryChangedListener l = new HistoryChangedListener() {
             public void historyChanged(List<String> history) {
-                Main.pref.put("osb.new.history", StringUtils.listToString(history, "§§§"));
+                Main.pref.put(ConfigKeys.OSB_NEW_HISTORY, StringUtils.listToString(history, "§§§"));
             }
         };