Index: src/org/openstreetmap/josm/io/ProgressReader.java
===================================================================
--- src/org/openstreetmap/josm/io/ProgressReader.java	(revision 92)
+++ src/org/openstreetmap/josm/io/ProgressReader.java	(revision 93)
@@ -4,5 +4,5 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.net.HttpURLConnection;
+import java.net.URLConnection;
 
 import javax.swing.BoundedRangeModel;
@@ -17,5 +17,5 @@
 	private final BoundedRangeModel progress;
 
-	public ProgressReader(HttpURLConnection con, BoundedRangeModel progress) throws IOException {
+	public ProgressReader(URLConnection con, BoundedRangeModel progress) throws IOException {
 		this.in = new InputStreamReader(con.getInputStream());
 		this.progress = progress;
Index: src/org/openstreetmap/josm/io/RawCsvReader.java
===================================================================
--- src/org/openstreetmap/josm/io/RawCsvReader.java	(revision 92)
+++ src/org/openstreetmap/josm/io/RawCsvReader.java	(revision 93)
@@ -31,5 +31,5 @@
 	public Collection<GpsPoint> parse() throws JDOMException, IOException {
 		Collection<GpsPoint> data = new LinkedList<GpsPoint>();
-		String formatStr = Main.pref.get("csvImportString");
+		String formatStr = Main.pref.get("csv.importstring");
 		if (formatStr == null)
 			formatStr = in.readLine();
@@ -53,5 +53,5 @@
 		// test for completness
 		if (!format.contains("lat") || !format.contains("lon")) {
-			if (Main.pref.get("csvImportString").equals(""))
+			if (Main.pref.get("csv.importstring").equals(""))
 				throw new JDOMException("Format string in data is incomplete or not found. Try setting an manual format string in Preferences.");
 			throw new JDOMException("Format string is incomplete. Need at least 'lat' and 'lon' specification");
@@ -75,5 +75,5 @@
 						st.nextToken();
 					else
-						throw new JDOMException("Unknown data type: '"+token+"'."+(Main.pref.get("csvImportString").equals("") ? " Maybe add an format string in preferences." : ""));
+						throw new JDOMException("Unknown data type: '"+token+"'."+(Main.pref.get("csv.importstring").equals("") ? " Maybe add an format string in preferences." : ""));
 				}
 				data.add(new GpsPoint(new LatLon(lat, lon), time));