diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
index db5b60d17..554379620 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
@@ -110,7 +110,7 @@ abstract public class Installer {
         boolean isSystemInstallerEnabled = Preferences.get().isPrivilegedInstallerEnabled();
         if (isSystemInstallerEnabled) {
             if (PrivilegedInstaller.isExtensionInstalledCorrectly(activity)
-                    == PrivilegedInstaller.EXTENSION_INSTALLED_YES) {
+                    == PrivilegedInstaller.IS_EXTENSION_INSTALLED_YES) {
                 Utils.debugLog(TAG, "system permissions -> SystemInstaller");
 
                 try {
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java
index 0f9596f02..6fc72e487 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java
@@ -81,10 +81,10 @@ public class PrivilegedInstaller extends Installer {
 
     public static final int REQUEST_CONFIRM_PERMS = 0;
 
-    public static final int EXTENSION_INSTALLED_NO = 0;
-    public static final int EXTENSION_INSTALLED_YES = 1;
-    public static final int EXTENSION_INSTALLED_SIGNATURE_PROBLEM = 2;
-    public static final int EXTENSION_INSTALLED_PERMISSIONS_PROBLEM = 3;
+    public static final int IS_EXTENSION_INSTALLED_NO = 0;
+    public static final int IS_EXTENSION_INSTALLED_YES = 1;
+    public static final int IS_EXTENSION_INSTALLED_SIGNATURE_PROBLEM = 2;
+    public static final int IS_EXTENSION_INSTALLED_PERMISSIONS_PROBLEM = 3;
 
     public PrivilegedInstaller(Activity activity, PackageManager pm,
                                InstallerCallback callback) throws AndroidNotCompatibleException {
@@ -106,7 +106,7 @@ public class PrivilegedInstaller extends Installer {
 
         // check if installed
         if (!isExtensionInstalled(context)) {
-            return EXTENSION_INSTALLED_NO;
+            return IS_EXTENSION_INSTALLED_NO;
         }
 
         // check if it has the privileged permissions granted
@@ -138,7 +138,7 @@ public class PrivilegedInstaller extends Installer {
             context.getApplicationContext().bindService(serviceIntent, mServiceConnection,
                     Context.BIND_AUTO_CREATE);
         } catch (SecurityException e) {
-            return EXTENSION_INSTALLED_SIGNATURE_PROBLEM;
+            return IS_EXTENSION_INSTALLED_SIGNATURE_PROBLEM;
         }
 
         synchronized (mutex) {
@@ -151,9 +151,9 @@ public class PrivilegedInstaller extends Installer {
 
         boolean hasPermissions = returnBundle.getBoolean("has_permissions", false);
         if (hasPermissions) {
-            return EXTENSION_INSTALLED_YES;
+            return IS_EXTENSION_INSTALLED_YES;
         } else {
-            return EXTENSION_INSTALLED_PERMISSIONS_PROBLEM;
+            return IS_EXTENSION_INSTALLED_PERMISSIONS_PROBLEM;
         }
     }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java
index 2b231dc1c..330be9510 100644
--- a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java
@@ -97,16 +97,16 @@ public class InstallExtensionDialogActivity extends FragmentActivity {
 
             int isInstalledCorrectly = PrivilegedInstaller.isExtensionInstalledCorrectly(context);
             switch (isInstalledCorrectly) {
-                case PrivilegedInstaller.EXTENSION_INSTALLED_YES:
+                case PrivilegedInstaller.IS_EXTENSION_INSTALLED_YES:
                     Preferences.get().setPrivilegedInstallerEnabled(true);
                     break;
 
-                case PrivilegedInstaller.EXTENSION_INSTALLED_NO:
+                case PrivilegedInstaller.IS_EXTENSION_INSTALLED_NO:
                     runFirstTime(context);
                     break;
 
-                case PrivilegedInstaller.EXTENSION_INSTALLED_PERMISSIONS_PROBLEM:
-                case PrivilegedInstaller.EXTENSION_INSTALLED_SIGNATURE_PROBLEM:
+                case PrivilegedInstaller.IS_EXTENSION_INSTALLED_PERMISSIONS_PROBLEM:
+                case PrivilegedInstaller.IS_EXTENSION_INSTALLED_SIGNATURE_PROBLEM:
                 default:
                     // do nothing
             }
@@ -338,7 +338,7 @@ public class InstallExtensionDialogActivity extends FragmentActivity {
         String message;
         final int result;
         switch (isInstalledCorrectly) {
-            case PrivilegedInstaller.EXTENSION_INSTALLED_YES:
+            case PrivilegedInstaller.IS_EXTENSION_INSTALLED_YES:
                 title = getString(R.string.system_install_post_success);
                 message = getString(R.string.system_install_post_success_message);
                 result = Activity.RESULT_OK;
@@ -346,18 +346,18 @@ public class InstallExtensionDialogActivity extends FragmentActivity {
                 // enable system installer on installation success
                 Preferences.get().setPrivilegedInstallerEnabled(true);
                 break;
-            case PrivilegedInstaller.EXTENSION_INSTALLED_NO:
+            case PrivilegedInstaller.IS_EXTENSION_INSTALLED_NO:
                 title = getString(R.string.system_install_post_fail);
                 message = getString(R.string.system_install_post_fail_message);
                 result = Activity.RESULT_CANCELED;
                 break;
-            case PrivilegedInstaller.EXTENSION_INSTALLED_SIGNATURE_PROBLEM:
+            case PrivilegedInstaller.IS_EXTENSION_INSTALLED_SIGNATURE_PROBLEM:
                 title = getString(R.string.system_install_post_fail);
                 message = getString(R.string.system_install_post_fail_message) +
                         "\n\n" + getString(R.string.system_install_denied_signature);
                 result = Activity.RESULT_CANCELED;
                 break;
-            case PrivilegedInstaller.EXTENSION_INSTALLED_PERMISSIONS_PROBLEM:
+            case PrivilegedInstaller.IS_EXTENSION_INSTALLED_PERMISSIONS_PROBLEM:
                 title = getString(R.string.system_install_post_fail);
                 message = getString(R.string.system_install_post_fail_message) +
                         "\n\n" + getString(R.string.system_install_denied_permissions);
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
index 2061ec1f5..de6f75278 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
@@ -196,7 +196,7 @@ public class PreferencesFragment extends PreferenceFragment
                 if (pref.isChecked()) {
                     int isInstalledCorrectly =
                             PrivilegedInstaller.isExtensionInstalledCorrectly(getActivity());
-                    if (isInstalledCorrectly == PrivilegedInstaller.EXTENSION_INSTALLED_YES) {
+                    if (isInstalledCorrectly == PrivilegedInstaller.IS_EXTENSION_INSTALLED_YES) {
                         // privileged permission are granted, i.e. the extension is installed correctly
                         SharedPreferences.Editor editor = pref.getSharedPreferences().edit();
                         editor.putBoolean(Preferences.PREF_PRIVILEGED_INSTALLER, true);
@@ -214,14 +214,14 @@ public class PreferencesFragment extends PreferenceFragment
 
                         String message = null;
                         switch (isInstalledCorrectly) {
-                            case PrivilegedInstaller.EXTENSION_INSTALLED_NO:
+                            case PrivilegedInstaller.IS_EXTENSION_INSTALLED_NO:
                                 message = getActivity().getString(R.string.system_install_denied_body) +
                                         "<br/><br/>" + getActivity().getString(R.string.system_install_question);
                                 break;
-                            case PrivilegedInstaller.EXTENSION_INSTALLED_SIGNATURE_PROBLEM:
+                            case PrivilegedInstaller.IS_EXTENSION_INSTALLED_SIGNATURE_PROBLEM:
                                 message = getActivity().getString(R.string.system_install_denied_signature);
                                 break;
-                            case PrivilegedInstaller.EXTENSION_INSTALLED_PERMISSIONS_PROBLEM:
+                            case PrivilegedInstaller.IS_EXTENSION_INSTALLED_PERMISSIONS_PROBLEM:
                                 message = getActivity().getString(R.string.system_install_denied_permissions);
                                 break;
                             default: