diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java
index de24a08a5..6145ecb89 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java
@@ -145,8 +145,8 @@ public class GPXTrackImporter extends DefaultHandler implements XMLImporter.Trac
     }
 
     @Override
-    public void startElement(String uri, String localName, String tag, Attributes attributes) {
-        switch (tag) {
+    public void startElement(String uri, String localName, String qName, Attributes attributes) {
+        switch (qName) {
             case TAG_MARKER:
                 onMarkerStart(attributes);
                 break;
@@ -168,8 +168,8 @@ public class GPXTrackImporter extends DefaultHandler implements XMLImporter.Trac
     }
 
     @Override
-    public void endElement(String uri, String localName, String tag) {
-        switch (tag) {
+    public void endElement(String uri, String localName, String qName) {
+        switch (qName) {
             case TAG_GPX -> onFileEnd();
             case TAG_MARKER -> onMarkerEnd();
             case TAG_TRACK -> {
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporter.java
index 7e0ae6ba8..61fd71bba 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporter.java
@@ -146,8 +146,8 @@ public class KMLTrackImporter extends DefaultHandler implements XMLImporter.Trac
     }
 
     @Override
-    public void startElement(String uri, String localName, String tag, Attributes attributes) throws SAXException {
-        switch (tag) {
+    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+        switch (qName) {
             case TAG_PLACEMARK, TAG_PHOTO_OVERLAY ->
                 // Note that a track is contained in a Placemark, calling onMarkerStart will clear various track variables like name, typeLocalized, and description.
                     onMarkerStart();
@@ -168,8 +168,8 @@ public class KMLTrackImporter extends DefaultHandler implements XMLImporter.Trac
     }
 
     @Override
-    public void endElement(String uri, String localName, String tag) throws SAXException {
-        switch (tag) {
+    public void endElement(String uri, String localName, String qName) throws SAXException {
+        switch (qName) {
             case TAG_KML -> onFileEnd();
             case TAG_PLACEMARK, TAG_PHOTO_OVERLAY ->
                 // Note that a track is contained in a Placemark, calling onMarkerEnd is save since markerType is not set for a track.