Index: /applications/editors/josm/plugins/namemanager/build.xml
===================================================================
--- /applications/editors/josm/plugins/namemanager/build.xml	(revision 33871)
+++ /applications/editors/josm/plugins/namemanager/build.xml	(revision 33872)
@@ -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="10580"/>
+    <property name="plugin.main.version" value="12758"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/NameManagerPlugin.java
===================================================================
--- /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/NameManagerPlugin.java	(revision 33871)
+++ /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/NameManagerPlugin.java	(revision 33872)
@@ -2,5 +2,5 @@
 package org.openstreetmap.josm.plugins.namemanager;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -17,5 +17,5 @@
     public NameManagerPlugin(PluginInformation info) {
         super(info);
-        MainMenu.add(Main.main.menu.dataMenu, new NameManagerAction());
+        MainMenu.add(MainApplication.getMenu().dataMenu, new NameManagerAction());
     }
 }
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 33871)
+++ /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java	(revision 33872)
@@ -42,6 +42,8 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.plugins.namemanager.countryData.Country;
 import org.openstreetmap.josm.plugins.namemanager.countryData.CountryDataMemory;
@@ -176,5 +178,5 @@
         tagNameAM = new AutoCompletingTextField();
         AutoCompletionList list = new AutoCompletionList();
-        Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithKeys(list);
+        AutoCompletionManager.of(MainApplication.getLayerManager().getEditLayer().data).populateWithKeys(list);
         tagNameAM.setAutoCompletionList(list);
         labelTagValueAM = new JLabel(tr(TAG_VALUE));
@@ -189,5 +191,6 @@
                     }
                     list.clear();
-                    Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithTagValues(list, tagNameAM.getText());
+                    AutoCompletionManager.of(MainApplication.getLayerManager().getEditLayer().data)
+                        .populateWithTagValues(list, tagNameAM.getText());
                     tagValueAM.setAutoCompletionList(list);
                 }
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 33871)
+++ /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java	(revision 33872)
@@ -18,4 +18,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.namemanager.NameManagerPlugin;
 import org.openstreetmap.josm.plugins.namemanager.countryData.Country;
@@ -53,5 +54,5 @@
             Coordinate topLeftCorner = getTopLeftCorener(areaBorder);
             List<Pair<Node, Node>> areaBorderLines = areaBorder.getNodePairs(true);
-            Collection<Way> ways = Main.getLayerManager().getEditDataSet().getWays();
+            Collection<Way> ways = MainApplication.getLayerManager().getEditDataSet().getWays();
             ways: for (Way way : ways) {
                 if (areaBorder == way) {