Index: /applications/editors/josm/plugins/namemanager/build.xml
===================================================================
--- /applications/editors/josm/plugins/namemanager/build.xml	(revision 34531)
+++ /applications/editors/josm/plugins/namemanager/build.xml	(revision 34532)
@@ -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="12758"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!-- 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 34531)
+++ /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java	(revision 34532)
@@ -40,5 +40,4 @@
 import javax.swing.KeyStroke;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -103,5 +102,5 @@
 
     private NameManagerDialog() {
-        super((JFrame) Main.parent, "Name Manager", true);
+        super((JFrame) MainApplication.getMainFrame(), "Name Manager", true);
         Container cp = this.getContentPane();
         cp.setLayout(new BorderLayout());
@@ -329,5 +328,5 @@
      * Gets reference to the singleton object.
      * 
-     * @return Singleton object of the {@link LaneManagerDialog} class.
+     * @return Singleton object of the {@link NameManagerDialog} class.
      */
     public static NameManagerDialog getInstance() {
@@ -344,5 +343,5 @@
      * 
      * @param dialog
-     *            is the {@link LaneManagerDialog} object
+     *            is the {@link NameManagerDialog} object
      */
     private static void centerDialog(NameManagerDialog dialog) {
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 34531)
+++ /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java	(revision 34532)
@@ -8,8 +8,8 @@
 
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.plugins.namemanager.dialog.NameManagerDialog;
 import org.openstreetmap.josm.plugins.namemanager.utils.NameManagerUtils;
@@ -23,5 +23,5 @@
  * 
  */
-public class NameManagerAction extends JosmAction implements SelectionChangedListener {
+public class NameManagerAction extends JosmAction implements DataSelectionListener {
 
     private static final String ATTRIBUTE_DISTRICTS = "Attribute districts";
@@ -38,5 +38,5 @@
     public NameManagerAction() {
         super(tr(NAME_MANAGER), NAME_MANAGER_MENU, tr(ATTRIBUTE_DISTRICTS), null, true, "namemanager", true);
-        DataSet.addSelectionListener(this);
+        SelectionEventManager.getInstance().addSelectionListener(this);
         setEnabled(false);
     }
@@ -65,12 +65,10 @@
      * This method is responsible for enabling and disabling toolmenu
      * LaneManager button.
-     * 
-     * @see org.openstreetmap.josm.data.SelectionChangedListener#selectionChanged(java.util.Collection)
      */
     @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+    public void selectionChanged(SelectionChangeEvent event) {
         boolean enabledState = false;
         DataSet ds = getLayerManager().getEditDataSet();
-        if (newSelection != null && ds != null) {
+        if (event.getSelection() != null && ds != null) {
             Collection<Way> selectedWays = ds.getSelectedWays();
             enabledState = selectedWays.size() == 1 && selectedWays.iterator().next().isClosed();
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 34531)
+++ /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java	(revision 34532)
@@ -15,5 +15,4 @@
 
 import org.openstreetmap.gui.jmapviewer.Coordinate;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
@@ -22,4 +21,5 @@
 import org.openstreetmap.josm.plugins.namemanager.countryData.Country;
 import org.openstreetmap.josm.plugins.namemanager.countryData.CountryDataMemory;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Pair;
 import org.w3c.dom.Document;
@@ -38,5 +38,5 @@
      */
     public static Window getTopWindow() {
-        Component component = Main.parent;
+        Component component = MainApplication.getMainFrame();
         if (component != null) {
             while (component.getParent() != null) {
@@ -239,10 +239,6 @@
                     .getResourceAsStream("/resources/administrative-levels.xml");
             doc = db.parse(xml);
-        } catch (ParserConfigurationException e) {
-            e.printStackTrace();
-        } catch (SAXException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch (ParserConfigurationException | SAXException | IOException e) {
+            Logging.error(e);
         }