diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index c563f121a..8788c8b01 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -106,7 +106,7 @@ interface AppInstallListener {
 
 public class AppDetails extends ActionBarActivity implements ProgressListener, AppDetailsData, AppInstallListener {
 
-    private static final String TAG = "org.fdroid.fdroid.AppDetails";
+    private static final String TAG = "fdroid.AppDetails";
 
     public static final int REQUEST_ENABLE_BLUETOOTH = 2;
 
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
index b9c5ed9ef..6f8912ddf 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
@@ -74,7 +74,7 @@ public class FDroidApp extends Application {
     private static Messenger localRepoServiceMessenger = null;
     private static boolean localRepoServiceIsBound = false;
 
-    private static final String TAG = "org.fdroid.fdroid.FDroidApp";
+    private static final String TAG = "fdroid.FDroidApp";
 
     BluetoothAdapter bluetoothAdapter = null;
 
diff --git a/F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java b/F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java
index e3a167e1f..c32f89d93 100644
--- a/F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java
+++ b/F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java
@@ -19,7 +19,7 @@ import com.google.zxing.encode.QRCodeEncoder;
 // zxing is android-8 and above
 @TargetApi(8)
 public class QrGenAsyncTask extends AsyncTask<String, Void, Void> {
-    private static final String TAG = "QrGenAsyncTask";
+    private static final String TAG = "fdroid.QrGenAsyncTask";
 
     private Activity activity;
     private int viewId;
diff --git a/F-Droid/src/org/fdroid/fdroid/Utils.java b/F-Droid/src/org/fdroid/fdroid/Utils.java
index 427ba52c3..86302e025 100644
--- a/F-Droid/src/org/fdroid/fdroid/Utils.java
+++ b/F-Droid/src/org/fdroid/fdroid/Utils.java
@@ -73,7 +73,7 @@ public final class Utils {
     public static final SimpleDateFormat LOG_DATE_FORMAT =
             new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH);
 
-    private static final String TAG = "org.fdroid.fdroid.Utils";
+    private static final String TAG = "fdroid.Utils";
 
     public static String getIconsDir(Context context) {
         DisplayMetrics metrics = context.getResources().getDisplayMetrics();
diff --git a/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java
index 7cc6c411e..e80e91170 100644
--- a/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java
+++ b/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java
@@ -13,7 +13,7 @@ import java.lang.reflect.Method;
 
 public class FileCompat {
 
-    private static final String TAG = "org.fdroid.fdroid.compat.FileCompat";
+    private static final String TAG = "fdroid.FileCompat";
 
     public static boolean symlink(SanitizedFile source, SanitizedFile dest) {
 
diff --git a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
index 2c251d51e..dabcd0219 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
@@ -15,7 +15,7 @@ import java.util.List;
 
 public class DBHelper extends SQLiteOpenHelper {
 
-    private static final String TAG = "org.fdroid.fdroid.data.DBHelper";
+    private static final String TAG = "fdroid.DBHelper";
 
     public static final String DATABASE_NAME = "fdroid";
 
diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java
index 1e862a82e..aaf306048 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java
@@ -22,7 +22,7 @@ import java.util.Map;
  */
 public class InstalledAppCacheUpdater {
 
-    private static final String TAG = "org.fdroid.fdroid.data.InstalledAppCacheUpdater";
+    private static final String TAG = "fdroid.InstalledAppCacheUpdater";
 
     private Context context;
 
diff --git a/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java b/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java
index 4e0eb7795..1cbaab2ce 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java
@@ -13,7 +13,7 @@ import java.util.Locale;
 
 public class NewRepoConfig {
 
-    private static final String TAG = "org.fdroid.fdroid.data.NewRepoConfig";
+    private static final String TAG = "fdroid.NewRepoConfig";
 
     private String errorMessage;
     private boolean isValidRepo = false;
diff --git a/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java b/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java
index 4aeb25f96..9eb76336f 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java
@@ -16,7 +16,7 @@ public class RepoProvider extends FDroidProvider {
 
     public static final class Helper {
 
-        public static final String TAG = "RepoProvider.Helper";
+        public static final String TAG = "fdroid.RepoProvider.Helper";
 
         private Helper() {}
 
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
index 65b36187e..19c17ffa0 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
@@ -41,7 +41,7 @@ abstract public class Installer {
     protected PackageManager mPm;
     protected InstallerCallback mCallback;
 
-    public static final String TAG = "FDroid";
+    public static final String TAG = "fdroid.Installer";
 
     /**
      * This is thrown when an Installer is not compatible with the Android OS it
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java
index 351a5b4d2..3ae512b6d 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java
@@ -35,7 +35,7 @@ import kellinwood.security.zipsigner.ZipSigner;
 
 public class LocalRepoKeyStore {
 
-    private static final String TAG = "org.fdroid.fdroid.localrepo.LocalRepoKeyStore";
+    private static final String TAG = "fdroid.LocalRepoKeyStore";
 
     public static final String INDEX_CERT_ALIAS = "fdroid";
     public static final String HTTP_CERT_ALIAS = "https";
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java
index 45fa2e9e5..296247cb1 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java
@@ -60,7 +60,7 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 
 public class LocalRepoManager {
-    private static final String TAG = "LocalRepoManager";
+    private static final String TAG = "fdroid.LocalRepoManager";
 
     // For ref, official F-droid repo presently uses a maxage of 14 days
     private static final String DEFAULT_REPO_MAX_AGE_DAYS = "14";
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java
index fa31666a0..7e1ff91c6 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java
@@ -36,7 +36,7 @@ import java.util.HashMap;
 import java.util.Random;
 
 public class LocalRepoService extends Service {
-    private static final String TAG = "LocalRepoService";
+    private static final String TAG = "fdroid.LocalRepoService";
 
     public static final String STATE = "org.fdroid.fdroid.action.LOCAL_REPO_STATE";
     public static final String STARTED = "org.fdroid.fdroid.category.LOCAL_REPO_STARTED";
diff --git a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
index e989da6d6..fe2459a32 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
@@ -41,7 +41,7 @@ import java.security.NoSuchAlgorithmException;
  */
 public class ApkDownloader implements AsyncDownloadWrapper.Listener {
 
-    private static final String TAG = "org.fdroid.fdroid.net.ApkDownloader";
+    private static final String TAG = "fdroid.ApkDownloader";
 
     public static final String EVENT_APK_DOWNLOAD_COMPLETE = "apkDownloadComplete";
     public static final String EVENT_APK_DOWNLOAD_CANCELLED = "apkDownloadCancelled";
diff --git a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java
index 5e250aaa4..5d51cb823 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java
@@ -17,7 +17,7 @@ import java.io.IOException;
  */
 public class AsyncDownloadWrapper extends Handler {
 
-    private static final String TAG = "org.fdroid.fdroid.net.AsyncDownloadWrapper";
+    private static final String TAG = "fdroid.AsyncDownloadWrapper";
 
     private static final int MSG_PROGRESS           = 1;
     private static final int MSG_DOWNLOAD_COMPLETE  = 2;
diff --git a/F-Droid/src/org/fdroid/fdroid/net/Downloader.java b/F-Droid/src/org/fdroid/fdroid/net/Downloader.java
index 0e877ec56..61f48f709 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/Downloader.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/Downloader.java
@@ -19,7 +19,7 @@ import java.net.URL;
 
 public abstract class Downloader {
 
-    private static final String TAG = "org.fdroid.fdroid.net.Downloader";
+    private static final String TAG = "fdroid.Downloader";
     private OutputStream outputStream;
 
     private ProgressListener progressListener = null;
diff --git a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
index 2085b3261..7baf3576a 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
@@ -19,7 +19,7 @@ import java.net.URL;
 import javax.net.ssl.SSLHandshakeException;
 
 public class HttpDownloader extends Downloader {
-    private static final String TAG = "org.fdroid.fdroid.net.HttpDownloader";
+    private static final String TAG = "fdroid.HttpDownloader";
 
     protected static final String HEADER_IF_NONE_MATCH = "If-None-Match";
     protected static final String HEADER_FIELD_ETAG = "ETag";
diff --git a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java
index b5fd420f0..c642c48ef 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java
@@ -17,7 +17,7 @@ import java.util.*;
 import javax.net.ssl.SSLServerSocketFactory;
 
 public class LocalHTTPD extends NanoHTTPD {
-    private static final String TAG = LocalHTTPD.class.getCanonicalName();
+    private static final String TAG = "fdroid.LocalHTTPD";
 
     private final Context context;
     private final File webRoot;
diff --git a/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java b/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java
index ae2799a46..429cedabc 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java
@@ -26,7 +26,7 @@ import javax.jmdns.*;
 
 public class MDnsHelper implements ServiceListener {
 
-    public static final String TAG = "MDnsHelper";
+    public static final String TAG = "fdroid.MDnsHelper";
     public static final String HTTP_SERVICE_TYPE = "_http._tcp.local.";
     public static final String HTTPS_SERVICE_TYPE = "_https._tcp.local.";
 
diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
index 8c48da60e..20b019ff2 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -35,7 +35,7 @@ public class WifiStateChangeService extends Service {
     }
 
     public class WaitForWifiAsyncTask extends AsyncTask<Void, Void, Void> {
-        private static final String TAG = "WaitForWifiAsyncTask";
+        private static final String TAG = "fdroid.WifiStateChangeService.WaitForWifiAsyncTask";
         private WifiManager wifiManager;
 
         @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java b/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java
index 2054a1e72..8511622e4 100644
--- a/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java
+++ b/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java
@@ -16,7 +16,7 @@ import java.util.jar.JarFile;
 
 public class SignedRepoUpdater extends RepoUpdater {
 
-    private static final String TAG = "org.fdroid.fdroid.updater.SignedRepoUpdater";
+    private static final String TAG = "fdroid.SignedRepoUpdater";
 
     public SignedRepoUpdater(Context ctx, Repo repo) {
         super(ctx, repo);
diff --git a/F-Droid/src/org/fdroid/fdroid/views/LocalRepoActivity.java b/F-Droid/src/org/fdroid/fdroid/views/LocalRepoActivity.java
index 0005245f3..6f54d891a 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/LocalRepoActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/LocalRepoActivity.java
@@ -46,7 +46,7 @@ import java.util.TimerTask;
 
 public class LocalRepoActivity extends ActionBarActivity {
 
-    private static final String TAG = "org.fdroid.fdroid.LocalRepoActivity";
+    private static final String TAG = "fdroid.LocalRepoActivity";
     private ProgressDialog repoProgress;
 
     private WifiManager wifiManager;
@@ -284,7 +284,7 @@ public class LocalRepoActivity extends ActionBarActivity {
     }
 
     class UpdateAsyncTask extends AsyncTask<Void, String, Void> {
-        private static final String TAG = "UpdateAsyncTask";
+        private static final String TAG = "fdroid.LocalRepoActivity.UpdateAsyncTask";
         private ProgressDialog progressDialog;
         private String[] selectedApps;
         private Uri sharingUri;
diff --git a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
index bf35ec5b0..e0f0e518f 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
@@ -88,7 +88,7 @@ public class ManageReposActivity extends ActionBarActivity {
      * we finish with, to signify that we want the main list of apps updated.
      */
     public static final String REQUEST_UPDATE = "update";
-    private static final String TAG = "org.fdroid.fdroid.views.ManageReposActivity";
+    private static final String TAG = "fdroid.ManageReposActivity";
 
     private static final String DEFAULT_NEW_REPO_TEXT = "https://";
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java b/F-Droid/src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java
index dbdd9b4f9..8b7e77f01 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java
@@ -20,7 +20,7 @@ import org.fdroid.fdroid.net.WifiStateChangeService;
 
 public class QrWizardDownloadActivity extends ActionBarActivity {
 
-    private static final String TAG = "org.fdroid.fdroid.QrWizardDownloadActivity";
+    private static final String TAG = "fdroid.QrWizardDownloadActivity";
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
diff --git a/F-Droid/src/org/fdroid/fdroid/views/QrWizardWifiNetworkActivity.java b/F-Droid/src/org/fdroid/fdroid/views/QrWizardWifiNetworkActivity.java
index 5d7419e82..5b279a9f7 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/QrWizardWifiNetworkActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/QrWizardWifiNetworkActivity.java
@@ -22,7 +22,7 @@ import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.net.WifiStateChangeService;
 
 public class QrWizardWifiNetworkActivity extends ActionBarActivity {
-    private static final String TAG = "org.fdroid.fdroid.QrWizardWifiNetworkActivity";
+    private static final String TAG = "fdroid.QrWizardWifiNetworkActivity";
 
     private WifiManager wifiManager;
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
index 426cd25e1..fb9e70df8 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
@@ -23,7 +23,7 @@ import org.fdroid.fdroid.data.RepoProvider;
 import org.fdroid.fdroid.views.fragments.RepoDetailsFragment;
 
 public class RepoDetailsActivity extends ActionBarActivity {
-    public static final String TAG = "RepoDetailsActivity";
+    public static final String TAG = "fdroid.RepoDetailsActivity";
 
     private Repo repo;
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/SelectLocalAppsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/SelectLocalAppsActivity.java
index 007193691..c74eaeef4 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/SelectLocalAppsActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/SelectLocalAppsActivity.java
@@ -18,7 +18,7 @@ import org.fdroid.fdroid.views.fragments.SelectLocalAppsFragment;
 
 public class SelectLocalAppsActivity extends ActionBarActivity {
 
-    private static final String TAG = "SelectLocalAppsActivity";
+    private static final String TAG = "fdroid.SelectLocalAppsActivity";
     private SelectLocalAppsFragment selectLocalAppsFragment = null;
     private SearchView searchView;
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
index 99a4d079c..ad83a6987 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
@@ -68,7 +68,7 @@ public class RepoDetailsFragment extends Fragment {
     private static final int UPDATE = 1;
     private static final int ENABLE_NFC = 2;
 
-    private static final String TAG = "org.fdroid.fdroid.views.fragments.RepoDetailsFragment";
+    private static final String TAG = "fdroid.RepoDetailsFragment";
 
     private MenuItem enableNfc = null;
     private UpdateService.UpdateReceiver updateHandler = null;
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java
index fca4ae38d..96816b735 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java
@@ -24,7 +24,7 @@ import org.fdroid.fdroid.views.AvailableAppListAdapter;
 
 public class SearchResultsFragment extends ListFragment implements LoaderManager.LoaderCallbacks<Cursor> {
 
-    private static final String TAG = "org.fdroid.fdroid.views.fragments.SearchResultsFragment";
+    private static final String TAG = "fdroid.SearchResultsFragment";
 
     private static final int REQUEST_APPDETAILS = 0;
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java
index 651d1c466..7bcaee90e 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java
@@ -197,7 +197,7 @@ public class SwapActivity extends ActionBarActivity implements SwapProcessManage
     }
 
     class UpdateAsyncTask extends AsyncTask<Void, String, Void> {
-        private static final String TAG = "UpdateAsyncTask";
+        private static final String TAG = "fdroid.SwapActivity.UpdateAsyncTask";
         private ProgressDialog progressDialog;
         private Set<String> selectedApps;
         private Uri sharingUri;