refactoring: cgeoapplication -> CgeoApplication

72 files changed, 185 insertions, 185 deletions

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index e0a5598..59f5d58 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -30,7 +30,7 @@
         android:xlargeScreens="true" />
 
     <application
-        android:name=".cgeoapplication"
+        android:name=".CgeoApplication"
         android:allowBackup="true"
         android:backupAgent="cgeo.geocaching.backup.CentralBackupAgent"
         android:icon="@drawable/cgeo"
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 46f73e2..1486af2 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1134,7 +1134,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 if (time > 0) {
                     String dateString = Formatter.formatFullDate(time);
                     if (cache.isEventCache()) {
-                        dateString = DateUtils.formatDateTime(cgeoapplication.getInstance().getBaseContext(), time, DateUtils.FORMAT_SHOW_WEEKDAY) + ", " + dateString;
+                        dateString = DateUtils.formatDateTime(CgeoApplication.getInstance().getBaseContext(), time, DateUtils.FORMAT_SHOW_WEEKDAY) + ", " + dateString;
                     }
                     details.add(cache.isEventCache() ? R.string.cache_event : R.string.cache_hidden, dateString);
                 }
diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java
index fb86bb9..470a16a 100644
--- a/main/src/cgeo/geocaching/CacheListActivity.java
+++ b/main/src/cgeo/geocaching/CacheListActivity.java
@@ -1593,7 +1593,7 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
 
     private static boolean isValidUsername(AbstractActivity context, String username) {
         if (StringUtils.isBlank(username)) {
-            context.showToast(cgeoapplication.getInstance().getString(R.string.warn_no_username));
+            context.showToast(CgeoApplication.getInstance().getString(R.string.warn_no_username));
             return false;
         }
         return true;
@@ -1661,7 +1661,7 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
 
     private static boolean isValidCoords(AbstractActivity context, Geopoint coords) {
         if (coords == null) {
-            context.showToast(cgeoapplication.getInstance().getString(R.string.warn_no_coordinates));
+            context.showToast(CgeoApplication.getInstance().getString(R.string.warn_no_coordinates));
             return false;
         }
         return true;
@@ -1669,7 +1669,7 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
 
     public static void startActivityKeyword(final AbstractActivity context, final String keyword) {
         if (keyword == null) {
-            context.showToast(cgeoapplication.getInstance().getString(R.string.warn_no_keyword));
+            context.showToast(CgeoApplication.getInstance().getString(R.string.warn_no_keyword));
             return;
         }
         final Intent cachesIntent = new Intent(context, CacheListActivity.class);
diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/CgeoApplication.java
index 403f597..b725b0b 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/CgeoApplication.java
@@ -14,7 +14,7 @@ import android.os.Message;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class cgeoapplication extends Application {
+public class CgeoApplication extends Application {
 
     private volatile GeoDataProvider geo;
     private volatile DirectionProvider dir;
@@ -22,17 +22,17 @@ public class cgeoapplication extends Application {
     public boolean showLoginToast = true; //login toast shown just once.
     private boolean liveMapHintShown = false; // livemap hint has been shown
     final private StatusUpdater statusUpdater = new StatusUpdater();
-    private static cgeoapplication instance;
+    private static CgeoApplication instance;
 
-    public cgeoapplication() {
+    public CgeoApplication() {
         setInstance(this);
     }
 
-    private static void setInstance(final cgeoapplication application) {
+    private static void setInstance(final CgeoApplication application) {
         instance = application;
     }
 
-    public static cgeoapplication getInstance() {
+    public static CgeoApplication getInstance() {
         return instance;
     }
 
diff --git a/main/src/cgeo/geocaching/CompassActivity.java b/main/src/cgeo/geocaching/CompassActivity.java
index c8579e1..b7bed7d 100644
--- a/main/src/cgeo/geocaching/CompassActivity.java
+++ b/main/src/cgeo/geocaching/CompassActivity.java
@@ -134,7 +134,7 @@ public class CompassActivity extends AbstractActivity {
         setCacheInfo();
 
         // Force a refresh of location and direction when data is available.
-        final cgeoapplication app = cgeoapplication.getInstance();
+        final CgeoApplication app = CgeoApplication.getInstance();
         final IGeoData geo = app.currentGeo();
         if (geo != null) {
             geoDirHandler.update(geo);
diff --git a/main/src/cgeo/geocaching/DataStore.java b/main/src/cgeo/geocaching/DataStore.java
index d66b471..93067b8 100644
--- a/main/src/cgeo/geocaching/DataStore.java
+++ b/main/src/cgeo/geocaching/DataStore.java
@@ -294,7 +294,7 @@ public class DataStore {
         }
 
         try {
-            final DbHelper dbHelper = new DbHelper(new DBContext(cgeoapplication.getInstance()));
+            final DbHelper dbHelper = new DbHelper(new DBContext(CgeoApplication.getInstance()));
             database = dbHelper.getWritableDatabase();
         } catch (Exception e) {
             Log.e("DataStore.init: unable to open database for R/W", e);
@@ -2484,7 +2484,7 @@ public class DataStore {
     public static List<StoredList> getLists() {
         init();
 
-        final Resources res = cgeoapplication.getInstance().getResources();
+        final Resources res = CgeoApplication.getInstance().getResources();
         final List<StoredList> lists = new ArrayList<StoredList>();
         lists.add(new StoredList(StoredList.STANDARD_LIST_ID, res.getString(R.string.list_inbox), (int) PreparedStatements.getCountCachesOnStandardList().simpleQueryForLong()));
 
@@ -2536,7 +2536,7 @@ public class DataStore {
             }
         }
 
-        Resources res = cgeoapplication.getInstance().getResources();
+        Resources res = CgeoApplication.getInstance().getResources();
         if (id == StoredList.ALL_LIST_ID) {
             return new StoredList(StoredList.ALL_LIST_ID, res.getString(R.string.list_all_lists), getAllCachesCount());
         }
diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index 11d15da..ad6d743 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -432,7 +432,7 @@ public class EditWaypointActivity extends AbstractActivity {
                         }
                         if (modifyLocal.isChecked() || modifyBoth.isChecked()) {
                             if (!cache.hasUserModifiedCoords()) {
-                                final Waypoint origWaypoint = new Waypoint(cgeoapplication.getInstance().getString(R.string.cache_coordinates_original), WaypointType.ORIGINAL, false);
+                                final Waypoint origWaypoint = new Waypoint(CgeoApplication.getInstance().getString(R.string.cache_coordinates_original), WaypointType.ORIGINAL, false);
                                 origWaypoint.setCoords(cache.getCoords());
                                 cache.addOrChangeWaypoint(origWaypoint, false);
                                 cache.setUserModifiedCoords(true);
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 94de3b4..8798539 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -1295,7 +1295,7 @@ public class Geocache implements ICache, IWaypoint {
         final int index = getWaypointIndex(original);
         final Waypoint copy = new Waypoint(original);
         copy.setUserDefined();
-        copy.setName(cgeoapplication.getInstance().getString(R.string.waypoint_copy_of) + " " + copy.getName());
+        copy.setName(CgeoApplication.getInstance().getString(R.string.waypoint_copy_of) + " " + copy.getName());
         waypoints.add(index + 1, copy);
         return DataStore.saveWaypoint(-1, geocode, copy);
     }
@@ -1406,7 +1406,7 @@ public class Geocache implements ICache, IWaypoint {
                     if (point.getLatitudeE6() != 0 && point.getLongitudeE6() != 0 &&
                             ((point.getLatitudeE6() % 1000) != 0 || (point.getLongitudeE6() % 1000) != 0) &&
                             !hasIdenticalWaypoint(point)) {
-                        final String name = cgeoapplication.getInstance().getString(R.string.cache_personal_note) + " " + count;
+                        final String name = CgeoApplication.getInstance().getString(R.string.cache_personal_note) + " " + count;
                         final String potentialWaypointType = note.substring(Math.max(0, matcher.start() - 15));
                         final Waypoint waypoint = new Waypoint(name, parseWaypointType(potentialWaypointType), false);
                         waypoint.setCoords(point);
@@ -1708,7 +1708,7 @@ public class Geocache implements ICache, IWaypoint {
             }
         }
         // 12 o'clock
-        final String hourLocalized = cgeoapplication.getInstance().getString(R.string.cache_time_full_hours);
+        final String hourLocalized = CgeoApplication.getInstance().getString(R.string.cache_time_full_hours);
         if (StringUtils.isNotBlank(hourLocalized)) {
             final Pattern fullHours = Pattern.compile("\\b(\\d{1,2})\\s+" + Pattern.quote(hourLocalized), Pattern.CASE_INSENSITIVE);
             final MatcherWrapper matcherHours = new MatcherWrapper(fullHours, getDescription());
diff --git a/main/src/cgeo/geocaching/LogEntry.java b/main/src/cgeo/geocaching/LogEntry.java
index a01c431..3c9f2b6 100644
--- a/main/src/cgeo/geocaching/LogEntry.java
+++ b/main/src/cgeo/geocaching/LogEntry.java
@@ -89,7 +89,7 @@ public final class LogEntry {
             }
         }
         if (titles.isEmpty()) {
-            titles.add(cgeoapplication.getInstance().getString(R.string.cache_log_image_default_title));
+            titles.add(CgeoApplication.getInstance().getString(R.string.cache_log_image_default_title));
         }
         return StringUtils.join(titles, ", ");
     }
diff --git a/main/src/cgeo/geocaching/StatusFragment.java b/main/src/cgeo/geocaching/StatusFragment.java
index e0e714a..4f70f0e 100644
--- a/main/src/cgeo/geocaching/StatusFragment.java
+++ b/main/src/cgeo/geocaching/StatusFragment.java
@@ -38,12 +38,12 @@ public class StatusFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
-        cgeoapplication.getInstance().getStatusUpdater().addObserver(statusHandler);
+        CgeoApplication.getInstance().getStatusUpdater().addObserver(statusHandler);
     }
 
     @Override
     public void onPause() {
-        cgeoapplication.getInstance().getStatusUpdater().deleteObserver(statusHandler);
+        CgeoApplication.getInstance().getStatusUpdater().deleteObserver(statusHandler);
         super.onPause();
     }
 
diff --git a/main/src/cgeo/geocaching/StoredList.java b/main/src/cgeo/geocaching/StoredList.java
index 1084a4b..367ddcb 100644
--- a/main/src/cgeo/geocaching/StoredList.java
+++ b/main/src/cgeo/geocaching/StoredList.java
@@ -59,12 +59,12 @@ public final class StoredList {
 
     public static class UserInterface {
         private final Activity activity;
-        private final cgeoapplication app;
+        private final CgeoApplication app;
         private final Resources res;
 
         public UserInterface(final Activity activity) {
             this.activity = activity;
-            app = cgeoapplication.getInstance();
+            app = CgeoApplication.getInstance();
             res = app.getResources();
         }
 
diff --git a/main/src/cgeo/geocaching/Waypoint.java b/main/src/cgeo/geocaching/Waypoint.java
index e39d26a..f3d4e4f 100644
--- a/main/src/cgeo/geocaching/Waypoint.java
+++ b/main/src/cgeo/geocaching/Waypoint.java
@@ -35,7 +35,7 @@ public class Waypoint implements IWaypoint, Comparable<Waypoint> {
 
     public static void initializeScale() {
         // Calculate visited inset based on screen density
-        VISITED_INSET = (int) (6.6f * cgeoapplication.getInstance().getResources().getDisplayMetrics().density + 0.5f);
+        VISITED_INSET = (int) (6.6f * CgeoApplication.getInstance().getResources().getDisplayMetrics().density + 0.5f);
     }
 
     /**
diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java
index 28c0cdd..1abc704 100644
--- a/main/src/cgeo/geocaching/activity/AbstractActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.activity;
 
 import butterknife.Views;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.compatibility.Compatibility;
 import cgeo.geocaching.network.Cookies;
 import cgeo.geocaching.settings.Settings;
@@ -18,7 +18,7 @@ import android.widget.EditText;
 
 public abstract class AbstractActivity extends FragmentActivity implements IAbstractActivity {
 
-    protected cgeoapplication app = null;
+    protected CgeoApplication app = null;
     protected Resources res = null;
     private boolean keepScreenOn = false;
 
@@ -101,7 +101,7 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst
     private void initializeCommonFields() {
         // initialize commonly used members
         res = this.getResources();
-        app = (cgeoapplication) this.getApplication();
+        app = (CgeoApplication) this.getApplication();
 
         // only needed in some activities, but implemented in super class nonetheless
         Cookies.restoreCookieStore(Settings.getCookieStore());
diff --git a/main/src/cgeo/geocaching/activity/AbstractListActivity.java b/main/src/cgeo/geocaching/activity/AbstractListActivity.java
index 93e9b7f..d2bc0b4 100644
--- a/main/src/cgeo/geocaching/activity/AbstractListActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractListActivity.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.activity;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
@@ -13,7 +13,7 @@ public abstract class AbstractListActivity extends FragmentListActivity implemen
 
     private boolean keepScreenOn = false;
 
-    protected cgeoapplication app = null;
+    protected CgeoApplication app = null;
     protected Resources res = null;
 
     protected AbstractListActivity() {
@@ -65,7 +65,7 @@ public abstract class AbstractListActivity extends FragmentListActivity implemen
     private void initializeCommonFields() {
         // init
         res = this.getResources();
-        app = (cgeoapplication) this.getApplication();
+        app = (CgeoApplication) this.getApplication();
 
         ActivityMixin.keepScreenOn(this, keepScreenOn);
     }
diff --git a/main/src/cgeo/geocaching/apps/AbstractApp.java b/main/src/cgeo/geocaching/apps/AbstractApp.java
index 7b6b3d9..d861542 100644
--- a/main/src/cgeo/geocaching/apps/AbstractApp.java
+++ b/main/src/cgeo/geocaching/apps/AbstractApp.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.apps;
 
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.utils.ProcessUtils;
 
 import org.apache.commons.lang3.StringUtils;
@@ -53,7 +53,7 @@ public abstract class AbstractApp implements App {
     }
 
     protected static String getString(int ressourceId) {
-        return cgeoapplication.getInstance().getString(ressourceId);
+        return CgeoApplication.getInstance().getString(ressourceId);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/apps/AbstractLocusApp.java b/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
index 53620e4..2db8918 100644
--- a/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
+++ b/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
@@ -3,7 +3,7 @@ package cgeo.geocaching.apps;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.WaypointType;
@@ -43,7 +43,7 @@ public abstract class AbstractLocusApp extends AbstractApp {
 
     @Override
     public boolean isInstalled() {
-        return LocusUtils.isLocusAvailable(cgeoapplication.getInstance());
+        return LocusUtils.isLocusAvailable(CgeoApplication.getInstance());
     }
 
     /**
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsDirectionApp.java b/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsDirectionApp.java
index a84b7e8..a5b9a94 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsDirectionApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsDirectionApp.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.apps.cache.navi;
 
 import cgeo.geocaching.IGeoData;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.maps.MapProviderFactory;
 import cgeo.geocaching.utils.Log;
@@ -25,7 +25,7 @@ public class GoogleMapsDirectionApp extends AbstractPointNavigationApp {
     @Override
     public void navigate(Activity activity, Geopoint coords) {
         try {
-            IGeoData geo = cgeoapplication.getInstance().currentGeo();
+            IGeoData geo = CgeoApplication.getInstance().currentGeo();
             final Geopoint coordsNow = geo == null ? null : geo.getCoords();
 
             if (coordsNow != null) {
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
index ec6b3e1..eea0f0a 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java
@@ -1,9 +1,9 @@
 package cgeo.geocaching.apps.cache.navi;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.apps.AbstractAppFactory;
 import cgeo.geocaching.apps.App;
@@ -320,7 +320,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
      */
     public static void startDefaultNavigationApplication(int defaultNavigation, Activity activity, Geocache cache) {
         if (cache == null || cache.getCoords() == null) {
-            ActivityMixin.showToast(activity, cgeoapplication.getInstance().getString(R.string.err_location_unknown));
+            ActivityMixin.showToast(activity, CgeoApplication.getInstance().getString(R.string.err_location_unknown));
             return;
         }
 
@@ -342,7 +342,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
      */
     public static void startDefaultNavigationApplication(int defaultNavigation, Activity activity, Waypoint waypoint) {
         if (waypoint == null || waypoint.getCoords() == null) {
-            ActivityMixin.showToast(activity, cgeoapplication.getInstance().getString(R.string.err_location_unknown));
+            ActivityMixin.showToast(activity, CgeoApplication.getInstance().getString(R.string.err_location_unknown));
             return;
         }
         navigateWaypoint(activity, waypoint, getDefaultNavigationApplication(defaultNavigation));
@@ -356,7 +356,7 @@ public final class NavigationAppFactory extends AbstractAppFactory {
      */
     public static void startDefaultNavigationApplication(int defaultNavigation, Activity activity, final Geopoint destination) {
         if (destination == null) {
-            ActivityMixin.showToast(activity, cgeoapplication.getInstance().getString(R.string.err_location_unknown));
+            ActivityMixin.showToast(activity, CgeoApplication.getInstance().getString(R.string.err_location_unknown));
             return;
         }
 
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/StreetviewApp.java b/main/src/cgeo/geocaching/apps/cache/navi/StreetviewApp.java
index e2c0828..df67e43 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/StreetviewApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/StreetviewApp.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.apps.cache.navi;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.utils.ProcessUtils;
@@ -31,7 +31,7 @@ class StreetviewApp extends AbstractPointNavigationApp {
             activity.startActivity(new Intent(Intent.ACTION_VIEW,
                     Uri.parse("google.streetview:cbll=" + point.getLatitude() + "," + point.getLongitude())));
         } catch (final ActivityNotFoundException e) {
-            ActivityMixin.showToast(activity, cgeoapplication.getInstance().getString(R.string.err_application_no));
+            ActivityMixin.showToast(activity, CgeoApplication.getInstance().getString(R.string.err_application_no));
         }
     }
 }
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/compatibility/AndroidLevel13.java b/main/src/cgeo/geocaching/compatibility/AndroidLevel13.java
index f08ac22..eb2be4b 100644
--- a/main/src/cgeo/geocaching/compatibility/AndroidLevel13.java
+++ b/main/src/cgeo/geocaching/compatibility/AndroidLevel13.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.compatibility;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -18,7 +18,7 @@ public class AndroidLevel13 implements AndroidLevel13Interface {
     @Override
     public Point getDisplaySize() {
         Point dimensions = new Point();
-        ((WindowManager) cgeoapplication.getInstance().getSystemService(Context.WINDOW_SERVICE))
+        ((WindowManager) CgeoApplication.getInstance().getSystemService(Context.WINDOW_SERVICE))
                 .getDefaultDisplay().getSize(dimensions);
         return dimensions;
     }
diff --git a/main/src/cgeo/geocaching/compatibility/AndroidLevel13Emulation.java b/main/src/cgeo/geocaching/compatibility/AndroidLevel13Emulation.java
index ded20cb..56c784f 100644
--- a/main/src/cgeo/geocaching/compatibility/AndroidLevel13Emulation.java
+++ b/main/src/cgeo/geocaching/compatibility/AndroidLevel13Emulation.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.compatibility;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import android.content.Context;
 import android.graphics.Point;
@@ -22,7 +22,7 @@ public class AndroidLevel13Emulation implements AndroidLevel13Interface {
     }
 
     private static Display getDisplay() {
-        return ((WindowManager) cgeoapplication.getInstance().getSystemService(Context.WINDOW_SERVICE))
+        return ((WindowManager) CgeoApplication.getInstance().getSystemService(Context.WINDOW_SERVICE))
                 .getDefaultDisplay();
     }
 }
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
index 066e656..9388de1 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
@@ -1,12 +1,12 @@
 package cgeo.geocaching.connector.gc;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.ICache;
 import cgeo.geocaching.LogCacheActivity;
 import cgeo.geocaching.R;
 import cgeo.geocaching.SearchResult;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.connector.AbstractConnector;
 import cgeo.geocaching.connector.ILoggingManager;
 import cgeo.geocaching.connector.capability.ILogin;
@@ -299,13 +299,13 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode,
         final StatusCode status = Login.login();
 
         if (status == StatusCode.NO_ERROR) {
-            cgeoapplication.getInstance().checkLogin = false;
+            CgeoApplication.getInstance().checkLogin = false;
             Login.detectGcCustomDate();
         }
 
-        if (cgeoapplication.getInstance().showLoginToast && handler != null) {
+        if (CgeoApplication.getInstance().showLoginToast && handler != null) {
             handler.sendMessage(handler.obtainMessage(0, status));
-            cgeoapplication.getInstance().showLoginToast = false;
+            CgeoApplication.getInstance().showLoginToast = false;
 
             // invoke settings activity to insert login details
             if (status == StatusCode.NO_LOGIN_INFO_STORED && fromActivity != null) {
diff --git a/main/src/cgeo/geocaching/connector/gc/GCMap.java b/main/src/cgeo/geocaching/connector/gc/GCMap.java
index e3259c0..d76a987 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCMap.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCMap.java
@@ -3,7 +3,7 @@ package cgeo.geocaching.connector.gc;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.SearchResult;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LiveMapStrategy.Strategy;
@@ -255,7 +255,7 @@ public class GCMap {
      * @return
      */
     public static SearchResult searchByViewport(final Viewport viewport, final String[] tokens) {
-        int speed = (int) cgeoapplication.getInstance().currentGeo().getSpeed() * 60 * 60 / 1000; // in km/h
+        int speed = (int) CgeoApplication.getInstance().currentGeo().getSpeed() * 60 * 60 / 1000; // in km/h
         Strategy strategy = Settings.getLiveMapStrategy();
         if (strategy == Strategy.AUTO) {
             strategy = speed >= 30 ? Strategy.FAST : Strategy.DETAILED;
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index f25fa1f..78d4fea 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.connector.gc;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.Image;
@@ -9,7 +10,6 @@ import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.Trackable;
 import cgeo.geocaching.TrackableLog;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LoadFlags;
@@ -667,7 +667,7 @@ public abstract class GCParser {
             final String originalCoords = TextUtils.getMatch(page, GCConstants.PATTERN_LATLON_ORIG, false, null);
 
             if (null != originalCoords) {
-                final Waypoint waypoint = new Waypoint(cgeoapplication.getInstance().getString(R.string.cache_coordinates_original), WaypointType.ORIGINAL, false);
+                final Waypoint waypoint = new Waypoint(CgeoApplication.getInstance().getString(R.string.cache_coordinates_original), WaypointType.ORIGINAL, false);
                 waypoint.setCoords(new Geopoint(originalCoords));
                 cache.addOrChangeWaypoint(waypoint, false);
                 cache.setUserModifiedCoords(true);
@@ -706,7 +706,7 @@ public abstract class GCParser {
 
                     // waypoint name
                     // res is null during the unit tests
-                    final String name = TextUtils.getMatch(wp[6], GCConstants.PATTERN_WPNAME, true, 1, cgeoapplication.getInstance().getString(R.string.waypoint), true);
+                    final String name = TextUtils.getMatch(wp[6], GCConstants.PATTERN_WPNAME, true, 1, CgeoApplication.getInstance().getString(R.string.waypoint), true);
 
                     // waypoint type
                     final String resulttype = TextUtils.getMatch(wp[3], GCConstants.PATTERN_WPTYPE, null);
@@ -1481,7 +1481,7 @@ public abstract class GCParser {
             Log.w("GCParser.parseTrackable: Failed to parse trackable details & image");
         }
         if (StringUtils.isEmpty(trackable.getDetails()) && page.contains(GCConstants.ERROR_TB_NOT_ACTIVATED)) {
-            trackable.setDetails(cgeoapplication.getInstance().getString(R.string.trackable_not_activated));
+            trackable.setDetails(CgeoApplication.getInstance().getString(R.string.trackable_not_activated));
         }
 
         // trackable logs
@@ -1538,7 +1538,7 @@ public abstract class GCParser {
             trackable.setTrackingcode(possibleTrackingcode);
         }
 
-        if (cgeoapplication.getInstance() != null) {
+        if (CgeoApplication.getInstance() != null) {
             DataStore.saveTrackable(trackable);
         }
 
diff --git a/main/src/cgeo/geocaching/connector/gc/Login.java b/main/src/cgeo/geocaching/connector/gc/Login.java
index 10ea18d..4e427ba 100644
--- a/main/src/cgeo/geocaching/connector/gc/Login.java
+++ b/main/src/cgeo/geocaching/connector/gc/Login.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.connector.gc;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.network.Cookies;
 import cgeo.geocaching.network.HtmlImage;
@@ -76,7 +76,7 @@ public abstract class Login {
             return StatusCode.NO_LOGIN_INFO_STORED;
         }
 
-        Login.setActualStatus(cgeoapplication.getInstance().getString(R.string.init_login_popup_working));
+        Login.setActualStatus(CgeoApplication.getInstance().getString(R.string.init_login_popup_working));
         HttpResponse loginResponse = Network.getRequest("https://www.geocaching.com/login/default.aspx");
         String loginData = Network.getResponseData(loginResponse);
         if (loginResponse != null && loginResponse.getStatusLine().getStatusCode() == 503 && TextUtils.matches(loginData, GCConstants.PATTERN_MAINTENANCE)) {
@@ -171,7 +171,7 @@ public abstract class Login {
         resetLoginStatus();
 
         setActualCachesFound(-1);
-        setActualStatus(cgeoapplication.getInstance().getString(R.string.err_login));
+        setActualStatus(CgeoApplication.getInstance().getString(R.string.err_login));
     }
 
     static void setActualCachesFound(final int found) {
@@ -218,7 +218,7 @@ public abstract class Login {
             return false;
         }
 
-        setActualStatus(cgeoapplication.getInstance().getString(R.string.init_login_popup_ok));
+        setActualStatus(CgeoApplication.getInstance().getString(R.string.init_login_popup_ok));
 
         // on every page except login page
         setActualLoginStatus(TextUtils.matches(page, GCConstants.PATTERN_LOGIN_NAME));
@@ -246,7 +246,7 @@ public abstract class Login {
             return true;
         }
 
-        setActualStatus(cgeoapplication.getInstance().getString(R.string.init_login_popup_failed));
+        setActualStatus(CgeoApplication.getInstance().getString(R.string.init_login_popup_failed));
         return false;
     }
 
diff --git a/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java b/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java
index 89327f1..8f38641 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java
@@ -1,10 +1,10 @@
 package cgeo.geocaching.connector.oc;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.LogCacheActivity;
 import cgeo.geocaching.SearchResult;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.connector.ILoggingManager;
 import cgeo.geocaching.connector.capability.ILogin;
 import cgeo.geocaching.connector.capability.ISearchByCenter;
@@ -29,9 +29,9 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
     private UserInfo userInfo = new UserInfo(StringUtils.EMPTY, 0, UserInfoStatus.NOT_RETRIEVED);
 
     public OCApiLiveConnector(String name, String host, String prefix, String licenseString, int cKResId, int cSResId, int isActivePrefKeyId, int tokenPublicPrefKeyId, int tokenSecretPrefKeyId, ApiSupport apiSupport) {
-        super(name, host, prefix, CryptUtils.rot13(cgeoapplication.getInstance().getResources().getString(cKResId)), licenseString, apiSupport);
+        super(name, host, prefix, CryptUtils.rot13(CgeoApplication.getInstance().getResources().getString(cKResId)), licenseString, apiSupport);
 
-        cS = CryptUtils.rot13(cgeoapplication.getInstance().getResources().getString(cSResId));
+        cS = CryptUtils.rot13(CgeoApplication.getInstance().getResources().getString(cSResId));
         this.isActivePrefKeyId = isActivePrefKeyId;
         this.tokenPublicPrefKeyId = tokenPublicPrefKeyId;
         this.tokenSecretPrefKeyId = tokenSecretPrefKeyId;
@@ -145,7 +145,7 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
 
     @Override
     public String getLoginStatusString() {
-        return cgeoapplication.getInstance().getString(userInfo.getStatus().resId);
+        return CgeoApplication.getInstance().getString(userInfo.getStatus().resId);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java b/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java
index 10d6a66..ec6bbf4 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.connector.oc;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.network.OAuthAuthorizationActivity;
 import cgeo.geocaching.settings.Settings;
 
@@ -17,8 +17,8 @@ public class OCAuthorizationActivity extends OAuthAuthorizationActivity {
                 "/okapi/services/oauth/authorize",
                 "/okapi/services/oauth/access_token",
                 false,
-                cgeoapplication.getInstance().getResources().getString(authParams.getCKResId()),
-                cgeoapplication.getInstance().getResources().getString(authParams.getCSResId()));
+                CgeoApplication.getInstance().getResources().getString(authParams.getCKResId()),
+                CgeoApplication.getInstance().getResources().getString(authParams.getCSResId()));
         this.authParams = authParams;
     }
 
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index 61fde59..0aebcdc 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -6,7 +6,7 @@ import cgeo.geocaching.Image;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.IConnector;
 import cgeo.geocaching.connector.LogResult;
@@ -297,7 +297,7 @@ final class OkapiClient {
             final StringBuilder description = new StringBuilder(500);
             if (!response.isNull("gc_code")) {
                 final String gccode = response.getString("gc_code");
-                description.append(cgeoapplication.getInstance().getResources()
+                description.append(CgeoApplication.getInstance().getResources()
                         .getString(R.string.cache_listed_on, GCConnector.getInstance().getName()))
                         .append(": <a href=\"http://coord.info/")
                         .append(gccode)
diff --git a/main/src/cgeo/geocaching/connector/trackable/GeokretyParser.java b/main/src/cgeo/geocaching/connector/trackable/GeokretyParser.java
index 66ca5f7..9f79896 100644
--- a/main/src/cgeo/geocaching/connector/trackable/GeokretyParser.java
+++ b/main/src/cgeo/geocaching/connector/trackable/GeokretyParser.java
@@ -1,8 +1,8 @@
 package cgeo.geocaching.connector.trackable;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Trackable;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.utils.Log;
 
 import org.xml.sax.Attributes;
@@ -63,15 +63,15 @@ public class GeokretyParser {
     protected static String getType(int type) {
         switch (type) {
             case 0:
-                return cgeoapplication.getInstance().getString(R.string.geokret_type_traditional);
+                return CgeoApplication.getInstance().getString(R.string.geokret_type_traditional);
             case 1:
-                return cgeoapplication.getInstance().getString(R.string.geokret_type_book_or_media);
+                return CgeoApplication.getInstance().getString(R.string.geokret_type_book_or_media);
             case 2:
-                return cgeoapplication.getInstance().getString(R.string.geokret_type_human);
+                return CgeoApplication.getInstance().getString(R.string.geokret_type_human);
             case 3:
-                return cgeoapplication.getInstance().getString(R.string.geokret_type_coin);
+                return CgeoApplication.getInstance().getString(R.string.geokret_type_coin);
             case 4:
-                return cgeoapplication.getInstance().getString(R.string.geokret_type_post);
+                return CgeoApplication.getInstance().getString(R.string.geokret_type_post);
         }
         return null;
     }
diff --git a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
index 243f63d..1ddfeaf 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.enumerations;
 
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -143,7 +143,7 @@ public enum CacheAttribute {
      * @return the localized text
      */
     public String getL10n(final boolean enabled) {
-        return cgeoapplication.getInstance().getResources().getString(
+        return CgeoApplication.getInstance().getResources().getString(
                 enabled ? stringIdYes : stringIdNo);
     }
 
diff --git a/main/src/cgeo/geocaching/enumerations/CacheSize.java b/main/src/cgeo/geocaching/enumerations/CacheSize.java
index 726ebe2..a6f8df3 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheSize.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheSize.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.enumerations;
 
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -60,7 +60,7 @@ public enum CacheSize {
     }
 
     public final String getL10n() {
-        return cgeoapplication.getInstance().getBaseContext().getResources().getString(stringId);
+        return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
     }
 }
 
diff --git a/main/src/cgeo/geocaching/enumerations/CacheType.java b/main/src/cgeo/geocaching/enumerations/CacheType.java
index 31ec392..c952ba0 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheType.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheType.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.enumerations;
 
 import cgeo.geocaching.ICache;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -85,7 +85,7 @@ public enum CacheType {
     }
 
     public final String getL10n() {
-        return cgeoapplication.getInstance().getBaseContext().getResources().getString(stringId);
+        return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
     }
 
     public boolean isEvent() {
diff --git a/main/src/cgeo/geocaching/enumerations/LiveMapStrategy.java b/main/src/cgeo/geocaching/enumerations/LiveMapStrategy.java
index 5f5b2c9..710c3ba 100644
--- a/main/src/cgeo/geocaching/enumerations/LiveMapStrategy.java
+++ b/main/src/cgeo/geocaching/enumerations/LiveMapStrategy.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.enumerations;
 
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import java.util.EnumSet;
 
@@ -42,7 +42,7 @@ public interface LiveMapStrategy {
         }
 
         public final String getL10n() {
-            return cgeoapplication.getInstance().getBaseContext().getResources().getString(stringId);
+            return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
         }
     }
 }
diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java
index 9902d3f..543f83d 100644
--- a/main/src/cgeo/geocaching/enumerations/LogType.java
+++ b/main/src/cgeo/geocaching/enumerations/LogType.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.enumerations;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -102,6 +102,6 @@ public enum LogType {
     }
 
     public final String getL10n() {
-        return cgeoapplication.getInstance().getBaseContext().getResources().getString(stringId);
+        return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
     }
 }
diff --git a/main/src/cgeo/geocaching/enumerations/WaypointType.java b/main/src/cgeo/geocaching/enumerations/WaypointType.java
index 79c8106..272b2f2 100644
--- a/main/src/cgeo/geocaching/enumerations/WaypointType.java
+++ b/main/src/cgeo/geocaching/enumerations/WaypointType.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.enumerations;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -65,7 +65,7 @@ public enum WaypointType {
     }
 
     public final String getL10n() {
-        return cgeoapplication.getInstance().getBaseContext().getResources().getString(stringId);
+        return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/export/AbstractExport.java b/main/src/cgeo/geocaching/export/AbstractExport.java
index e4ba5f0..5d15ecb 100644
--- a/main/src/cgeo/geocaching/export/AbstractExport.java
+++ b/main/src/cgeo/geocaching/export/AbstractExport.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.export;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 
 abstract class AbstractExport implements Export {
     private final String name;
@@ -23,7 +23,7 @@ abstract class AbstractExport implements Export {
      * @return localized string
      */
     protected static String getString(int resourceId) {
-        return cgeoapplication.getInstance().getString(resourceId);
+        return CgeoApplication.getInstance().getString(resourceId);
     }
 
     /**
@@ -36,7 +36,7 @@ abstract class AbstractExport implements Export {
      * @return localized string
      */
     protected static String getString(int resourceId, Object... params) {
-        return cgeoapplication.getInstance().getString(resourceId, params);
+        return CgeoApplication.getInstance().getString(resourceId, params);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index 36e43a0..a2e0f93 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.export;
 
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.utils.AsyncTaskWithProgress;
@@ -125,7 +125,7 @@ class GpxExport extends AbstractExport {
 
             final List<String> allGeocodes = new ArrayList<String>(Arrays.asList(geocodes));
 
-            setMessage(cgeoapplication.getInstance().getResources().getQuantityString(R.plurals.cache_counts, allGeocodes.size(), allGeocodes.size()));
+            setMessage(CgeoApplication.getInstance().getResources().getQuantityString(R.plurals.cache_counts, allGeocodes.size(), allGeocodes.size()));
 
             final File exportFile = getExportFile();
             BufferedWriter writer = null;
diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index 431a529..686bfb1 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -7,7 +7,7 @@ import cgeo.geocaching.R;
 import cgeo.geocaching.StoredList;
 import cgeo.geocaching.Trackable;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.CacheType;
@@ -205,7 +205,7 @@ public abstract class GPXParser extends FileParser {
             // get text for string
             String stringName;
             try {
-                stringName = cgeoapplication.getInstance().getResources().getResourceName(stringId);
+                stringName = CgeoApplication.getInstance().getResources().getResourceName(stringId);
             } catch (final NullPointerException e) {
                 return null;
             }
diff --git a/main/src/cgeo/geocaching/files/LocalStorage.java b/main/src/cgeo/geocaching/files/LocalStorage.java
index fc82409..05713cc 100644
--- a/main/src/cgeo/geocaching/files/LocalStorage.java
+++ b/main/src/cgeo/geocaching/files/LocalStorage.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.files;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.utils.CryptUtils;
 import cgeo.geocaching.utils.FileUtils;
 import cgeo.geocaching.utils.IOUtils;
@@ -86,7 +86,7 @@ public final class LocalStorage {
     private static File getInternalStorageBase() {
         if (internalStorageBase == null) {
             // A race condition will do no harm as the operation is idempotent. No need to synchronize.
-            internalStorageBase = cgeoapplication.getInstance().getApplicationContext().getFilesDir().getParentFile();
+            internalStorageBase = CgeoApplication.getInstance().getApplicationContext().getFilesDir().getParentFile();
         }
         return internalStorageBase;
     }
diff --git a/main/src/cgeo/geocaching/filter/AbstractRangeFilter.java b/main/src/cgeo/geocaching/filter/AbstractRangeFilter.java
index 96d256a..cafb92b 100644
--- a/main/src/cgeo/geocaching/filter/AbstractRangeFilter.java
+++ b/main/src/cgeo/geocaching/filter/AbstractRangeFilter.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.filter;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 
 abstract class AbstractRangeFilter extends AbstractFilter {
@@ -9,7 +9,7 @@ abstract class AbstractRangeFilter extends AbstractFilter {
     protected final float rangeMax;
 
     protected AbstractRangeFilter(final int ressourceId, final int range) {
-        super(cgeoapplication.getInstance().getResources().getString(ressourceId) + ' ' + (range == 5 ? '5' : range + " + " + String.format("%.1f", range + 0.5)));
+        super(CgeoApplication.getInstance().getResources().getString(ressourceId) + ' ' + (range == 5 ? '5' : range + " + " + String.format("%.1f", range + 0.5)));
         this.rangeMin = range;
         rangeMax = rangeMin + 1f;
     }
diff --git a/main/src/cgeo/geocaching/filter/AttributeFilter.java b/main/src/cgeo/geocaching/filter/AttributeFilter.java
index 0b4279f..6f0d5da 100644
--- a/main/src/cgeo/geocaching/filter/AttributeFilter.java
+++ b/main/src/cgeo/geocaching/filter/AttributeFilter.java
@@ -1,9 +1,9 @@
 package cgeo.geocaching.filter;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.LoadFlags.LoadFlag;
 
 import android.content.res.Resources;
@@ -40,8 +40,8 @@ class AttributeFilter extends AbstractFilter {
 
         @Override
         public List<IFilter> getFilters() {
-            final String packageName = cgeoapplication.getInstance().getBaseContext().getPackageName();
-            final Resources res = cgeoapplication.getInstance().getResources();
+            final String packageName = CgeoApplication.getInstance().getBaseContext().getPackageName();
+            final Resources res = CgeoApplication.getInstance().getResources();
 
             final List<IFilter> filters = new LinkedList<IFilter>();
             for (final String id: res.getStringArray(R.array.attribute_ids)) {
diff --git a/main/src/cgeo/geocaching/filter/DistanceFilter.java b/main/src/cgeo/geocaching/filter/DistanceFilter.java
index 4d00b65..54225d2 100644
--- a/main/src/cgeo/geocaching/filter/DistanceFilter.java
+++ b/main/src/cgeo/geocaching/filter/DistanceFilter.java
@@ -3,7 +3,7 @@ package cgeo.geocaching.filter;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.IGeoData;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.geopoint.Geopoint;
 
 import java.util.ArrayList;
@@ -18,7 +18,7 @@ class DistanceFilter extends AbstractFilter {
         super(name);
         this.minDistance = minDistance;
         this.maxDistance = maxDistance;
-        geo = cgeoapplication.getInstance().currentGeo();
+        geo = CgeoApplication.getInstance().currentGeo();
     }
 
     @Override
@@ -51,7 +51,7 @@ class DistanceFilter extends AbstractFilter {
                     maxRange = Integer.MAX_VALUE;
                 }
                 final String range = maxRange == Integer.MAX_VALUE ? "> " + minRange : minRange + " - " + maxRange;
-                final String name = cgeoapplication.getInstance().getResources().getQuantityString(R.plurals.tts_kilometers, maxRange, range);
+                final String name = CgeoApplication.getInstance().getResources().getQuantityString(R.plurals.tts_kilometers, maxRange, range);
                 filters.add(new DistanceFilter(name, minRange, maxRange));
             }
             return filters;
diff --git a/main/src/cgeo/geocaching/filter/FilterUserInterface.java b/main/src/cgeo/geocaching/filter/FilterUserInterface.java
index 2404f44..8ff700a 100644
--- a/main/src/cgeo/geocaching/filter/FilterUserInterface.java
+++ b/main/src/cgeo/geocaching/filter/FilterUserInterface.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.filter;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.utils.Log;
@@ -41,7 +41,7 @@ public final class FilterUserInterface {
 
     public FilterUserInterface(final Activity activity) {
         this.activity = activity;
-        this.res = cgeoapplication.getInstance().getResources();
+        this.res = CgeoApplication.getInstance().getResources();
 
         registry = new ArrayList<FactoryEntry>();
         if (Settings.getCacheType() == CacheType.ALL) {
diff --git a/main/src/cgeo/geocaching/filter/ModifiedFilter.java b/main/src/cgeo/geocaching/filter/ModifiedFilter.java
index 74befda..d976b69 100644
--- a/main/src/cgeo/geocaching/filter/ModifiedFilter.java
+++ b/main/src/cgeo/geocaching/filter/ModifiedFilter.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.filter;
 
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import java.util.Collections;
 import java.util.List;
@@ -10,7 +10,7 @@ import java.util.List;
 class ModifiedFilter extends AbstractFilter implements IFilterFactory {
 
     public ModifiedFilter() {
-        super(cgeoapplication.getInstance().getString(R.string.caches_filter_modified));
+        super(CgeoApplication.getInstance().getString(R.string.caches_filter_modified));
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/filter/StateFilter.java b/main/src/cgeo/geocaching/filter/StateFilter.java
index 98589ab..d5b3027 100644
--- a/main/src/cgeo/geocaching/filter/StateFilter.java
+++ b/main/src/cgeo/geocaching/filter/StateFilter.java
@@ -1,8 +1,8 @@
 package cgeo.geocaching.filter;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 
 import android.content.res.Resources;
 
@@ -13,7 +13,7 @@ import java.util.List;
 
 abstract class StateFilter extends AbstractFilter {
 
-    static final Resources res = cgeoapplication.getInstance().getResources();
+    static final Resources res = CgeoApplication.getInstance().getResources();
 
     protected StateFilter(final String name) {
         super(name);
diff --git a/main/src/cgeo/geocaching/filter/TrackablesFilter.java b/main/src/cgeo/geocaching/filter/TrackablesFilter.java
index 74f43be..d836a0f 100644
--- a/main/src/cgeo/geocaching/filter/TrackablesFilter.java
+++ b/main/src/cgeo/geocaching/filter/TrackablesFilter.java
@@ -1,15 +1,15 @@
 package cgeo.geocaching.filter;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 
 import java.util.Collections;
 import java.util.List;
 
 class TrackablesFilter extends AbstractFilter implements IFilterFactory {
     public TrackablesFilter() {
-        super(cgeoapplication.getInstance().getString(R.string.caches_filter_track));
+        super(CgeoApplication.getInstance().getString(R.string.caches_filter_track));
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index fcd0a17..78c1571 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.maps;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.DirectionProvider;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.IGeoData;
@@ -8,7 +9,6 @@ import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.StoredList;
 import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.DataStore;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.CacheListActivity;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.connector.ConnectorFactory;
@@ -128,7 +128,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
     private MapItemFactory mapItemFactory = null;
     private Activity activity = null;
     private MapViewImpl mapView = null;
-    private cgeoapplication app = null;
+    private CgeoApplication app = null;
     final private GeoDirHandler geoDirUpdate = new UpdateLoc();
     private SearchResult searchIntent = null;
     private String geocodeIntent = null;
@@ -359,7 +359,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
         // class init
         res = this.getResources();
         activity = this.getActivity();
-        app = (cgeoapplication) activity.getApplication();
+        app = (CgeoApplication) activity.getApplication();
 
         int countBubbleCnt = DataStore.getAllCachesCount();
         caches = new LeastRecentlyUsedSet<Geocache>(MAX_CACHES + countBubbleCnt);
diff --git a/main/src/cgeo/geocaching/maps/MapProviderFactory.java b/main/src/cgeo/geocaching/maps/MapProviderFactory.java
index a03fc47..2e43e19 100644
--- a/main/src/cgeo/geocaching/maps/MapProviderFactory.java
+++ b/main/src/cgeo/geocaching/maps/MapProviderFactory.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.maps;
 
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.maps.google.GoogleMapProvider;
 import cgeo.geocaching.maps.interfaces.MapProvider;
 import cgeo.geocaching.maps.interfaces.MapSource;
@@ -31,7 +31,7 @@ public class MapProviderFactory {
 
     public static boolean isGoogleMapsInstalled() {
         // Check if API key is available
-        if (StringUtils.isBlank(cgeoapplication.getInstance().getString(R.string.maps_api_key))) {
+        if (StringUtils.isBlank(CgeoApplication.getInstance().getString(R.string.maps_api_key))) {
             Log.w("No Google API key available.");
             return false;
         }
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapProvider.java b/main/src/cgeo/geocaching/maps/google/GoogleMapProvider.java
index 1fa38ad..cb95b2c 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapProvider.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapProvider.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.maps.google;
 
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.maps.AbstractMapProvider;
 import cgeo.geocaching.maps.AbstractMapSource;
 import cgeo.geocaching.maps.interfaces.MapItemFactory;
@@ -20,7 +20,7 @@ public final class GoogleMapProvider extends AbstractMapProvider {
     private final MapItemFactory mapItemFactory;
 
     private GoogleMapProvider() {
-        final Resources resources = cgeoapplication.getInstance().getResources();
+        final Resources resources = CgeoApplication.getInstance().getResources();
 
         registerMapSource(new GoogleMapSource(this, resources.getString(R.string.map_source_google_map)));
         registerMapSource(new GoogleSatelliteSource(this, resources.getString(R.string.map_source_google_satellite)));
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
index d099b79..50dc51d 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.maps.mapsforge;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.maps.AbstractMapProvider;
 import cgeo.geocaching.maps.MapProviderFactory;
 import cgeo.geocaching.maps.interfaces.MapItemFactory;
@@ -33,7 +33,7 @@ public final class MapsforgeMapProvider extends AbstractMapProvider {
     private MapItemFactory mapItemFactory = new MapsforgeMapItemFactory();
 
     private MapsforgeMapProvider() {
-        final Resources resources = cgeoapplication.getInstance().getResources();
+        final Resources resources = CgeoApplication.getInstance().getResources();
 
         registerMapSource(new MapsforgeMapSource(MAPSFORGE_MAPNIK_ID, this, resources.getString(R.string.map_source_osm_mapnik), MapGeneratorInternal.MAPNIK));
         registerMapSource(new MapsforgeMapSource(MAPSFORGE_CYCLEMAP_ID, this, resources.getString(R.string.map_source_osm_cyclemap), MapGeneratorInternal.OPENCYCLEMAP));
@@ -163,7 +163,7 @@ public final class MapsforgeMapProvider extends AbstractMapProvider {
 
     public void updateOfflineMaps() {
         MapProviderFactory.deleteOfflineMapSources();
-        final Resources resources = cgeoapplication.getInstance().getResources();
+        final Resources resources = CgeoApplication.getInstance().getResources();
         final List<String> offlineMaps = getOfflineMaps();
         for (String mapFile : offlineMaps) {
             final String mapName = StringUtils.capitalize(StringUtils.substringBeforeLast(new File(mapFile).getName(), "."));
diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java
index 797e67d..f7fbb30 100644
--- a/main/src/cgeo/geocaching/network/HtmlImage.java
+++ b/main/src/cgeo/geocaching/network/HtmlImage.java
@@ -1,8 +1,8 @@
 package cgeo.geocaching.network;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
 import cgeo.geocaching.StoredList;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.compatibility.Compatibility;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.files.LocalStorage;
@@ -74,7 +74,7 @@ public class HtmlImage implements Html.ImageGetter {
         Point displaySize = Compatibility.getDisplaySize();
         this.maxWidth = displaySize.x - 25;
         this.maxHeight = displaySize.y - 25;
-        this.resources = cgeoapplication.getInstance().getResources();
+        this.resources = CgeoApplication.getInstance().getResources();
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/network/StatusUpdater.java b/main/src/cgeo/geocaching/network/StatusUpdater.java
index ee9bc31..cb4c7f4 100644
--- a/main/src/cgeo/geocaching/network/StatusUpdater.java
+++ b/main/src/cgeo/geocaching/network/StatusUpdater.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.network;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.utils.MemorySubject;
 import cgeo.geocaching.utils.PeriodicHandler;
 import cgeo.geocaching.utils.PeriodicHandler.PeriodicHandlerListener;
@@ -42,8 +42,8 @@ public class StatusUpdater extends MemorySubject<StatusUpdater.Status> implement
     public void onPeriodic() {
         final JSONObject response =
                 Network.requestJSON("http://status.cgeo.org/api/status.json",
-                        new Parameters("version_code", String.valueOf(Version.getVersionCode(cgeoapplication.getInstance())),
-                                "version_name", Version.getVersionName(cgeoapplication.getInstance()),
+                        new Parameters("version_code", String.valueOf(Version.getVersionCode(CgeoApplication.getInstance())),
+                                "version_name", Version.getVersionName(CgeoApplication.getInstance()),
                                 "locale", Locale.getDefault().toString()));
         if (response != null) {
             notifyObservers(new Status(get(response, "message"), get(response, "message_id"), get(response, "icon"), get(response, "url")));
diff --git a/main/src/cgeo/geocaching/settings/AuthorizeOcPreference.java b/main/src/cgeo/geocaching/settings/AuthorizeOcPreference.java
index f5d6a57..15b5976 100644
--- a/main/src/cgeo/geocaching/settings/AuthorizeOcPreference.java
+++ b/main/src/cgeo/geocaching/settings/AuthorizeOcPreference.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.settings;
 
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.connector.oc.OCDEAuthorizationActivity;
 import cgeo.geocaching.connector.oc.OCPLAuthorizationActivity;
 
@@ -35,7 +35,7 @@ public class AuthorizeOcPreference extends Preference {
     private OCAuthorizations getAuthorization() {
         final String prefKey = getKey();
         for (OCAuthorizations auth : OCAuthorizations.values()) {
-            if (auth.prefKeyId != NO_KEY && prefKey.equals(cgeoapplication.getInstance().getString(auth.prefKeyId))) {
+            if (auth.prefKeyId != NO_KEY && prefKey.equals(CgeoApplication.getInstance().getString(auth.prefKeyId))) {
                 return auth;
             }
         }
diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index 34f5dc1..51f0729 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -1,8 +1,8 @@
 package cgeo.geocaching.settings;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
 import cgeo.geocaching.StoredList;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory.NavigationAppsEnum;
 import cgeo.geocaching.connector.gc.GCConstants;
 import cgeo.geocaching.connector.gc.Login;
@@ -69,7 +69,7 @@ public final class Settings {
     }
 
     private static final SharedPreferences sharedPrefs = PreferenceManager
-            .getDefaultSharedPreferences(cgeoapplication.getInstance().getBaseContext());
+            .getDefaultSharedPreferences(CgeoApplication.getInstance().getBaseContext());
     static {
         migrateSettings();
         Log.setDebug(sharedPrefs.getBoolean(getKey(R.string.pref_debug), false));
@@ -90,7 +90,7 @@ public final class Settings {
         int oldVersion = getInt(R.string.pref_settingsversion, 0);
         if (oldVersion < 1) {
             final String oldPreferencesName = "cgeo.pref";
-            final SharedPreferences old = cgeoapplication.getInstance().getSharedPreferences(oldPreferencesName, Context.MODE_PRIVATE);
+            final SharedPreferences old = CgeoApplication.getInstance().getSharedPreferences(oldPreferencesName, Context.MODE_PRIVATE);
             final Editor e = sharedPrefs.edit();
 
             e.putString(getKey(R.string.pref_temp_twitter_token_secret), old.getString(getKey(R.string.pref_temp_twitter_token_secret), null));
@@ -191,7 +191,7 @@ public final class Settings {
     }
 
     private static String getKey(final int prefKeyId) {
-        return cgeoapplication.getInstance().getString(prefKeyId);
+        return CgeoApplication.getInstance().getString(prefKeyId);
     }
 
     static String getString(final int prefKeyId, final String defaultValue) {
@@ -257,7 +257,7 @@ public final class Settings {
     public static void setLanguage(boolean useEnglish) {
         final Configuration config = new Configuration();
         config.locale = useEnglish ? Locale.ENGLISH : Locale.getDefault();
-        final Resources resources = cgeoapplication.getInstance().getResources();
+        final Resources resources = CgeoApplication.getInstance().getResources();
         resources.updateConfiguration(config, resources.getDisplayMetrics());
     }
 
diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index 90b6145..e2b9b9b 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -1,9 +1,9 @@
 package cgeo.geocaching.settings;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Intents;
 import cgeo.geocaching.R;
 import cgeo.geocaching.SelectMapfileActivity;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory.NavigationAppsEnum;
@@ -171,7 +171,7 @@ public class SettingsActivity extends PreferenceActivity {
     }
 
     private static String getKey(final int prefKeyId) {
-        return cgeoapplication.getInstance().getString(prefKeyId);
+        return CgeoApplication.getInstance().getString(prefKeyId);
     }
 
     private Preference getPreference(final int keyId) {
@@ -354,7 +354,7 @@ public class SettingsActivity extends PreferenceActivity {
             @Override
             public boolean onPreferenceClick(final Preference preference) {
                 boolean oldValue = Settings.isDbOnSDCard();
-                ((cgeoapplication) SettingsActivity.this.getApplication())
+                ((CgeoApplication) SettingsActivity.this.getApplication())
                         .moveDatabase(SettingsActivity.this);
                 return oldValue != Settings.isDbOnSDCard();
             }
@@ -523,7 +523,7 @@ public class SettingsActivity extends PreferenceActivity {
                 preference.setSummary(mapSource.getName());
             } else if (isPreference(preference, R.string.pref_connectorOCActive) || isPreference(preference, R.string.pref_connectorOCPLActive) || isPreference(preference, R.string.pref_connectorGCActive)) {
                 // // reset log-in status if connector activation was changed
-                cgeoapplication.getInstance().checkLogin = true;
+                CgeoApplication.getInstance().checkLogin = true;
             } else if (preference instanceof ListPreference) {
                 // For list preferences, look up the correct display value in
                 // the preference's 'entries' list.
@@ -554,7 +554,7 @@ public class SettingsActivity extends PreferenceActivity {
                 if (Login.isActualLoginStatus()) {
                     Login.logout();
                 }
-                cgeoapplication.getInstance().checkLogin = true;
+                CgeoApplication.getInstance().checkLogin = true;
             }
             return true;
         }
diff --git a/main/src/cgeo/geocaching/sorting/DateComparator.java b/main/src/cgeo/geocaching/sorting/DateComparator.java
index 3464103..091f6a4 100644
--- a/main/src/cgeo/geocaching/sorting/DateComparator.java
+++ b/main/src/cgeo/geocaching/sorting/DateComparator.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.sorting;
 
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -27,7 +27,7 @@ public class DateComparator extends AbstractCacheComparator {
                 final ArrayList<Geocache> list = new ArrayList<Geocache>();
                 list.add(cache1);
                 list.add(cache2);
-                final DistanceComparator distanceComparator = new DistanceComparator(cgeoapplication.getInstance().currentGeo().getCoords(), list);
+                final DistanceComparator distanceComparator = new DistanceComparator(CgeoApplication.getInstance().currentGeo().getCoords(), list);
                 return distanceComparator.compare(cache1, cache2);
             }
             return dateDifference;
diff --git a/main/src/cgeo/geocaching/speech/SpeechService.java b/main/src/cgeo/geocaching/speech/SpeechService.java
index 1907bfc..baa843b 100644
--- a/main/src/cgeo/geocaching/speech/SpeechService.java
+++ b/main/src/cgeo/geocaching/speech/SpeechService.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.speech;
 
 import cgeo.geocaching.DirectionProvider;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.settings.Settings;
@@ -48,7 +48,7 @@ public class SpeechService extends Service implements OnInitListener {
     GeoDirHandler geoHandler = new GeoDirHandler() {
         @Override
         protected void updateDirection(float newDirection) {
-            if (cgeoapplication.getInstance().currentGeo().getSpeed() <= 5) {
+            if (CgeoApplication.getInstance().currentGeo().getSpeed() <= 5) {
                 direction = DirectionProvider.getDirectionNow(startingActivity, newDirection);
                 directionInitialized = true;
                 updateCompass();
diff --git a/main/src/cgeo/geocaching/speech/TextFactory.java b/main/src/cgeo/geocaching/speech/TextFactory.java
index 81a74fb..72475f7 100644
--- a/main/src/cgeo/geocaching/speech/TextFactory.java
+++ b/main/src/cgeo/geocaching/speech/TextFactory.java
@@ -1,8 +1,8 @@
 package cgeo.geocaching.speech;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
 import cgeo.geocaching.settings.Settings;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.IConversion;
 import cgeo.geocaching.utils.AngleUtils;
@@ -78,11 +78,11 @@ public class TextFactory {
     }
 
     private static String getString(int resourceId, Object... formatArgs) {
-        return cgeoapplication.getInstance().getString(resourceId, formatArgs);
+        return CgeoApplication.getInstance().getString(resourceId, formatArgs);
     }
 
     private static String getQuantityString(int resourceId, int quantity, Object... formatArgs) {
-        return cgeoapplication.getInstance().getResources().getQuantityString(resourceId, quantity, formatArgs);
+        return CgeoApplication.getInstance().getResources().getQuantityString(resourceId, quantity, formatArgs);
     }
 
     private static String getDirection(Geopoint position, Geopoint target, float direction) {
diff --git a/main/src/cgeo/geocaching/twitter/Twitter.java b/main/src/cgeo/geocaching/twitter/Twitter.java
index b339e28..c3f99fa 100644
--- a/main/src/cgeo/geocaching/twitter/Twitter.java
+++ b/main/src/cgeo/geocaching/twitter/Twitter.java
@@ -1,9 +1,9 @@
 package cgeo.geocaching.twitter;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.Trackable;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.GeopointFormatter.Format;
@@ -23,15 +23,15 @@ public final class Twitter {
 
     public static void postTweetCache(String geocode) {
         final Geocache cache = DataStore.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
-        postTweet(cgeoapplication.getInstance(), getStatusMessage(cache), null);
+        postTweet(CgeoApplication.getInstance(), getStatusMessage(cache), null);
     }
 
     public static void postTweetTrackable(String geocode) {
         final Trackable trackable = DataStore.loadTrackable(geocode);
-        postTweet(cgeoapplication.getInstance(), getStatusMessage(trackable), null);
+        postTweet(CgeoApplication.getInstance(), getStatusMessage(trackable), null);
     }
 
-    private static void postTweet(final cgeoapplication app, final String status, final Geopoint coords) {
+    private static void postTweet(final CgeoApplication app, final String status, final Geopoint coords) {
         if (app == null || !Settings.isUseTwitter() || !Settings.isTwitterLoginValid()) {
             return;
         }
diff --git a/main/src/cgeo/geocaching/ui/AbstractUIFactory.java b/main/src/cgeo/geocaching/ui/AbstractUIFactory.java
index 2351383..0d447f2 100644
--- a/main/src/cgeo/geocaching/ui/AbstractUIFactory.java
+++ b/main/src/cgeo/geocaching/ui/AbstractUIFactory.java
@@ -1,9 +1,9 @@
 package cgeo.geocaching.ui;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import android.content.res.Resources;
 
 public class AbstractUIFactory {
-    protected final static Resources res = cgeoapplication.getInstance().getResources();
+    protected final static Resources res = CgeoApplication.getInstance().getResources();
 }
diff --git a/main/src/cgeo/geocaching/ui/AddressListAdapter.java b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
index c70d123..0d5fba7 100644
--- a/main/src/cgeo/geocaching/ui/AddressListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
@@ -3,8 +3,8 @@ package cgeo.geocaching.ui;
 import butterknife.InjectView;
 
 import cgeo.geocaching.CacheListActivity;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Units;
 
@@ -38,7 +38,7 @@ public class AddressListAdapter extends ArrayAdapter<Address> {
     public AddressListAdapter(final Context context) {
         super(context, 0);
         inflater = ((Activity) context).getLayoutInflater();
-        location = cgeoapplication.getInstance().currentGeo().getCoords();
+        location = CgeoApplication.getInstance().currentGeo().getCoords();
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
index 9059a6b..5f0d90a 100644
--- a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
+++ b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
@@ -1,9 +1,9 @@
 package cgeo.geocaching.ui;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Units;
 
@@ -134,7 +134,7 @@ public final class CacheDetailsCreator {
     public void addDistance(final Geocache cache, final TextView cacheDistanceView) {
         Float distance = null;
         if (cache.getCoords() != null) {
-            final Geopoint currentCoords = cgeoapplication.getInstance().currentGeo().getCoords();
+            final Geopoint currentCoords = CgeoApplication.getInstance().currentGeo().getCoords();
             if (currentCoords != null) {
                 distance = currentCoords.distanceTo(cache);
             }
@@ -159,7 +159,7 @@ public final class CacheDetailsCreator {
     public void addDistance(final Waypoint wpt, final TextView waypointDistanceView) {
         Float distance = null;
         if (wpt.getCoords() != null) {
-            final Geopoint currentCoords = cgeoapplication.getInstance().currentGeo().getCoords();
+            final Geopoint currentCoords = CgeoApplication.getInstance().currentGeo().getCoords();
             if (currentCoords != null) {
                 distance = currentCoords.distanceTo(wpt);
             }
diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
index c6aeaa6..9f41e59 100644
--- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
@@ -6,7 +6,7 @@ import cgeo.geocaching.CacheDetailActivity;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.IGeoData;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.enumerations.CacheListType;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.filter.IFilter;
@@ -112,7 +112,7 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> {
 
     public CacheListAdapter(final Activity activity, final List<Geocache> list, CacheListType cacheListType) {
         super(activity, 0, list);
-        final IGeoData currentGeo = cgeoapplication.getInstance().currentGeo();
+        final IGeoData currentGeo = CgeoApplication.getInstance().currentGeo();
         if (currentGeo != null) {
             coords = currentGeo.getCoords();
         }
diff --git a/main/src/cgeo/geocaching/ui/Formatter.java b/main/src/cgeo/geocaching/ui/Formatter.java
index ecae9ea..963807f 100644
--- a/main/src/cgeo/geocaching/ui/Formatter.java
+++ b/main/src/cgeo/geocaching/ui/Formatter.java
@@ -3,7 +3,7 @@ package cgeo.geocaching.ui;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.enumerations.CacheListType;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.WaypointType;
@@ -22,7 +22,7 @@ public abstract class Formatter {
     /** Text separator used for formatting texts */
     public static final String SEPARATOR = " · ";
 
-    private static final Context context = cgeoapplication.getInstance().getBaseContext();
+    private static final Context context = CgeoApplication.getInstance().getBaseContext();
 
     /**
      * Generate a time string according to system-wide settings (locale, 12/24 hour)
@@ -87,9 +87,9 @@ public abstract class Formatter {
         int diff = cgeo.geocaching.utils.DateUtils.daysSince(date);
         switch (diff) {
             case 0:
-                return cgeoapplication.getInstance().getString(R.string.log_today);
+                return CgeoApplication.getInstance().getString(R.string.log_today);
             case 1:
-                return cgeoapplication.getInstance().getString(R.string.log_yesterday);
+                return CgeoApplication.getInstance().getString(R.string.log_yesterday);
             default:
                 return formatShortDate(date);
         }
@@ -116,10 +116,10 @@ public abstract class Formatter {
         addShortInfos(cache, infos);
 
         if (cache.isPremiumMembersOnly()) {
-            infos.add(cgeoapplication.getInstance().getString(R.string.cache_premium));
+            infos.add(CgeoApplication.getInstance().getString(R.string.cache_premium));
         }
         if (cacheListType != CacheListType.OFFLINE && cacheListType != CacheListType.HISTORY && cache.getListId() > 0) {
-            infos.add(cgeoapplication.getInstance().getString(R.string.cache_offline));
+            infos.add(CgeoApplication.getInstance().getString(R.string.cache_offline));
         }
         return StringUtils.join(infos, Formatter.SEPARATOR);
     }
@@ -161,7 +161,7 @@ public abstract class Formatter {
             infos.add(waypointType.getL10n());
         }
         if (Waypoint.PREFIX_OWN.equalsIgnoreCase(waypoint.getPrefix())) {
-            infos.add(cgeoapplication.getInstance().getString(R.string.waypoint_custom));
+            infos.add(CgeoApplication.getInstance().getString(R.string.waypoint_custom));
         } else {
             if (StringUtils.isNotBlank(waypoint.getPrefix())) {
                 infos.add(waypoint.getPrefix());
diff --git a/main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java b/main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java
index 2c4f38d..6ad59ec 100644
--- a/main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java
+++ b/main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.ui.dialog;
 
 import cgeo.geocaching.R;
 import cgeo.geocaching.settings.Settings;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -33,7 +33,7 @@ public class LiveMapInfoDialogBuilder {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 dialog.dismiss();
-                cgeoapplication.getInstance().setLiveMapHintShown();
+                CgeoApplication.getInstance().setLiveMapHintShown();
                 if (checkBoxHide.getVisibility() == View.VISIBLE && checkBoxHide.isChecked()) {
                     Settings.setHideLiveHint(true);
                 }
diff --git a/main/src/cgeo/geocaching/ui/logs/CacheLogsViewCreator.java b/main/src/cgeo/geocaching/ui/logs/CacheLogsViewCreator.java
index 8da711e..8fe3866 100644
--- a/main/src/cgeo/geocaching/ui/logs/CacheLogsViewCreator.java
+++ b/main/src/cgeo/geocaching/ui/logs/CacheLogsViewCreator.java
@@ -4,7 +4,7 @@ import cgeo.geocaching.CacheDetailActivity;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.ui.UserActionsClickListener;
 
@@ -23,7 +23,7 @@ import java.util.Map.Entry;
 
 public class CacheLogsViewCreator extends LogsViewCreator {
     private final boolean allLogs;
-    private final Resources res = cgeoapplication.getInstance().getResources();
+    private final Resources res = CgeoApplication.getInstance().getResources();
 
     public CacheLogsViewCreator(CacheDetailActivity cacheDetailActivity, boolean allLogs) {
         super(cacheDetailActivity);
diff --git a/main/src/cgeo/geocaching/utils/ApplicationSettings.java b/main/src/cgeo/geocaching/utils/ApplicationSettings.java
index 99d3142..78fa4f6 100644
--- a/main/src/cgeo/geocaching/utils/ApplicationSettings.java
+++ b/main/src/cgeo/geocaching/utils/ApplicationSettings.java
@@ -17,7 +17,7 @@ public class ApplicationSettings {
      */
     public static String getPreferencesName() {
         // There is currently no Android API to get the file name of the shared preferences. Let's hardcode
-        // it without needing a cgeoapplication instance.
+        // it without needing a CgeoApplication instance.
         return "cgeo.geocaching_preferences";
     }
 
diff --git a/main/src/cgeo/geocaching/utils/CancellableHandler.java b/main/src/cgeo/geocaching/utils/CancellableHandler.java
index 8cf8f28..cb4b9db 100644
--- a/main/src/cgeo/geocaching/utils/CancellableHandler.java
+++ b/main/src/cgeo/geocaching/utils/CancellableHandler.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.utils;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import android.os.Handler;
 import android.os.Message;
@@ -114,7 +114,7 @@ public abstract class CancellableHandler extends Handler {
 
     public static void sendLoadProgressDetail(final Handler handler, final int resourceId) {
         if (null != handler) {
-            handler.obtainMessage(UPDATE_LOAD_PROGRESS_DETAIL, cgeoapplication.getInstance().getString(resourceId)).sendToTarget();
+            handler.obtainMessage(UPDATE_LOAD_PROGRESS_DETAIL, CgeoApplication.getInstance().getString(resourceId)).sendToTarget();
         }
     }
 }
diff --git a/main/src/cgeo/geocaching/utils/ClipboardUtils.java b/main/src/cgeo/geocaching/utils/ClipboardUtils.java
index 67069b2..77250f3 100644
--- a/main/src/cgeo/geocaching/utils/ClipboardUtils.java
+++ b/main/src/cgeo/geocaching/utils/ClipboardUtils.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.utils;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import android.content.Context;
 
@@ -24,7 +24,7 @@ public final class ClipboardUtils {
      */
     public static void copyToClipboard(final CharSequence text) {
         // fully qualified name used here to avoid buggy deprecation warning (of javac) on the import statement
-        final android.text.ClipboardManager clipboard = (android.text.ClipboardManager) cgeoapplication.getInstance().getSystemService(Context.CLIPBOARD_SERVICE);
+        final android.text.ClipboardManager clipboard = (android.text.ClipboardManager) CgeoApplication.getInstance().getSystemService(Context.CLIPBOARD_SERVICE);
         clipboard.setText(text);
     }
 
diff --git a/main/src/cgeo/geocaching/utils/GeoDirHandler.java b/main/src/cgeo/geocaching/utils/GeoDirHandler.java
index a143730..c85648b 100644
--- a/main/src/cgeo/geocaching/utils/GeoDirHandler.java
+++ b/main/src/cgeo/geocaching/utils/GeoDirHandler.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.utils;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.IGeoData;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.settings.Settings;
 
 import android.os.Handler;
@@ -29,7 +29,7 @@ public abstract class GeoDirHandler extends Handler implements IObserver<Object>
     private static final int STOP_GEO = 1 << 4;
     private static final int STOP_DIR = 1 << 5;
 
-    private static final cgeoapplication app = cgeoapplication.getInstance();
+    private static final CgeoApplication app = CgeoApplication.getInstance();
 
     @Override
     final public void handleMessage(final Message message) {
diff --git a/main/src/cgeo/geocaching/utils/ImageUtils.java b/main/src/cgeo/geocaching/utils/ImageUtils.java
index 34bfa1c..1bbe70c 100644
--- a/main/src/cgeo/geocaching/utils/ImageUtils.java
+++ b/main/src/cgeo/geocaching/utils/ImageUtils.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.utils;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.compatibility.Compatibility;
 
 import android.graphics.Bitmap;
@@ -46,7 +46,7 @@ public final class ImageUtils {
      * @return BitmapDrawable The scaled image
      */
     public static BitmapDrawable scaleBitmapTo(final Bitmap image, final int maxWidth, final int maxHeight) {
-        final cgeoapplication app = cgeoapplication.getInstance();
+        final CgeoApplication app = CgeoApplication.getInstance();
         Bitmap result = image;
         int width = image.getWidth();
         int height = image.getHeight();
diff --git a/main/src/cgeo/geocaching/utils/ProcessUtils.java b/main/src/cgeo/geocaching/utils/ProcessUtils.java
index 3345ff1..f19cdb5 100644
--- a/main/src/cgeo/geocaching/utils/ProcessUtils.java
+++ b/main/src/cgeo/geocaching/utils/ProcessUtils.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.utils;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 
 import org.apache.commons.collections.CollectionUtils;
 
@@ -43,7 +43,7 @@ public final class ProcessUtils {
      * This will find installed applications even without launch intent (e.g. the streetview plugin).
      */
     private static boolean hasPackageInstalled(final String packageName) {
-        final List<PackageInfo> packs = cgeoapplication.getInstance().getPackageManager().getInstalledPackages(0);
+        final List<PackageInfo> packs = CgeoApplication.getInstance().getPackageManager().getInstalledPackages(0);
         for (final PackageInfo packageInfo : packs) {
             if (packageName.equals(packageInfo.packageName)) {
                 return true;
@@ -59,7 +59,7 @@ public final class ProcessUtils {
         if (packageName == null) {
             return null;
         }
-        final PackageManager packageManager = cgeoapplication.getInstance().getPackageManager();
+        final PackageManager packageManager = CgeoApplication.getInstance().getPackageManager();
         try {
             // This can throw an exception where the exception type is only defined on API Level > 3
             // therefore surround with try-catch
@@ -70,7 +70,7 @@ public final class ProcessUtils {
     }
 
     public static boolean isIntentAvailable(final String intent) {
-        final PackageManager packageManager = cgeoapplication.getInstance().getPackageManager();
+        final PackageManager packageManager = CgeoApplication.getInstance().getPackageManager();
         final List<ResolveInfo> list = packageManager.queryIntentActivities(
                 new Intent(intent), PackageManager.MATCH_DEFAULT_ONLY);