diff --git a/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java b/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java
index 1ded0011..73e35a81 100644
--- a/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java
@@ -55,7 +55,7 @@ public class SimpleMapActivity extends BaseMapActivity {
 				else
 					t = VtmThemes.OSMARENDER;
 
-				mMapView.getMap().setTheme(t);
+				mMapView.map().setTheme(t);
 
 				loooop((i + 1) % 3);
 			}
diff --git a/vtm-android/src/org/oscim/android/MapActivity.java b/vtm-android/src/org/oscim/android/MapActivity.java
index b78390dc..bbf0254f 100644
--- a/vtm-android/src/org/oscim/android/MapActivity.java
+++ b/vtm-android/src/org/oscim/android/MapActivity.java
@@ -100,7 +100,7 @@ public abstract class MapActivity extends FragmentActivity {
 	 *            the calling MapView.
 	 */
 	public final void registerMapView(MapView map) {
-		mMap = map.getMap();
+		mMap = map.map();
 
 		SharedPreferences sharedPreferences = getSharedPreferences(PREFERENCES_FILE,
 		                                                           MODE_PRIVATE);
diff --git a/vtm-android/src/org/oscim/android/MapScaleBar.java b/vtm-android/src/org/oscim/android/MapScaleBar.java
index 64e6cc7e..02d224da 100644
--- a/vtm-android/src/org/oscim/android/MapScaleBar.java
+++ b/vtm-android/src/org/oscim/android/MapScaleBar.java
@@ -80,7 +80,7 @@ public class MapScaleBar extends Layer implements UpdateListener {
 	private final BitmapRenderer mBitmapLayer;
 
 	public MapScaleBar(MapView map) {
-		super(map.getMap());
+		super(map.map());
 
 		mBitmap = Bitmap.createBitmap(BITMAP_WIDTH,
 		                              BITMAP_HEIGHT,
diff --git a/vtm-android/src/org/oscim/android/MapView.java b/vtm-android/src/org/oscim/android/MapView.java
index da1b75ea..0884dd06 100644
--- a/vtm-android/src/org/oscim/android/MapView.java
+++ b/vtm-android/src/org/oscim/android/MapView.java
@@ -124,10 +124,7 @@ public class MapView extends RelativeLayout {
 				return mMap.handleGesture(Gesture.DOUBLE_TAP, mMotionEvent.wrap(e));
 			}
 		});
-	}
 
-	public Map getMap() {
-		return mMap;
 	}
 
 	public void onStop() {
@@ -167,4 +164,8 @@ public class MapView extends RelativeLayout {
 		if (mWidth > 0 && mHeight > 0)
 			mMap.viewport().setScreenSize(width, height);
 	}
+
+	public Map map() {
+		return mMap;
+	}
 }