diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
index 847b0cf02..db5b60d17 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
@@ -155,8 +155,8 @@ abstract public class Installer {
             return;
         }
 
-        // special case: F-Droid Privileged
-        if (packageName != null && packageName.equals(PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME)) {
+        // special case: F-Droid Privileged Extension
+        if (packageName != null && packageName.equals(PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME)) {
             Activity activity;
             try {
                 activity = (Activity) mContext;
@@ -196,8 +196,8 @@ abstract public class Installer {
             return;
         }
 
-        // special case: F-Droid Privileged
-        if (packageName != null && packageName.equals(PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME)) {
+        // special case: F-Droid Privileged Extension
+        if (packageName != null && packageName.equals(PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME)) {
             Activity activity;
             try {
                 activity = (Activity) mContext;
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java
index 345f12819..0f9596f02 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java
@@ -74,8 +74,8 @@ public class PrivilegedInstaller extends Installer {
 
     private static final String TAG = "PrivilegedInstaller";
 
-    private static final String PRIVILEGED_SERVICE_INTENT = "org.fdroid.fdroid.privileged.IPrivilegedService";
-    public static final String PRIVILEGED_PACKAGE_NAME = "org.fdroid.fdroid.privileged";
+    private static final String PRIVILEGED_EXTENSION_SERVICE_INTENT = "org.fdroid.fdroid.privileged.IPrivilegedService";
+    public static final String PRIVILEGED_EXTENSION_PACKAGE_NAME = "org.fdroid.fdroid.privileged";
 
     private Activity mActivity;
 
@@ -95,7 +95,7 @@ public class PrivilegedInstaller extends Installer {
     public static boolean isExtensionInstalled(Context context) {
         PackageManager pm = context.getPackageManager();
         try {
-            pm.getPackageInfo(PRIVILEGED_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
+            pm.getPackageInfo(PRIVILEGED_EXTENSION_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
             return true;
         } catch (PackageManager.NameNotFoundException e) {
             return false;
@@ -131,8 +131,8 @@ public class PrivilegedInstaller extends Installer {
             public void onServiceDisconnected(ComponentName name) {
             }
         };
-        Intent serviceIntent = new Intent(PRIVILEGED_SERVICE_INTENT);
-        serviceIntent.setPackage(PRIVILEGED_PACKAGE_NAME);
+        Intent serviceIntent = new Intent(PRIVILEGED_EXTENSION_SERVICE_INTENT);
+        serviceIntent.setPackage(PRIVILEGED_EXTENSION_PACKAGE_NAME);
 
         try {
             context.getApplicationContext().bindService(serviceIntent, mServiceConnection,
@@ -232,8 +232,8 @@ public class PrivilegedInstaller extends Installer {
             }
         };
 
-        Intent serviceIntent = new Intent(PRIVILEGED_SERVICE_INTENT);
-        serviceIntent.setPackage(PRIVILEGED_PACKAGE_NAME);
+        Intent serviceIntent = new Intent(PRIVILEGED_EXTENSION_SERVICE_INTENT);
+        serviceIntent.setPackage(PRIVILEGED_EXTENSION_PACKAGE_NAME);
         mContext.getApplicationContext().bindService(serviceIntent, mServiceConnection,
                 Context.BIND_AUTO_CREATE);
     }
@@ -338,8 +338,8 @@ public class PrivilegedInstaller extends Installer {
             }
         };
 
-        Intent serviceIntent = new Intent(PRIVILEGED_SERVICE_INTENT);
-        serviceIntent.setPackage(PRIVILEGED_PACKAGE_NAME);
+        Intent serviceIntent = new Intent(PRIVILEGED_EXTENSION_SERVICE_INTENT);
+        serviceIntent.setPackage(PRIVILEGED_EXTENSION_PACKAGE_NAME);
         mContext.getApplicationContext().bindService(serviceIntent, mServiceConnection,
                 Context.BIND_AUTO_CREATE);
     }
diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java
index b4b0e49a4..b535607ae 100644
--- a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java
+++ b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java
@@ -87,12 +87,12 @@ abstract class InstallExtension {
         final List<String> commands = new ArrayList<>();
         commands.add("mount -o rw,remount /system");
         commands.addAll(getCopyToSystemCommands(apkPath));
-        commands.add("pm uninstall " + PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
+        commands.add("pm uninstall " + PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
         commands.add("mv " + getInstallPath() + ".tmp " + getInstallPath());
         commands.add("pm install -r " + getInstallPath());
         commands.add("sleep 5"); // wait until the app is really installed
         commands.add("mount -o ro,remount /system");
-        commands.add("am force-stop " + PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
+        commands.add("am force-stop " + PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
         commands.addAll(getPostInstallCommands());
         return commands;
     }
@@ -113,10 +113,10 @@ abstract class InstallExtension {
 
     private List<String> getUninstallCommands() {
         final List<String> commands = new ArrayList<>();
-        commands.add("am force-stop " + PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
-        commands.add("pm clear " + PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
+        commands.add("am force-stop " + PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
+        commands.add("pm clear " + PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
         commands.add("mount -o rw,remount /system");
-        commands.add("pm uninstall " + PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
+        commands.add("pm uninstall " + PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
         commands.addAll(getCleanUninstallCommands());
         commands.add("sleep 5");
         commands.add("mount -o ro,remount /system");
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 629deeae5..2b231dc1c 100644
--- a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java
@@ -188,7 +188,7 @@ public class InstallExtensionDialogActivity extends FragmentActivity {
                         // Open details of F-Droid Privileged
                         Intent intent = new Intent(InstallExtensionDialogActivity.this, AppDetails.class);
                         intent.putExtra(AppDetails.EXTRA_APPID,
-                                PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
+                                PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
                         startActivity(intent);
                     }
                 })
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 04ee38f55..2061ec1f5 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
@@ -234,7 +234,7 @@ public class PreferencesFragment extends PreferenceFragment
                                 // Open details of F-Droid Privileged
                                 Intent intent = new Intent(getActivity(), AppDetails.class);
                                 intent.putExtra(AppDetails.EXTRA_APPID,
-                                        PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
+                                        PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
                                 startActivity(intent);
                             }
                         });
@@ -264,7 +264,7 @@ public class PreferencesFragment extends PreferenceFragment
                 // Open details of F-Droid Privileged
                 Intent intent = new Intent(getActivity(), AppDetails.class);
                 intent.putExtra(AppDetails.EXTRA_APPID,
-                        PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
+                        PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
                 startActivity(intent);
 
                 return true;