Index: /applications/editors/josm/plugins/namemanager/build.xml
===================================================================
--- /applications/editors/josm/plugins/namemanager/build.xml	(revision 32492)
+++ /applications/editors/josm/plugins/namemanager/build.xml	(revision 32493)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="..."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="10353"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java
===================================================================
--- /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java	(revision 32492)
+++ /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java	(revision 32493)
@@ -13,6 +13,6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -179,9 +179,9 @@
         tagNameAM = new AutoCompletingTextField();
         AutoCompletionList list = new AutoCompletionList();
-        Main.main.getEditLayer().data.getAutoCompletionManager().populateWithKeys(list);
+        Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithKeys(list);
         tagNameAM.setAutoCompletionList(list);
         labelTagValueAM = new JLabel(tr(TAG_VALUE));
         tagValueAM = new AutoCompletingTextField();
-        tagNameAM.addKeyListener(new KeyListener() {
+        tagNameAM.addKeyListener(new KeyAdapter() {
             @Override
             public void keyTyped(KeyEvent arg0) {
@@ -192,15 +192,7 @@
                     }
                     list.clear();
-                    Main.main.getEditLayer().data.getAutoCompletionManager().populateWithTagValues(list, tagNameAM.getText());
+                    Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithTagValues(list, tagNameAM.getText());
                     tagValueAM.setAutoCompletionList(list);
                 }
-            }
-
-            @Override
-            public void keyReleased(KeyEvent arg0) {
-            }
-
-            @Override
-            public void keyPressed(KeyEvent arg0) {
             }
         });
Index: /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java
===================================================================
--- /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java	(revision 32492)
+++ /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java	(revision 32493)
@@ -6,5 +6,4 @@
 import java.util.Collection;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -51,5 +50,5 @@
         }
         NameManagerDialog dialog = NameManagerDialog.getInstance();
-        Way selectedWay = (Way) Main.main.getCurrentDataSet().getSelectedWays().iterator().next();
+        Way selectedWay = (Way) getLayerManager().getEditDataSet().getSelectedWays().iterator().next();
         dialog.setSelectedWay(selectedWay);
         dialog.setWaysInsideSelectedArea(NameManagerUtils.getWaysInsideSelectedArea(selectedWay));
@@ -71,5 +70,5 @@
     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
         boolean enabledState = false;
-        DataSet ds = Main.main.getCurrentDataSet();
+        DataSet ds = getLayerManager().getEditDataSet();
         if (newSelection != null && ds != null) {
             Collection<Way> selectedWays = ds.getSelectedWays();
Index: /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java
===================================================================
--- /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java	(revision 32492)
+++ /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java	(revision 32493)
@@ -47,5 +47,5 @@
             Coordinate topLeftCorner = getTopLeftCorener(areaBorder);
             List<Pair<Node, Node>> areaBorderLines = areaBorder.getNodePairs(true);
-            Collection<Way> ways = Main.main.getCurrentDataSet().getWays();
+            Collection<Way> ways = Main.getLayerManager().getEditDataSet().getWays();
             ways: for (Way way : ways) {
                 if (areaBorder == way) {