Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java	(revision 16865)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java	(revision 16866)
@@ -139,6 +139,5 @@
             String name = getLayerName();
 
-            GpxImporterData layers = GpxImporter.loadLayers(rawData, reader.isGpxParsedProperly(), name,
-                    tr("Markers from {0}", name));
+            GpxImporterData layers = GpxImporter.loadLayers(rawData, reader.isGpxParsedProperly(), name);
 
             gpxLayer = layers.getGpxLayer();
Index: trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java	(revision 16865)
+++ trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java	(revision 16866)
@@ -124,5 +124,5 @@
             boolean parsedProperly = r.parse(true);
             r.getGpxData().storageFile = file;
-            addLayers(loadLayers(r.getGpxData(), parsedProperly, fileName, tr("Markers from {0}", fileName)));
+            addLayers(loadLayers(r.getGpxData(), parsedProperly, fileName));
         } catch (SAXException e) {
             Logging.error(e);
@@ -157,15 +157,13 @@
      * @param parsedProperly True if GPX data has been properly parsed by {@link GpxReader#parse}
      * @param gpxLayerName The GPX layer name
-     * @param markerLayerName The marker layer name
      * @return the new GPX and marker layers corresponding to the specified GPX data, to be used with {@link #addLayers}
      * @see #addLayers
      */
-    public static GpxImporterData loadLayers(final GpxData data, final boolean parsedProperly,
-            final String gpxLayerName, String markerLayerName) {
+    public static GpxImporterData loadLayers(final GpxData data, final boolean parsedProperly, final String gpxLayerName) {
         MarkerLayer markerLayer = null;
         GpxRouteLayer gpxRouteLayer = null;
         GpxLayer gpxLayer = new GpxLayer(data, gpxLayerName, data.storageFile != null);
         if (Config.getPref().getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {
-            markerLayer = new MarkerLayer(data, markerLayerName, data.storageFile, gpxLayer);
+            markerLayer = new MarkerLayer(data, tr("Markers from {0}", gpxLayerName), data.storageFile, gpxLayer);
             if (markerLayer.data.isEmpty()) {
                 markerLayer = null;
@@ -211,5 +209,4 @@
      * @param associatedFile GPX file
      * @param gpxLayerName The GPX layer name
-     * @param markerLayerName The marker layer name
      * @param progressMonitor The progress monitor
      * @return the new GPX and marker layers corresponding to the specified GPX file
@@ -217,10 +214,10 @@
      */
     public static GpxImporterData loadLayers(InputStream is, final File associatedFile,
-            final String gpxLayerName, String markerLayerName, ProgressMonitor progressMonitor) throws IOException {
+                                             final String gpxLayerName, ProgressMonitor progressMonitor) throws IOException {
         try {
             final GpxReader r = new GpxReader(is);
             final boolean parsedProperly = r.parse(true);
             r.getGpxData().storageFile = associatedFile;
-            return loadLayers(r.getGpxData(), parsedProperly, gpxLayerName, markerLayerName);
+            return loadLayers(r.getGpxData(), parsedProperly, gpxLayerName);
         } catch (SAXException e) {
             Logging.error(e);
Index: trunk/src/org/openstreetmap/josm/gui/io/importexport/NMEAImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/importexport/NMEAImporter.java	(revision 16865)
+++ trunk/src/org/openstreetmap/josm/gui/io/importexport/NMEAImporter.java	(revision 16866)
@@ -97,14 +97,13 @@
      * @param associatedFile NMEA file
      * @param gpxLayerName The GPX layer name
-     * @param markerLayerName The marker layer name
      * @return the new GPX and marker layers corresponding to the specified NMEA file
      * @throws IOException if an I/O error occurs
      */
     public static GpxImporterData loadLayers(InputStream is, final File associatedFile,
-            final String gpxLayerName, String markerLayerName) throws IOException {
+                                             final String gpxLayerName) throws IOException {
         final NmeaReader r = buildAndParse(is);
         final boolean parsedProperly = r.getNumberOfCoordinates() > 0;
         r.getGpxData().storageFile = associatedFile;
-        return GpxImporter.loadLayers(r.getGpxData(), parsedProperly, gpxLayerName, markerLayerName);
+        return GpxImporter.loadLayers(r.getGpxData(), parsedProperly, gpxLayerName);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/io/importexport/RtkLibImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/importexport/RtkLibImporter.java	(revision 16865)
+++ trunk/src/org/openstreetmap/josm/gui/io/importexport/RtkLibImporter.java	(revision 16866)
@@ -91,14 +91,13 @@
      * @param associatedFile RTKLib file
      * @param gpxLayerName The GPX layer name
-     * @param markerLayerName The marker layer name
      * @return the new GPX and marker layers corresponding to the specified RTKLib file
      * @throws IOException if an I/O error occurs
      */
     public static GpxImporterData loadLayers(InputStream is, final File associatedFile,
-            final String gpxLayerName, String markerLayerName) throws IOException {
+                                             final String gpxLayerName) throws IOException {
         final RtkLibPosReader r = buildAndParse(is);
         final boolean parsedProperly = r.getNumberOfCoordinates() > 0;
         r.getGpxData().storageFile = associatedFile;
-        return GpxImporter.loadLayers(r.getGpxData(), parsedProperly, gpxLayerName, markerLayerName);
+        return GpxImporter.loadLayers(r.getGpxData(), parsedProperly, gpxLayerName);
     }
 
Index: trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java	(revision 16865)
+++ trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java	(revision 16866)
@@ -48,9 +48,9 @@
 
                 if (NMEAImporter.FILE_FILTER.acceptName(fileStr)) {
-                    importData = NMEAImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName(), null);
+                    importData = NMEAImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName());
                 } else if (RtkLibImporter.FILE_FILTER.acceptName(fileStr)) {
-                    importData = RtkLibImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName(), null);
+                    importData = RtkLibImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName());
                 } else {
-                    importData = GpxImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName(), null, progressMonitor);
+                    importData = GpxImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName(), progressMonitor);
                 }
 
Index: trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java	(revision 16865)
+++ trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java	(revision 16866)
@@ -46,5 +46,5 @@
             try (InputStream in = support.getInputStream(fileStr)) {
                 GpxImporter.GpxImporterData importData = GpxImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName(),
-                        null, progressMonitor);
+                        progressMonitor);
 
                 support.addPostLayersTask(importData.getPostLayerTask());