diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java
index 46869140..e4d296d5 100644
--- a/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -63,23 +63,23 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 	private final String apiUri;
 	private static final String prod = "hafas";
 	private final String accessId;
-	private final String ajaxGetStopsEncoding;
-	private final String mlcResEncoding;
+	private final String jsonGetStopsEncoding;
+	private final String xmlMlcResEncoding;
 
-	public AbstractHafasProvider(final String apiUri, final String accessId, final String ajaxGetStopsEncoding, final String mlcResEncoding)
+	public AbstractHafasProvider(final String apiUri, final String accessId, final String jsonGetStopsEncoding, final String xmlMlcResEncoding)
 	{
 		this.apiUri = apiUri;
 		this.accessId = accessId;
-		this.ajaxGetStopsEncoding = ajaxGetStopsEncoding;
-		this.mlcResEncoding = mlcResEncoding;
+		this.jsonGetStopsEncoding = jsonGetStopsEncoding;
+		this.xmlMlcResEncoding = xmlMlcResEncoding;
 	}
 
 	public AbstractHafasProvider(final String apiUri, final String accessId)
 	{
 		this.apiUri = apiUri;
 		this.accessId = accessId;
-		this.ajaxGetStopsEncoding = DEFAULT_ENCODING;
-		this.mlcResEncoding = DEFAULT_ENCODING;
+		this.jsonGetStopsEncoding = DEFAULT_ENCODING;
+		this.xmlMlcResEncoding = DEFAULT_ENCODING;
 	}
 
 	protected TimeZone timeZone()
@@ -215,9 +215,9 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 	private static final Pattern P_AJAX_GET_STOPS_JSON = Pattern.compile("SLs\\.sls\\s*=\\s*(.*?);\\s*SLs\\.showSuggestion\\(\\);", Pattern.DOTALL);
 	private static final Pattern P_AJAX_GET_STOPS_ID = Pattern.compile(".*?@L=(\\d+)@.*?");
 
-	protected final List<Location> ajaxGetStops(final String uri) throws IOException
+	protected final List<Location> jsonGetStops(final String uri) throws IOException
 	{
-		final CharSequence page = ParserUtils.scrape(uri, false, null, ajaxGetStopsEncoding, false);
+		final CharSequence page = ParserUtils.scrape(uri, false, null, jsonGetStopsEncoding, false);
 
 		final Matcher mJson = P_AJAX_GET_STOPS_JSON.matcher(page);
 		if (mJson.matches())
@@ -299,7 +299,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 
 			final XmlPullParserFactory factory = XmlPullParserFactory.newInstance(System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null);
 			final XmlPullParser pp = factory.newPullParser();
-			pp.setInput(is, mlcResEncoding);
+			pp.setInput(is, xmlMlcResEncoding);
 
 			final List<Location> results = new ArrayList<Location>();
 
diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java
index e29d6957..1633c742 100644
--- a/src/de/schildbach/pte/BahnProvider.java
+++ b/src/de/schildbach/pte/BahnProvider.java
@@ -70,7 +70,7 @@ public final class BahnProvider extends AbstractHafasProvider
 	{
 		final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ENCODING));
 
-		return ajaxGetStops(uri);
+		return jsonGetStops(uri);
 	}
 
 	private final static Pattern P_NEARBY_STATIONS_BY_COORDINATE = Pattern
diff --git a/src/de/schildbach/pte/DsbProvider.java b/src/de/schildbach/pte/DsbProvider.java
index 274281e5..b68399fe 100644
--- a/src/de/schildbach/pte/DsbProvider.java
+++ b/src/de/schildbach/pte/DsbProvider.java
@@ -61,7 +61,7 @@ public class DsbProvider extends AbstractHafasProvider
 	{
 		final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ENCODING));
 
-		return ajaxGetStops(uri);
+		return jsonGetStops(uri);
 	}
 
 	@Override
diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java
index becc3c1e..f559b29e 100644
--- a/src/de/schildbach/pte/OebbProvider.java
+++ b/src/de/schildbach/pte/OebbProvider.java
@@ -81,7 +81,7 @@ public class OebbProvider extends AbstractHafasProvider
 	{
 		final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ENCODING));
 
-		return ajaxGetStops(uri);
+		return jsonGetStops(uri);
 	}
 
 	private final String NEARBY_URI = API_BASE + "stboard.exe/dn?distance=50&near=Suchen&input=%s";
diff --git a/src/de/schildbach/pte/SeptaProvider.java b/src/de/schildbach/pte/SeptaProvider.java
index cce47a14..40e56704 100644
--- a/src/de/schildbach/pte/SeptaProvider.java
+++ b/src/de/schildbach/pte/SeptaProvider.java
@@ -78,7 +78,7 @@ public class SeptaProvider extends AbstractHafasProvider
 	{
 		final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ENCODING));
 
-		return ajaxGetStops(uri);
+		return jsonGetStops(uri);
 	}
 
 	@Override
diff --git a/src/de/schildbach/pte/SncbProvider.java b/src/de/schildbach/pte/SncbProvider.java
index 166609ad..12f1b978 100644
--- a/src/de/schildbach/pte/SncbProvider.java
+++ b/src/de/schildbach/pte/SncbProvider.java
@@ -72,7 +72,7 @@ public class SncbProvider extends AbstractHafasProvider
 	{
 		final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ENCODING));
 
-		return ajaxGetStops(uri);
+		return jsonGetStops(uri);
 	}
 
 	private final String NEARBY_URI = "http://hari.b-rail.be/HAFAS/bin/stboard.exe/en?input=%s&distance=50&near=Anzeigen";
diff --git a/src/de/schildbach/pte/VgsProvider.java b/src/de/schildbach/pte/VgsProvider.java
index 4e3d75d4..0b2a3748 100644
--- a/src/de/schildbach/pte/VgsProvider.java
+++ b/src/de/schildbach/pte/VgsProvider.java
@@ -74,7 +74,7 @@ public class VgsProvider extends AbstractHafasProvider
 	{
 		final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ENCODING));
 
-		return ajaxGetStops(uri);
+		return jsonGetStops(uri);
 	}
 
 	private final String NEARBY_URI = API_BASE