Index: test/org/openstreetmap/josm/test/GpxWriterTest.java
===================================================================
--- test/org/openstreetmap/josm/test/GpxWriterTest.java	(revision 61)
+++ test/org/openstreetmap/josm/test/GpxWriterTest.java	(revision 64)
@@ -31,7 +31,7 @@
 	@Bug(47)
 	public void testDeleteNewDoesReallyRemove() throws JDOMException, IOException {
-		ds.tracks.iterator().next().setDeleted(true);
+		ds.waies.iterator().next().setDeleted(true);
 		root = reparse();
-		assertEquals("track has vanished and 3 trk (segments) left", 3, root.getChildren("trk", GPX).size());
+		assertEquals("way has vanished and 3 trk (segments) left", 3, root.getChildren("trk", GPX).size());
 	}
 
@@ -44,5 +44,5 @@
 	public void testNewCreateAddIdWhenMoreThanOnce() {
 		// the trk with the two trkseg's only occoure once -> no extension id
-		Element realTrack = null;
+		Element realWay = null;
 		for (Object o : root.getChildren("trk", GPX)) {
 			Element e = (Element)o;
@@ -51,15 +51,15 @@
 			Element ext = e.getChild("extensions", GPX);
 			if (ext != null)
-				assertEquals("no id for track (used only once)", 0, ext.getChildren("uid", JOSM).size());
-			realTrack = e;
+				assertEquals("no id for way (used only once)", 0, ext.getChildren("uid", JOSM).size());
+			realWay = e;
 		}
-		assertNotNull("track not found in GPX file", realTrack);
+		assertNotNull("way not found in GPX file", realWay);
 		
-		// the second point of the first segment of the tracks has an id
-		Element trkseg = (Element)realTrack.getChildren("trkseg", GPX).get(0);
+		// the second point of the first segment of the waies has an id
+		Element trkseg = (Element)realWay.getChildren("trkseg", GPX).get(0);
 		Element trkpt = (Element)trkseg.getChildren("trkpt", GPX).get(1);
-		assertEquals("trackpoint used twice but has no extensions at all", 1, trkpt.getChildren("extensions", GPX).size());
+		assertEquals("waypoint used twice but has no extensions at all", 1, trkpt.getChildren("extensions", GPX).size());
 		Element ext = trkpt.getChild("extensions", GPX);
-		assertEquals("trackpoint used twice but has no id", 1, ext.getChildren("uid", JOSM).size());
+		assertEquals("waypoint used twice but has no id", 1, ext.getChildren("uid", JOSM).size());
 	}
 
Index: test/org/openstreetmap/josm/test/OsmWriterTest.java
===================================================================
--- test/org/openstreetmap/josm/test/OsmWriterTest.java	(revision 61)
+++ test/org/openstreetmap/josm/test/OsmWriterTest.java	(revision 64)
@@ -15,9 +15,8 @@
 import org.jdom.input.SAXBuilder;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Key;
 import org.openstreetmap.josm.data.osm.LineSegment;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Track;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.io.OsmWriter;
 import org.openstreetmap.josm.test.framework.Bug;
@@ -38,5 +37,5 @@
 	private LineSegment ls2;
 	private LineSegment ls3;
-	private Track w;
+	private Way w;
 	
 	private DataSet ds;
@@ -64,5 +63,5 @@
 			sb.append((char)i);
 		String s = sb.toString();
-		n1.put(Key.get(s), s);
+		n1.put(s, s);
 		reparse();
 		assertEquals(1, nodes.get(0).getChildren().size());
@@ -76,5 +75,5 @@
 		ds = new DataSet();
 		LineSegment ls = DataSetTestCaseHelper.createLineSegment(ds, DataSetTestCaseHelper.createNode(ds), DataSetTestCaseHelper.createNode(ds));
-		ls.put(Key.get("foo"), "bar");
+		ls.put("foo", "bar");
 		reparse();
 		assertEquals(1, lineSegments.size());
@@ -126,5 +125,5 @@
 	@Bug(47)
 	public void testDeleteNewDoesReallyRemove() throws Exception {
-		ds.tracks.iterator().next().setDeleted(true);
+		ds.waies.iterator().next().setDeleted(true);
 		reparse();
 		//assertEquals(0, deleted.size());
Index: test/org/openstreetmap/josm/test/framework/DataSetTestCaseHelper.java
===================================================================
--- test/org/openstreetmap/josm/test/framework/DataSetTestCaseHelper.java	(revision 61)
+++ test/org/openstreetmap/josm/test/framework/DataSetTestCaseHelper.java	(revision 64)
@@ -7,5 +7,5 @@
 import org.openstreetmap.josm.data.osm.LineSegment;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.Track;
+import org.openstreetmap.josm.data.osm.Way;
 
 
@@ -23,5 +23,5 @@
 	 * - ls between node 1 and 2
 	 * - ls between node 3 and 4
-	 * - a track with ls 0 and 1
+	 * - a way with ls 0 and 1
 	 */
 	public static DataSet createCommon() {
@@ -39,8 +39,8 @@
 	}
 
-	public static Track createWay(DataSet ds, LineSegment... lineSegments) {
-		Track t = new Track();
+	public static Way createWay(DataSet ds, LineSegment... lineSegments) {
+		Way t = new Way();
 		t.segments.addAll(Arrays.asList(lineSegments));
-		ds.tracks.add(t);
+		ds.waies.add(t);
 		return t;
 	}