26 files changed, 88 insertions, 88 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index c04d1d5..b05da84 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -145,7 +145,7 @@
 			</intent-filter>
 		</activity>
 		<activity
-			android:name="cgeo.geocaching.maps.google.googleMapActivity"
+			android:name=".maps.google.GoogleMapActivity"
 			android:label="@string/app_name"
 			android:configChanges="keyboardHidden|orientation" >
 			<intent-filter>
@@ -153,7 +153,7 @@
 			</intent-filter>
 		</activity>
 		<activity
-			android:name="cgeo.geocaching.maps.mapsforge.mfMapActivity"
+			android:name=".maps.mapsforge.MapsforgeMapActivity"
 			android:label="@string/app_name"
 			android:configChanges="keyboardHidden|orientation" >
 			<intent-filter>
diff --git a/main/res/layout/googlemap.xml b/main/res/layout/map_google.xml
index 2305c05..af55cb2 100644
--- a/main/res/layout/googlemap.xml
+++ b/main/res/layout/map_google.xml
@@ -38,7 +38,7 @@
 				android:textSize="12dip"
 				android:textColor="@color/text_icon"
 				android:background="@drawable/icon_bcg" />
-		<view class="cgeo.geocaching.maps.google.googleMapView" android:id="@+id/map"
+		<view class="cgeo.geocaching.maps.google.GoogleMapView" android:id="@+id/map"
 				android:layout_width="fill_parent"
 				android:layout_height="fill_parent"
 				android:keepScreenOn="true"
diff --git a/main/res/layout/mfmap.xml b/main/res/layout/map_mapsforge.xml
index dd29270..f727814 100644
--- a/main/res/layout/mfmap.xml
+++ b/main/res/layout/map_mapsforge.xml
@@ -38,7 +38,7 @@
 				android:textSize="12dip"
 				android:textColor="@color/text_icon"
 				android:background="@drawable/icon_bcg" />
-		<view class="cgeo.geocaching.maps.mapsforge.mfMapView" android:id="@+id/mfmap"
+		<view class="cgeo.geocaching.maps.mapsforge.MapsforgeMapView" android:id="@+id/mfmap"
 				android:layout_width="fill_parent"
 				android:layout_height="fill_parent"
 				android:keepScreenOn="true"
diff --git a/main/src/cgeo/geocaching/cgSettings.java b/main/src/cgeo/geocaching/cgSettings.java
index 8c7c456..6446c58 100644
--- a/main/src/cgeo/geocaching/cgSettings.java
+++ b/main/src/cgeo/geocaching/cgSettings.java
@@ -1,8 +1,8 @@
 package cgeo.geocaching;
 
-import cgeo.geocaching.maps.google.googleMapFactory;
+import cgeo.geocaching.maps.google.GoogleMapFactory;
 import cgeo.geocaching.maps.interfaces.MapFactory;
-import cgeo.geocaching.maps.mapsforge.mfMapFactory;
+import cgeo.geocaching.maps.mapsforge.MapsforgeMapFactory;
 
 import org.apache.commons.lang3.StringUtils;
 import org.mapsforge.android.maps.MapDatabase;
@@ -495,12 +495,12 @@ public class cgSettings {
     public MapFactory getMapFactory() {
         if (mapSource.isGoogleMapSource()) {
             if (!mapSourceUsed.isGoogleMapSource() || mapFactory == null) {
-                mapFactory = new googleMapFactory();
+                mapFactory = new GoogleMapFactory();
                 mapSourceUsed = mapSource;
             }
         } else if (!mapSource.isGoogleMapSource()) {
             if (mapSourceUsed.isGoogleMapSource() || mapFactory == null) {
-                mapFactory = new mfMapFactory();
+                mapFactory = new MapsforgeMapFactory();
                 mapSourceUsed = mapSource;
             }
         }
diff --git a/main/src/cgeo/geocaching/maps/google/googleCacheOverlay.java b/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlay.java
index b175842..f501b8c 100644
--- a/main/src/cgeo/geocaching/maps/google/googleCacheOverlay.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlay.java
@@ -23,12 +23,12 @@ import java.util.concurrent.locks.ReentrantLock;
  * @author rsudev
  *
  */
-public class googleCacheOverlay extends ItemizedOverlay<googleCacheOverlayItem> implements ItemizedOverlayImpl {
+public class GoogleCacheOverlay extends ItemizedOverlay<GoogleCacheOverlayItem> implements ItemizedOverlayImpl {
 
     private CachesOverlay base;
     private Lock lock = new ReentrantLock();
 
-    public googleCacheOverlay(cgSettings settingsIn, Context contextIn, Drawable markerIn, Boolean fromDetailIn) {
+    public GoogleCacheOverlay(cgSettings settingsIn, Context contextIn, Drawable markerIn, Boolean fromDetailIn) {
         super(boundCenterBottom(markerIn));
         base = new CachesOverlay(settingsIn, this, contextIn, fromDetailIn);
     }
@@ -39,11 +39,11 @@ public class googleCacheOverlay extends ItemizedOverlay<googleCacheOverlayItem>
     }
 
     @Override
-    protected googleCacheOverlayItem createItem(int i) {
+    protected GoogleCacheOverlayItem createItem(int i) {
         if (base == null)
             return null;
 
-        return (googleCacheOverlayItem) base.createItem(i);
+        return (GoogleCacheOverlayItem) base.createItem(i);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/maps/google/googleCacheOverlayItem.java b/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlayItem.java
index 001dab9..f138e90 100644
--- a/main/src/cgeo/geocaching/maps/google/googleCacheOverlayItem.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlayItem.java
@@ -6,11 +6,11 @@ import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl;
 import com.google.android.maps.GeoPoint;
 import com.google.android.maps.OverlayItem;
 
-public class googleCacheOverlayItem extends OverlayItem implements CachesOverlayItemImpl {
+public class GoogleCacheOverlayItem extends OverlayItem implements CachesOverlayItemImpl {
     private String cacheType = null;
     private cgCoord coord;
 
-    public googleCacheOverlayItem(cgCoord coordinate, String type) {
+    public GoogleCacheOverlayItem(cgCoord coordinate, String type) {
         super(new GeoPoint(coordinate.coords.getLatitudeE6(), coordinate.coords.getLongitudeE6()), coordinate.name, "");
 
         this.cacheType = type;
diff --git a/main/src/cgeo/geocaching/maps/google/googleGeoPoint.java b/main/src/cgeo/geocaching/maps/google/GoogleGeoPoint.java
index 18cca20..56bc40c 100644
--- a/main/src/cgeo/geocaching/maps/google/googleGeoPoint.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleGeoPoint.java
@@ -4,9 +4,9 @@ import cgeo.geocaching.maps.interfaces.GeoPointImpl;
 
 import com.google.android.maps.GeoPoint;
 
-public class googleGeoPoint extends GeoPoint implements GeoPointImpl {
+public class GoogleGeoPoint extends GeoPoint implements GeoPointImpl {
 
-    public googleGeoPoint(int latitudeE6, int longitudeE6) {
+    public GoogleGeoPoint(int latitudeE6, int longitudeE6) {
         super(latitudeE6, longitudeE6);
     }
 
diff --git a/main/src/cgeo/geocaching/maps/google/googleMapActivity.java b/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
index a094064..ba53003 100644
--- a/main/src/cgeo/geocaching/maps/google/googleMapActivity.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
@@ -12,11 +12,11 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
-public class googleMapActivity extends MapActivity implements MapActivityImpl {
+public class GoogleMapActivity extends MapActivity implements MapActivityImpl {
 
     private AbstractMap mapBase;
 
-    public googleMapActivity() {
+    public GoogleMapActivity() {
         mapBase = new CGeoMap(this);
     }
 
diff --git a/main/src/cgeo/geocaching/maps/google/googleMapController.java b/main/src/cgeo/geocaching/maps/google/GoogleMapController.java
index cc607cc..fdd971c 100644
--- a/main/src/cgeo/geocaching/maps/google/googleMapController.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapController.java
@@ -6,11 +6,11 @@ import cgeo.geocaching.maps.interfaces.MapControllerImpl;
 import com.google.android.maps.GeoPoint;
 import com.google.android.maps.MapController;
 
-public class googleMapController implements MapControllerImpl {
+public class GoogleMapController implements MapControllerImpl {
 
     private MapController mapController;
 
-    public googleMapController(MapController mapControllerIn) {
+    public GoogleMapController(MapController mapControllerIn) {
         mapController = mapControllerIn;
     }
 
diff --git a/main/src/cgeo/geocaching/maps/google/googleMapFactory.java b/main/src/cgeo/geocaching/maps/google/GoogleMapFactory.java
index c7eb33e..6ba8e33 100644
--- a/main/src/cgeo/geocaching/maps/google/googleMapFactory.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapFactory.java
@@ -13,11 +13,11 @@ import com.google.android.maps.MapActivity;
 
 import android.content.Context;
 
-public class googleMapFactory implements MapFactory {
+public class GoogleMapFactory implements MapFactory {
 
     @Override
     public Class<? extends MapActivity> getMapClass() {
-        return googleMapActivity.class;
+        return GoogleMapActivity.class;
     }
 
     @Override
@@ -27,23 +27,23 @@ public class googleMapFactory implements MapFactory {
 
     @Override
     public int getMapLayoutId() {
-        return R.layout.googlemap;
+        return R.layout.map_google;
     }
 
     @Override
     public GeoPointImpl getGeoPointBase(final Geopoint coords) {
-        return new googleGeoPoint(coords.getLatitudeE6(), coords.getLongitudeE6());
+        return new GoogleGeoPoint(coords.getLatitudeE6(), coords.getLongitudeE6());
     }
 
     @Override
     public CachesOverlayItemImpl getCachesOverlayItem(cgCoord coordinate, String type) {
-        googleCacheOverlayItem baseItem = new googleCacheOverlayItem(coordinate, type);
+        GoogleCacheOverlayItem baseItem = new GoogleCacheOverlayItem(coordinate, type);
         return baseItem;
     }
 
     @Override
     public OtherCachersOverlayItemImpl getOtherCachersOverlayItemBase(Context context, cgUser userOne) {
-        googleOtherCachersOverlayItem baseItem = new googleOtherCachersOverlayItem(context, userOne);
+        GoogleOtherCachersOverlayItem baseItem = new GoogleOtherCachersOverlayItem(context, userOne);
         return baseItem;
     }
 
diff --git a/main/src/cgeo/geocaching/maps/google/googleMapProjection.java b/main/src/cgeo/geocaching/maps/google/GoogleMapProjection.java
index 761f509..dc694b8 100644
--- a/main/src/cgeo/geocaching/maps/google/googleMapProjection.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapProjection.java
@@ -8,11 +8,11 @@ import com.google.android.maps.Projection;
 
 import android.graphics.Point;
 
-public class googleMapProjection implements MapProjectionImpl {
+public class GoogleMapProjection implements MapProjectionImpl {
 
     private Projection projection;
 
-    public googleMapProjection(Projection projectionIn) {
+    public GoogleMapProjection(Projection projectionIn) {
         projection = projectionIn;
     }
 
diff --git a/main/src/cgeo/geocaching/maps/google/googleMapView.java b/main/src/cgeo/geocaching/maps/google/GoogleMapView.java
index 5b07cdf..0f7496b 100644
--- a/main/src/cgeo/geocaching/maps/google/googleMapView.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapView.java
@@ -28,21 +28,21 @@ import android.view.GestureDetector;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.MotionEvent;
 
-public class googleMapView extends MapView implements MapViewImpl {
+public class GoogleMapView extends MapView implements MapViewImpl {
     private GestureDetector gestureDetector;
     private OnDragListener onDragListener;
 
-    public googleMapView(Context context, AttributeSet attrs) {
+    public GoogleMapView(Context context, AttributeSet attrs) {
         super(context, attrs);
         gestureDetector = new GestureDetector(context, new GestureListener());
     }
 
-    public googleMapView(Context context, AttributeSet attrs, int defStyle) {
+    public GoogleMapView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         gestureDetector = new GestureDetector(context, new GestureListener());
     }
 
-    public googleMapView(Context context, String apiKey) {
+    public GoogleMapView(Context context, String apiKey) {
         super(context, apiKey);
         gestureDetector = new GestureDetector(context, new GestureListener());
     }
@@ -71,13 +71,13 @@ public class googleMapView extends MapView implements MapViewImpl {
 
     @Override
     public MapControllerImpl getMapController() {
-        return new googleMapController(getController());
+        return new GoogleMapController(getController());
     }
 
     @Override
     public GeoPointImpl getMapViewCenter() {
         GeoPoint point = getMapCenter();
-        return new googleGeoPoint(point.getLatitudeE6(), point.getLongitudeE6());
+        return new GoogleGeoPoint(point.getLatitudeE6(), point.getLongitudeE6());
     }
 
     @Override
@@ -92,21 +92,21 @@ public class googleMapView extends MapView implements MapViewImpl {
 
     @Override
     public MapProjectionImpl getMapProjection() {
-        return new googleMapProjection(getProjection());
+        return new GoogleMapProjection(getProjection());
     }
 
     @Override
     public CachesOverlay createAddMapOverlay(cgSettings settings,
             Context context, Drawable drawable, boolean fromDetailIntent) {
 
-        googleCacheOverlay ovl = new googleCacheOverlay(settings, context, drawable, fromDetailIntent);
+        GoogleCacheOverlay ovl = new GoogleCacheOverlay(settings, context, drawable, fromDetailIntent);
         getOverlays().add(ovl);
         return ovl.getBase();
     }
 
     @Override
     public OtherCachersOverlay createAddUsersOverlay(Context context, Drawable markerIn) {
-        googleOtherCachersOverlay ovl = new googleOtherCachersOverlay(context, markerIn);
+        GoogleOtherCachersOverlay ovl = new GoogleOtherCachersOverlay(context, markerIn);
         getOverlays().add(ovl);
         return ovl.getBase();
     }
@@ -115,7 +115,7 @@ public class googleMapView extends MapView implements MapViewImpl {
     public PositionOverlay createAddPositionOverlay(Activity activity,
             cgSettings settingsIn) {
 
-        googleOverlay ovl = new googleOverlay(activity, settingsIn, overlayType.PositionOverlay);
+        GoogleOverlay ovl = new GoogleOverlay(activity, settingsIn, overlayType.PositionOverlay);
         getOverlays().add(ovl);
         return (PositionOverlay) ovl.getBase();
     }
@@ -124,7 +124,7 @@ public class googleMapView extends MapView implements MapViewImpl {
     public ScaleOverlay createAddScaleOverlay(Activity activity,
             cgSettings settingsIn) {
 
-        googleOverlay ovl = new googleOverlay(activity, settingsIn, overlayType.ScaleOverlay);
+        GoogleOverlay ovl = new GoogleOverlay(activity, settingsIn, overlayType.ScaleOverlay);
         getOverlays().add(ovl);
         return (ScaleOverlay) ovl.getBase();
     }
diff --git a/main/src/cgeo/geocaching/maps/google/googleOtherCachersOverlay.java b/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlay.java
index 11df0b7..def9482 100644
--- a/main/src/cgeo/geocaching/maps/google/googleOtherCachersOverlay.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlay.java
@@ -16,12 +16,12 @@ import android.graphics.drawable.Drawable;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-public class googleOtherCachersOverlay extends ItemizedOverlay<googleOtherCachersOverlayItem> implements ItemizedOverlayImpl {
+public class GoogleOtherCachersOverlay extends ItemizedOverlay<GoogleOtherCachersOverlayItem> implements ItemizedOverlayImpl {
 
     private OtherCachersOverlay base;
     private Lock lock = new ReentrantLock();
 
-    public googleOtherCachersOverlay(Context contextIn, Drawable markerIn) {
+    public GoogleOtherCachersOverlay(Context contextIn, Drawable markerIn) {
         super(boundCenter(markerIn));
         base = new OtherCachersOverlay(this, contextIn);
     }
@@ -32,11 +32,11 @@ public class googleOtherCachersOverlay extends ItemizedOverlay<googleOtherCacher
     }
 
     @Override
-    protected googleOtherCachersOverlayItem createItem(int i) {
+    protected GoogleOtherCachersOverlayItem createItem(int i) {
         if (base == null)
             return null;
 
-        return (googleOtherCachersOverlayItem) base.createItem(i);
+        return (GoogleOtherCachersOverlayItem) base.createItem(i);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/maps/google/googleOtherCachersOverlayItem.java b/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlayItem.java
index d1aa635..f6fbcec 100644
--- a/main/src/cgeo/geocaching/maps/google/googleOtherCachersOverlayItem.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlayItem.java
@@ -10,11 +10,11 @@ import com.google.android.maps.OverlayItem;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 
-public class googleOtherCachersOverlayItem extends OverlayItem implements OtherCachersOverlayItemImpl {
+public class GoogleOtherCachersOverlayItem extends OverlayItem implements OtherCachersOverlayItemImpl {
     private Context context = null;
     private cgUser user = null;
 
-    public googleOtherCachersOverlayItem(Context contextIn, cgUser userIn) {
+    public GoogleOtherCachersOverlayItem(Context contextIn, cgUser userIn) {
         super(new GeoPoint(userIn.coords.getLatitudeE6(), userIn.coords.getLongitudeE6()), userIn.username, "");
 
         context = contextIn;
diff --git a/main/src/cgeo/geocaching/maps/google/googleOverlay.java b/main/src/cgeo/geocaching/maps/google/GoogleOverlay.java
index 1d7eb1c..03caafb 100644
--- a/main/src/cgeo/geocaching/maps/google/googleOverlay.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleOverlay.java
@@ -16,12 +16,12 @@ import android.graphics.Canvas;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-public class googleOverlay extends Overlay implements OverlayImpl {
+public class GoogleOverlay extends Overlay implements OverlayImpl {
 
     private GeneralOverlay overlayBase = null;
     private Lock lock = new ReentrantLock();
 
-    public googleOverlay(Activity activityIn, cgSettings settingsIn, overlayType ovlType) {
+    public GoogleOverlay(Activity activityIn, cgSettings settingsIn, overlayType ovlType) {
         switch (ovlType) {
             case PositionOverlay:
                 overlayBase = new PositionOverlay(settingsIn, activityIn, this);
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/mfCacheOverlay.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeCacheOverlay.java
index 507f1e5..c7f1552 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/mfCacheOverlay.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeCacheOverlay.java
@@ -17,12 +17,12 @@ import android.graphics.drawable.Drawable;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-public class mfCacheOverlay extends ItemizedOverlay<mfCacheOverlayItem> implements ItemizedOverlayImpl {
+public class MapsforgeCacheOverlay extends ItemizedOverlay<MapsforgeCacheOverlayItem> implements ItemizedOverlayImpl {
 
     private CachesOverlay base;
     private Lock lock = new ReentrantLock();
 
-    public mfCacheOverlay(cgSettings settingsIn, Context contextIn, Drawable markerIn, Boolean fromDetailIn) {
+    public MapsforgeCacheOverlay(cgSettings settingsIn, Context contextIn, Drawable markerIn, Boolean fromDetailIn) {
         super(boundCenterBottom(markerIn));
         base = new CachesOverlay(settingsIn, this, contextIn, fromDetailIn);
     }
@@ -33,11 +33,11 @@ public class mfCacheOverlay extends ItemizedOverlay<mfCacheOverlayItem> implemen
     }
 
     @Override
-    protected mfCacheOverlayItem createItem(int i) {
+    protected MapsforgeCacheOverlayItem createItem(int i) {
         if (base == null)
             return null;
 
-        return (mfCacheOverlayItem) base.createItem(i);
+        return (MapsforgeCacheOverlayItem) base.createItem(i);
     }
 
     @Override
@@ -59,7 +59,7 @@ public class mfCacheOverlay extends ItemizedOverlay<mfCacheOverlayItem> implemen
     @Override
     protected void drawOverlayBitmap(Canvas canvas, Point drawPosition,
             Projection projection, byte drawZoomLevel) {
-        base.drawOverlayBitmap(canvas, drawPosition, new mfMapProjection(projection), drawZoomLevel);
+        base.drawOverlayBitmap(canvas, drawPosition, new MapsforgeMapProjection(projection), drawZoomLevel);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/mfCacheOverlayItem.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeCacheOverlayItem.java
index b52ecd8..bb87941 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/mfCacheOverlayItem.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeCacheOverlayItem.java
@@ -8,11 +8,11 @@ import org.mapsforge.android.maps.OverlayItem;
 
 import android.graphics.drawable.Drawable;
 
-public class mfCacheOverlayItem extends OverlayItem implements CachesOverlayItemImpl {
+public class MapsforgeCacheOverlayItem extends OverlayItem implements CachesOverlayItemImpl {
     private String cacheType = null;
     private cgCoord coord;
 
-    public mfCacheOverlayItem(cgCoord coordinate, String type) {
+    public MapsforgeCacheOverlayItem(cgCoord coordinate, String type) {
         super(new GeoPoint(coordinate.coords.getLatitudeE6(), coordinate.coords.getLongitudeE6()), coordinate.name, "");
 
         this.cacheType = type;
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/mfGeoPoint.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeGeoPoint.java
index 0e47008..19dc7c5 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/mfGeoPoint.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeGeoPoint.java
@@ -4,9 +4,9 @@ import cgeo.geocaching.maps.interfaces.GeoPointImpl;
 
 import org.mapsforge.android.maps.GeoPoint;
 
-public class mfGeoPoint extends GeoPoint implements GeoPointImpl {
+public class MapsforgeGeoPoint extends GeoPoint implements GeoPointImpl {
 
-    public mfGeoPoint(int latitudeE6, int longitudeE6) {
+    public MapsforgeGeoPoint(int latitudeE6, int longitudeE6) {
         super(latitudeE6, longitudeE6);
     }
 }
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/mfMapActivity.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java
index 6c423b0..6ca34d6 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/mfMapActivity.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapActivity.java
@@ -12,11 +12,11 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
-public class mfMapActivity extends MapActivity implements MapActivityImpl {
+public class MapsforgeMapActivity extends MapActivity implements MapActivityImpl {
 
     private AbstractMap mapBase;
 
-    public mfMapActivity() {
+    public MapsforgeMapActivity() {
         mapBase = new CGeoMap(this);
     }
 
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/mfMapController.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapController.java
index da7d9be..9cdb80f 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/mfMapController.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapController.java
@@ -6,12 +6,12 @@ import cgeo.geocaching.maps.interfaces.MapControllerImpl;
 import org.mapsforge.android.maps.GeoPoint;
 import org.mapsforge.android.maps.MapController;
 
-public class mfMapController implements MapControllerImpl {
+public class MapsforgeMapController implements MapControllerImpl {
 
     private MapController mapController;
     private int maxZoomLevel;
 
-    public mfMapController(MapController mapControllerIn, int maxZoomLevelIn) {
+    public MapsforgeMapController(MapController mapControllerIn, int maxZoomLevelIn) {
         mapController = mapControllerIn;
         maxZoomLevel = maxZoomLevelIn;
     }
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/mfMapFactory.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapFactory.java
index d713b22..2176ae0 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/mfMapFactory.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapFactory.java
@@ -12,11 +12,11 @@ import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl;
 import android.app.Activity;
 import android.content.Context;
 
-public class mfMapFactory implements MapFactory {
+public class MapsforgeMapFactory implements MapFactory {
 
     @Override
     public Class<? extends Activity> getMapClass() {
-        return mfMapActivity.class;
+        return MapsforgeMapActivity.class;
     }
 
     @Override
@@ -26,23 +26,23 @@ public class mfMapFactory implements MapFactory {
 
     @Override
     public int getMapLayoutId() {
-        return R.layout.mfmap;
+        return R.layout.map_mapsforge;
     }
 
     @Override
     public GeoPointImpl getGeoPointBase(final Geopoint coords) {
-        return new mfGeoPoint(coords.getLatitudeE6(), coords.getLongitudeE6());
+        return new MapsforgeGeoPoint(coords.getLatitudeE6(), coords.getLongitudeE6());
     }
 
     @Override
     public CachesOverlayItemImpl getCachesOverlayItem(cgCoord coordinate, String type) {
-        mfCacheOverlayItem baseItem = new mfCacheOverlayItem(coordinate, type);
+        MapsforgeCacheOverlayItem baseItem = new MapsforgeCacheOverlayItem(coordinate, type);
         return baseItem;
     }
 
     @Override
     public OtherCachersOverlayItemImpl getOtherCachersOverlayItemBase(Context context, cgUser userOne) {
-        mfOtherCachersOverlayItem baseItem = new mfOtherCachersOverlayItem(context, userOne);
+        MapsforgeOtherCachersOverlayItem baseItem = new MapsforgeOtherCachersOverlayItem(context, userOne);
         return baseItem;
     }
 
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/mfMapProjection.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProjection.java
index 74a6c0b..268825d 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/mfMapProjection.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProjection.java
@@ -8,11 +8,11 @@ import org.mapsforge.android.maps.Projection;
 
 import android.graphics.Point;
 
-public class mfMapProjection implements MapProjectionImpl {
+public class MapsforgeMapProjection implements MapProjectionImpl {
 
     private Projection projection;
 
-    public mfMapProjection(Projection projectionIn) {
+    public MapsforgeMapProjection(Projection projectionIn) {
         projection = projectionIn;
     }
 
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/mfMapView.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java
index 6200079..fa2dd45 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/mfMapView.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java
@@ -31,11 +31,11 @@ import android.view.GestureDetector;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.MotionEvent;
 
-public class mfMapView extends MapView implements MapViewImpl {
+public class MapsforgeMapView extends MapView implements MapViewImpl {
     private GestureDetector gestureDetector;
     private OnDragListener onDragListener;
 
-    public mfMapView(Context context, AttributeSet attrs) {
+    public MapsforgeMapView(Context context, AttributeSet attrs) {
         super(context, attrs);
         gestureDetector = new GestureDetector(context, new GestureListener());
     }
@@ -60,13 +60,13 @@ public class mfMapView extends MapView implements MapViewImpl {
 
     @Override
     public MapControllerImpl getMapController() {
-        return new mfMapController(getController(), getMaxZoomLevel());
+        return new MapsforgeMapController(getController(), getMaxZoomLevel());
     }
 
     @Override
     public GeoPointImpl getMapViewCenter() {
         GeoPoint point = getMapCenter();
-        return new mfGeoPoint(point.getLatitudeE6(), point.getLongitudeE6());
+        return new MapsforgeGeoPoint(point.getLatitudeE6(), point.getLongitudeE6());
     }
 
     @Override
@@ -81,21 +81,21 @@ public class mfMapView extends MapView implements MapViewImpl {
 
     @Override
     public MapProjectionImpl getMapProjection() {
-        return new mfMapProjection(getProjection());
+        return new MapsforgeMapProjection(getProjection());
     }
 
     @Override
     public CachesOverlay createAddMapOverlay(cgSettings settings,
             Context context, Drawable drawable, boolean fromDetailIntent) {
 
-        mfCacheOverlay ovl = new mfCacheOverlay(settings, context, drawable, fromDetailIntent);
+        MapsforgeCacheOverlay ovl = new MapsforgeCacheOverlay(settings, context, drawable, fromDetailIntent);
         getOverlays().add(ovl);
         return ovl.getBase();
     }
 
     @Override
     public OtherCachersOverlay createAddUsersOverlay(Context context, Drawable markerIn) {
-        mfOtherCachersOverlay ovl = new mfOtherCachersOverlay(context, markerIn);
+        MapsforgeOtherCachersOverlay ovl = new MapsforgeOtherCachersOverlay(context, markerIn);
         getOverlays().add(ovl);
         return ovl.getBase();
     }
@@ -103,7 +103,7 @@ public class mfMapView extends MapView implements MapViewImpl {
     @Override
     public PositionOverlay createAddPositionOverlay(Activity activity,
             cgSettings settingsIn) {
-        mfOverlay ovl = new mfOverlay(activity, settingsIn, overlayType.PositionOverlay);
+        MapsforgeOverlay ovl = new MapsforgeOverlay(activity, settingsIn, overlayType.PositionOverlay);
         getOverlays().add(ovl);
         return (PositionOverlay) ovl.getBase();
     }
@@ -111,7 +111,7 @@ public class mfMapView extends MapView implements MapViewImpl {
     @Override
     public ScaleOverlay createAddScaleOverlay(Activity activity,
             cgSettings settingsIn) {
-        mfOverlay ovl = new mfOverlay(activity, settingsIn, overlayType.ScaleOverlay);
+        MapsforgeOverlay ovl = new MapsforgeOverlay(activity, settingsIn, overlayType.ScaleOverlay);
         getOverlays().add(ovl);
         return (ScaleOverlay) ovl.getBase();
     }
@@ -202,7 +202,7 @@ public class mfMapView extends MapView implements MapViewImpl {
     public void repaintRequired(GeneralOverlay overlay) {
 
         try {
-            mfOverlay ovl = (mfOverlay) overlay.getOverlayImpl();
+            MapsforgeOverlay ovl = (MapsforgeOverlay) overlay.getOverlayImpl();
 
             if (ovl != null) {
                 ovl.requestRedraw();
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/mfOtherCachersOverlay.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlay.java
index fc545cc..8bd70e4 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/mfOtherCachersOverlay.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlay.java
@@ -16,12 +16,12 @@ import android.graphics.drawable.Drawable;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-public class mfOtherCachersOverlay extends ItemizedOverlay<mfOtherCachersOverlayItem> implements ItemizedOverlayImpl {
+public class MapsforgeOtherCachersOverlay extends ItemizedOverlay<MapsforgeOtherCachersOverlayItem> implements ItemizedOverlayImpl {
 
     private OtherCachersOverlay base;
     private Lock lock = new ReentrantLock();
 
-    public mfOtherCachersOverlay(Context contextIn, Drawable markerIn) {
+    public MapsforgeOtherCachersOverlay(Context contextIn, Drawable markerIn) {
         super(boundCenter(markerIn));
         base = new OtherCachersOverlay(this, contextIn);
     }
@@ -32,11 +32,11 @@ public class mfOtherCachersOverlay extends ItemizedOverlay<mfOtherCachersOverlay
     }
 
     @Override
-    protected mfOtherCachersOverlayItem createItem(int i) {
+    protected MapsforgeOtherCachersOverlayItem createItem(int i) {
         if (base == null)
             return null;
 
-        return (mfOtherCachersOverlayItem) base.createItem(i);
+        return (MapsforgeOtherCachersOverlayItem) base.createItem(i);
     }
 
     @Override
@@ -59,7 +59,7 @@ public class mfOtherCachersOverlay extends ItemizedOverlay<mfOtherCachersOverlay
     protected void drawOverlayBitmap(Canvas canvas, Point drawPosition,
             Projection projection, byte drawZoomLevel) {
 
-        base.drawOverlayBitmap(canvas, drawPosition, new mfMapProjection(projection), drawZoomLevel);
+        base.drawOverlayBitmap(canvas, drawPosition, new MapsforgeMapProjection(projection), drawZoomLevel);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/mfOtherCachersOverlayItem.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlayItem.java
index 4845425..5732e99 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/mfOtherCachersOverlayItem.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlayItem.java
@@ -10,11 +10,11 @@ import org.mapsforge.android.maps.OverlayItem;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 
-public class mfOtherCachersOverlayItem extends OverlayItem implements OtherCachersOverlayItemImpl {
+public class MapsforgeOtherCachersOverlayItem extends OverlayItem implements OtherCachersOverlayItemImpl {
     private Context context = null;
     private cgUser user = null;
 
-    public mfOtherCachersOverlayItem(Context contextIn, cgUser userIn) {
+    public MapsforgeOtherCachersOverlayItem(Context contextIn, cgUser userIn) {
         super(new GeoPoint((int) (userIn.coords.getLatitudeE6()), userIn.coords.getLongitudeE6()), userIn.username, "");
 
         context = contextIn;
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/mfOverlay.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOverlay.java
index a2ea3f4..60bc55a 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/mfOverlay.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOverlay.java
@@ -16,12 +16,12 @@ import android.graphics.Point;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-public class mfOverlay extends Overlay implements OverlayImpl {
+public class MapsforgeOverlay extends Overlay implements OverlayImpl {
 
     private GeneralOverlay overlayBase = null;
     private Lock lock = new ReentrantLock();
 
-    public mfOverlay(Activity activityIn, cgSettings settingsIn, OverlayImpl.overlayType ovlType) {
+    public MapsforgeOverlay(Activity activityIn, cgSettings settingsIn, OverlayImpl.overlayType ovlType) {
 
         switch (ovlType) {
             case PositionOverlay:
@@ -37,7 +37,7 @@ public class mfOverlay extends Overlay implements OverlayImpl {
             Projection projection, byte drawZoomLevel) {
 
         if (overlayBase != null) {
-            overlayBase.drawOverlayBitmap(canvas, drawPosition, new mfMapProjection(projection), drawZoomLevel);
+            overlayBase.drawOverlayBitmap(canvas, drawPosition, new MapsforgeMapProjection(projection), drawZoomLevel);
         }
     }