diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 2bf62c2e0..10e0c3dc8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -33,7 +33,6 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
 import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets;
-import org.sufficientlysecure.keychain.remote.ui.AppSettingsAllowedKeys;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.ParcelableFileCache.IteratorWithSize;
 import org.sufficientlysecure.keychain.util.Preferences;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
index b73055670..8f822a338 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
@@ -38,9 +38,9 @@ import org.sufficientlysecure.keychain.util.Log;
 public class AppSettingsActivity extends BaseActivity {
     private Uri mAppUri;
 
-    private AppSettingsFragment mSettingsFragment;
+    private AppSettingsHeaderFragment mSettingsFragment;
     private AccountsListFragment mAccountsListFragment;
-    private AppSettingsAllowedKeys mAllowedKeysFragment;
+    private AppSettingsAllowedKeysListFragment mAllowedKeysFragment;
 
     // model
     AppSettings mAppSettings;
@@ -63,7 +63,7 @@ public class AppSettingsActivity extends BaseActivity {
                     }
                 });
 
-        mSettingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById(
+        mSettingsFragment = (AppSettingsHeaderFragment) getSupportFragmentManager().findFragmentById(
                 R.id.api_app_settings_fragment);
 
         Intent intent = getIntent();
@@ -155,7 +155,7 @@ public class AppSettingsActivity extends BaseActivity {
 
         // Create an instance of the fragment
         mAccountsListFragment = AccountsListFragment.newInstance(accountsUri);
-        mAllowedKeysFragment = AppSettingsAllowedKeys.newInstance(allowedKeysUri);
+        mAllowedKeysFragment = AppSettingsAllowedKeysListFragment.newInstance(allowedKeysUri);
 
         // Add the fragment to the 'fragment_container' FrameLayout
         // NOTE: We use commitAllowingStateLoss() to prevent weird crashes!
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeys.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeysListFragment.java
similarity index 97%
rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeys.java
rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeysListFragment.java
index 3e4394264..13b242a5e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeys.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeysListFragment.java
@@ -47,7 +47,7 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.Vector;
 
-public class AppSettingsAllowedKeys extends ListFragmentWorkaround implements LoaderManager.LoaderCallbacks<Cursor> {
+public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround implements LoaderManager.LoaderCallbacks<Cursor> {
     private static final String ARG_DATA_URI = "uri";
 
     private SelectKeyCursorAdapter mAdapter;
@@ -59,8 +59,8 @@ public class AppSettingsAllowedKeys extends ListFragmentWorkaround implements Lo
     /**
      * Creates new instance of this fragment
      */
-    public static AppSettingsAllowedKeys newInstance(Uri dataUri) {
-        AppSettingsAllowedKeys frag = new AppSettingsAllowedKeys();
+    public static AppSettingsAllowedKeysListFragment newInstance(Uri dataUri) {
+        AppSettingsAllowedKeysListFragment frag = new AppSettingsAllowedKeysListFragment();
         Bundle args = new Bundle();
 
         args.putParcelable(ARG_DATA_URI, dataUri);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsHeaderFragment.java
similarity index 98%
rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java
rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsHeaderFragment.java
index a6db02708..7beac8973 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsHeaderFragment.java
@@ -38,7 +38,7 @@ import org.sufficientlysecure.keychain.util.Log;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-public class AppSettingsFragment extends Fragment {
+public class AppSettingsHeaderFragment extends Fragment {
 
     // model
     private AppSettings mAppSettings;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
index cbc593b0a..2c5c78161 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
@@ -75,7 +75,7 @@ public class RemoteServiceActivity extends BaseActivity {
     public static final String EXTRA_ERROR_MESSAGE = "error_message";
 
     // register view
-    private AppSettingsFragment mAppSettingsFragment;
+    private AppSettingsHeaderFragment mAppSettingsHeaderFragment;
     // create acc view
     private AccountSettingsFragment mAccSettingsFragment;
     // select pub keys view
@@ -115,11 +115,11 @@ public class RemoteServiceActivity extends BaseActivity {
                 setContentView(R.layout.api_remote_register_app);
                 initToolbar();
 
-                mAppSettingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById(
+                mAppSettingsHeaderFragment = (AppSettingsHeaderFragment) getSupportFragmentManager().findFragmentById(
                         R.id.api_app_settings_fragment);
 
                 AppSettings settings = new AppSettings(packageName, packageSignature);
-                mAppSettingsFragment.setAppSettings(settings);
+                mAppSettingsHeaderFragment.setAppSettings(settings);
 
                 // Inflate a "Done"/"Cancel" custom action bar view
                 setFullScreenDialogTwoButtons(
@@ -129,7 +129,7 @@ public class RemoteServiceActivity extends BaseActivity {
                             public void onClick(View v) {
                                 // Allow
 
-                                mProviderHelper.insertApiApp(mAppSettingsFragment.getAppSettings());
+                                mProviderHelper.insertApiApp(mAppSettingsHeaderFragment.getAppSettings());
 
                                 // give data through for new service call
                                 Intent resultData = extras.getParcelable(EXTRA_DATA);
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index 63fc060f4..3da0d4e7d 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -28,7 +28,7 @@
 
                 <fragment
                     android:id="@+id/api_app_settings_fragment"
-                    android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
+                    android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsHeaderFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:layout="@layout/api_app_settings_fragment" />
diff --git a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
index 19981f59e..300fde420 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
@@ -30,7 +30,7 @@
 
             <fragment
                 android:id="@+id/api_app_settings_fragment"
-                android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
+                android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsHeaderFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:layout="@layout/api_app_settings_fragment" />