2 files changed, 7 insertions, 8 deletions
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 47c747f..d2bc0b4 100644
--- a/main/src/cgeo/geocaching/activity/AbstractListActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractListActivity.java
@@ -1,7 +1,6 @@
 package cgeo.geocaching.activity;
 
-import cgeo.geocaching.cgeoapplication;
-import cgeo.geocaching.compatibility.Compatibility;
+import cgeo.geocaching.CgeoApplication;
 
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
@@ -14,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() {
@@ -66,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);
     }
@@ -77,7 +76,7 @@ public abstract class AbstractListActivity extends FragmentListActivity implemen
 
     @Override
     public void invalidateOptionsMenuCompatible() {
-        Compatibility.invalidateOptionsMenu(this);
+        ActivityMixin.invalidateOptionsMenu(this);
     }
 
     public void onCreate(Bundle savedInstanceState, int resourceLayoutID) {