diff --git a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/LwHttp.java b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/LwHttp.java
index 29c54eda..2e3d660f 100644
--- a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/LwHttp.java
+++ b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/LwHttp.java
@@ -76,9 +76,9 @@ public class LwHttp {
 			mHttpRequest.abort();
 	}
 
-	private PbfTileDataSource mDataSource;
+	private UrlTileDataSource mDataSource;
 
-	public boolean sendRequest(Tile tile, PbfTileDataSource dataSource) throws IOException {
+	public boolean sendRequest(Tile tile, UrlTileDataSource dataSource) throws IOException {
 		mDataSource = dataSource;
 
 		byte[] request = mRequestBuffer;
diff --git a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/PbfTileDataSource.java b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/UrlTileDataSource.java
similarity index 86%
rename from vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/PbfTileDataSource.java
rename to vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/UrlTileDataSource.java
index d92cda30..a3970f4e 100644
--- a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/PbfTileDataSource.java
+++ b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/UrlTileDataSource.java
@@ -21,6 +21,7 @@ import org.oscim.tiling.MapTile;
 import org.oscim.tiling.source.ITileCache;
 import org.oscim.tiling.source.ITileDataSink;
 import org.oscim.tiling.source.ITileDataSource;
+import org.oscim.tiling.source.ITileDecoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,13 +29,13 @@ import org.slf4j.LoggerFactory;
  *
  *
  */
-public abstract class PbfTileDataSource implements ITileDataSource {
-	static final Logger log = LoggerFactory.getLogger(PbfTileDataSource.class);
+public abstract class UrlTileDataSource implements ITileDataSource {
+	static final Logger log = LoggerFactory.getLogger(UrlTileDataSource.class);
 
 	protected LwHttp mConn;
-	protected final PbfDecoder mTileDecoder;
+	protected final ITileDecoder mTileDecoder;
 
-	public PbfTileDataSource(PbfDecoder tileDecoder, ITileCache cache) {
+	public UrlTileDataSource(ITileDecoder tileDecoder, ITileCache cache) {
 		mTileDecoder = tileDecoder;
 	}
 
diff --git a/vtm/src/org/oscim/tiling/source/ITileDecoder.java b/vtm/src/org/oscim/tiling/source/ITileDecoder.java
new file mode 100644
index 00000000..a2c054cc
--- /dev/null
+++ b/vtm/src/org/oscim/tiling/source/ITileDecoder.java
@@ -0,0 +1,12 @@
+package org.oscim.tiling.source;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.oscim.core.Tile;
+
+public interface ITileDecoder {
+
+	boolean decode(Tile tile, ITileDataSink sink, InputStream is, int contentLength)
+	        throws IOException;
+}
diff --git a/vtm/src/org/oscim/tiling/source/common/PbfDecoder.java b/vtm/src/org/oscim/tiling/source/common/PbfDecoder.java
index cfafb077..f0f5ea27 100644
--- a/vtm/src/org/oscim/tiling/source/common/PbfDecoder.java
+++ b/vtm/src/org/oscim/tiling/source/common/PbfDecoder.java
@@ -19,13 +19,12 @@ package org.oscim.tiling.source.common;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.oscim.core.Tile;
-import org.oscim.tiling.source.ITileDataSink;
+import org.oscim.tiling.source.ITileDecoder;
 import org.oscim.utils.UTF8Decoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class PbfDecoder {
+public abstract class PbfDecoder implements ITileDecoder {
 	static final Logger log = LoggerFactory.getLogger(PbfDecoder.class);
 
 	private final static int S1 = 7;
@@ -87,9 +86,6 @@ public abstract class PbfDecoder {
 		mStringDecoder = new UTF8Decoder();
 	}
 
-	public abstract boolean decode(Tile tile, ITileDataSink sink,
-	        InputStream is, int contentLength) throws IOException;
-
 	public void setInputStream(InputStream is, int contentLength) {
 		mInputStream = is;
 
diff --git a/vtm/src/org/oscim/tiling/source/common/PbfTileDataSource.java b/vtm/src/org/oscim/tiling/source/common/UrlTileDataSource.java
similarity index 90%
rename from vtm/src/org/oscim/tiling/source/common/PbfTileDataSource.java
rename to vtm/src/org/oscim/tiling/source/common/UrlTileDataSource.java
index 44bf74c8..3dfd780c 100644
--- a/vtm/src/org/oscim/tiling/source/common/PbfTileDataSource.java
+++ b/vtm/src/org/oscim/tiling/source/common/UrlTileDataSource.java
@@ -26,18 +26,19 @@ import org.oscim.tiling.MapTile;
 import org.oscim.tiling.source.ITileCache;
 import org.oscim.tiling.source.ITileDataSink;
 import org.oscim.tiling.source.ITileDataSource;
+import org.oscim.tiling.source.ITileDecoder;
 import org.oscim.utils.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class PbfTileDataSource implements ITileDataSource {
-	static final Logger log = LoggerFactory.getLogger(PbfTileDataSource.class);
+public abstract class UrlTileDataSource implements ITileDataSource {
+	static final Logger log = LoggerFactory.getLogger(UrlTileDataSource.class);
 
 	protected LwHttp mConn;
-	protected final PbfDecoder mTileDecoder;
+	protected final ITileDecoder mTileDecoder;
 	protected final ITileCache mTileCache;
 
-	public PbfTileDataSource(PbfDecoder tileDecoder, ITileCache tileCache) {
+	public UrlTileDataSource(ITileDecoder tileDecoder, ITileCache tileCache) {
 		mTileDecoder = tileDecoder;
 		mTileCache = tileCache;
 	}
diff --git a/vtm/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java b/vtm/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
index 446607bf..a14f008b 100644
--- a/vtm/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
+++ b/vtm/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
@@ -22,7 +22,7 @@ import org.oscim.core.Tile;
 import org.oscim.tiling.source.ITileDataSource;
 import org.oscim.tiling.source.TileSource;
 import org.oscim.tiling.source.common.LwHttp;
-import org.oscim.tiling.source.common.PbfTileDataSource;
+import org.oscim.tiling.source.common.UrlTileDataSource;
 import org.oscim.tiling.source.common.UrlTileSource;
 
 public class MapnikVectorTileSource extends UrlTileSource {
@@ -32,7 +32,7 @@ public class MapnikVectorTileSource extends UrlTileSource {
 		return new TileDataSource(this, mUrl);
 	}
 
-	static class TileDataSource extends PbfTileDataSource {
+	static class TileDataSource extends UrlTileDataSource {
 
 		public TileDataSource(TileSource tileSource, URL url) {
 			super(new TileDecoder(), tileSource.tileCache);
diff --git a/vtm/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java b/vtm/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
index be96832f..ad7837bd 100644
--- a/vtm/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
+++ b/vtm/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
@@ -21,7 +21,7 @@ import java.net.URL;
 import org.oscim.tiling.source.ITileDataSource;
 import org.oscim.tiling.source.TileSource;
 import org.oscim.tiling.source.common.LwHttp;
-import org.oscim.tiling.source.common.PbfTileDataSource;
+import org.oscim.tiling.source.common.UrlTileDataSource;
 import org.oscim.tiling.source.common.UrlTileSource;
 
 /**
@@ -35,7 +35,7 @@ public class OSciMap1TileSource extends UrlTileSource {
 		return new TileDataSource(this, mUrl);
 	}
 
-	class TileDataSource extends PbfTileDataSource {
+	class TileDataSource extends UrlTileDataSource {
 		public TileDataSource(TileSource tileSource, URL url) {
 			super(new TileDecoder(), tileSource.tileCache);
 			mConn = new LwHttp(url, "application/osmtile", "osmtile", false);
diff --git a/vtm/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java b/vtm/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
index d3544d73..cb0a6cb1 100644
--- a/vtm/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
+++ b/vtm/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
@@ -31,7 +31,7 @@ import org.oscim.tiling.source.ITileDataSource;
 import org.oscim.tiling.source.TileSource;
 import org.oscim.tiling.source.common.LwHttp;
 import org.oscim.tiling.source.common.PbfDecoder;
-import org.oscim.tiling.source.common.PbfTileDataSource;
+import org.oscim.tiling.source.common.UrlTileDataSource;
 import org.oscim.tiling.source.common.UrlTileSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,7 +43,7 @@ public class OSciMap2TileSource extends UrlTileSource {
 		return new TileDataSource(this, mUrl);
 	}
 
-	class TileDataSource extends PbfTileDataSource {
+	class TileDataSource extends UrlTileDataSource {
 		public TileDataSource(TileSource tileSource, URL url) {
 			super(new TileDecoder(), tileSource.tileCache);
 			mConn = new LwHttp(url, "application/osmtile", "osmtile", false);
diff --git a/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java b/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java
index 81e0b0ce..ae17da45 100644
--- a/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java
+++ b/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java
@@ -21,7 +21,7 @@ import java.net.URL;
 import org.oscim.tiling.source.ITileDataSource;
 import org.oscim.tiling.source.TileSource;
 import org.oscim.tiling.source.common.LwHttp;
-import org.oscim.tiling.source.common.PbfTileDataSource;
+import org.oscim.tiling.source.common.UrlTileDataSource;
 import org.oscim.tiling.source.common.UrlTileSource;
 
 public class OSciMap4TileSource extends UrlTileSource {
@@ -31,7 +31,7 @@ public class OSciMap4TileSource extends UrlTileSource {
 		return new TileDataSource(this, mUrl);
 	}
 
-	class TileDataSource extends PbfTileDataSource {
+	class TileDataSource extends UrlTileDataSource {
 		public TileDataSource(TileSource tileSource, URL url) {
 			super(new TileDecoder(), tileSource.tileCache);
 			//mConn = new LwHttp(url, "application/x-protobuf", "vtm", false);