diff --git a/app/src/main/java/com/wireguard/android/BootShutdownReceiver.java b/app/src/main/java/com/wireguard/android/BootShutdownReceiver.java
index 6c5418ba..153e615d 100644
--- a/app/src/main/java/com/wireguard/android/BootShutdownReceiver.java
+++ b/app/src/main/java/com/wireguard/android/BootShutdownReceiver.java
@@ -9,7 +9,7 @@ import com.wireguard.android.model.TunnelManager;
 import com.wireguard.android.util.ExceptionLoggers;
 
 public class BootShutdownReceiver extends BroadcastReceiver {
-    private static final String TAG = BootShutdownReceiver.class.getSimpleName();
+    private static final String TAG = "WireGuard/" + BootShutdownReceiver.class.getSimpleName();
 
     @Override
     public void onReceive(final Context context, final Intent intent) {
diff --git a/app/src/main/java/com/wireguard/android/QuickTileService.java b/app/src/main/java/com/wireguard/android/QuickTileService.java
index a766d6c8..98c3b3d3 100644
--- a/app/src/main/java/com/wireguard/android/QuickTileService.java
+++ b/app/src/main/java/com/wireguard/android/QuickTileService.java
@@ -26,7 +26,7 @@ import java.util.Objects;
 
 @TargetApi(Build.VERSION_CODES.N)
 public class QuickTileService extends TileService {
-    private static final String TAG = QuickTileService.class.getSimpleName();
+    private static final String TAG = "WireGuard/" + QuickTileService.class.getSimpleName();
     private final OnStateChangedCallback onStateChangedCallback = new OnStateChangedCallback();
     private final OnTunnelChangedCallback onTunnelChangedCallback = new OnTunnelChangedCallback();
     private Tunnel tunnel;
diff --git a/app/src/main/java/com/wireguard/android/activity/MainActivity.java b/app/src/main/java/com/wireguard/android/activity/MainActivity.java
index 9e69ca89..e347af75 100644
--- a/app/src/main/java/com/wireguard/android/activity/MainActivity.java
+++ b/app/src/main/java/com/wireguard/android/activity/MainActivity.java
@@ -24,7 +24,7 @@ import java9.util.stream.Stream;
 
 public class MainActivity extends BaseActivity {
     private static final String KEY_STATE = "fragment_state";
-    private static final String TAG = MainActivity.class.getSimpleName();
+    private static final String TAG = "WireGuard/" + MainActivity.class.getSimpleName();
     private State state = State.EMPTY;
 
     private boolean moveToState(final State nextState) {
diff --git a/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java b/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
index ab6a6199..5ac27af4 100644
--- a/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
+++ b/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
@@ -25,7 +25,7 @@ import java9.util.stream.Stream;
  */
 
 public final class WgQuickBackend implements Backend {
-    private static final String TAG = WgQuickBackend.class.getSimpleName();
+    private static final String TAG = "WireGuard/" + WgQuickBackend.class.getSimpleName();
 
     private final Context context;
     private final RootShell rootShell;
diff --git a/app/src/main/java/com/wireguard/android/configStore/FileConfigStore.java b/app/src/main/java/com/wireguard/android/configStore/FileConfigStore.java
index 2006924f..dd2b434f 100644
--- a/app/src/main/java/com/wireguard/android/configStore/FileConfigStore.java
+++ b/app/src/main/java/com/wireguard/android/configStore/FileConfigStore.java
@@ -21,7 +21,7 @@ import java9.util.stream.Stream;
  */
 
 public final class FileConfigStore implements ConfigStore {
-    private static final String TAG = FileConfigStore.class.getSimpleName();
+    private static final String TAG = "WireGuard/" + FileConfigStore.class.getSimpleName();
 
     private final Context context;
 
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelController.java b/app/src/main/java/com/wireguard/android/fragment/TunnelController.java
index 77d8d320..1a9fed6b 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelController.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelController.java
@@ -26,7 +26,7 @@ import com.wireguard.android.util.RootShell;
  */
 
 public final class TunnelController {
-    private static final String TAG = TunnelController.class.getSimpleName();
+    private static final String TAG = "WireGuard/" + TunnelController.class.getSimpleName();
 
     private TunnelController() {
         // Prevent instantiation.
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
index b5f21ece..f1cd7263 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
@@ -33,7 +33,7 @@ public class TunnelEditorFragment extends BaseFragment {
     private static final String KEY_LOCAL_CONFIG = "local_config";
     private static final String KEY_LOCAL_NAME = "local_name";
     private static final String KEY_ORIGINAL_NAME = "original_name";
-    private static final String TAG = TunnelEditorFragment.class.getSimpleName();
+    private static final String TAG = "WireGuard/" + TunnelEditorFragment.class.getSimpleName();
 
     private final ObservableField<String> localName = new ObservableField<>("");
     private TunnelEditorFragmentBinding binding;
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
index eb5b6af1..08d39bd5 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
@@ -53,7 +53,7 @@ import java9.util.stream.StreamSupport;
 
 public class TunnelListFragment extends BaseFragment {
     private static final int REQUEST_IMPORT = 1;
-    private static final String TAG = TunnelListFragment.class.getSimpleName();
+    private static final String TAG = "WireGuard/" + TunnelListFragment.class.getSimpleName();
 
     private final MultiChoiceModeListener actionModeListener = new ActionModeListener();
     private final ListViewCallbacks listViewCallbacks = new ListViewCallbacks();
diff --git a/app/src/main/java/com/wireguard/android/model/TunnelManager.java b/app/src/main/java/com/wireguard/android/model/TunnelManager.java
index 816d6708..9aa96103 100644
--- a/app/src/main/java/com/wireguard/android/model/TunnelManager.java
+++ b/app/src/main/java/com/wireguard/android/model/TunnelManager.java
@@ -39,7 +39,7 @@ public final class TunnelManager extends BaseObservable {
     private static final String KEY_LAST_USED_TUNNEL = "last_used_tunnel";
     private static final String KEY_RESTORE_ON_BOOT = "restore_on_boot";
     private static final String KEY_RUNNING_TUNNELS = "enabled_configs";
-    private static final String TAG = TunnelManager.class.getSimpleName();
+    private static final String TAG = "WireGuard/" + TunnelManager.class.getSimpleName();
 
     private final AsyncWorker asyncWorker;
     private final Backend backend;
diff --git a/app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java b/app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java
index 71c949ca..46922dd8 100644
--- a/app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java
+++ b/app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java
@@ -14,7 +14,7 @@ public enum ExceptionLoggers implements BiConsumer<Object, Throwable> {
     D(Log.DEBUG),
     E(Log.ERROR);
 
-    private static final String TAG = ExceptionLoggers.class.getSimpleName();
+    private static final String TAG = "WireGuard/" + ExceptionLoggers.class.getSimpleName();
 
     private final int priority;
 
diff --git a/app/src/main/java/com/wireguard/android/util/RootShell.java b/app/src/main/java/com/wireguard/android/util/RootShell.java
index 9c2f3574..205dd956 100644
--- a/app/src/main/java/com/wireguard/android/util/RootShell.java
+++ b/app/src/main/java/com/wireguard/android/util/RootShell.java
@@ -33,7 +33,7 @@ public class RootShell {
      * Setup commands that are run at the beginning of each root shell. The trap command ensures
      * access to the return value of the last command, since su itself always exits with 0.
      */
-    private static final String TAG = "WireGuard/RootShell";
+    private static final String TAG = "WireGuard/" + RootShell.class.getSimpleName();
     private static final String[][] libraryNamedExecutables = {
             {"libwg.so", "wg"},
             {"libwg-quick.so", "wg-quick"}