diff --git a/app/build.gradle b/app/build.gradle
index b344581d..c93223dd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,6 +40,10 @@ android {
         release {
             if (keystorePropertiesFile.exists()) signingConfig signingConfigs.release
         }
+        debug {
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
+        }
     }
     externalNativeBuild {
         cmake {
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 00000000..60e016ea
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">WireGuard β</string>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 13c5a223..e422c566 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <permission
-        android:name="com.wireguard.android.permission.CONTROL_TUNNELS"
+        android:name="${applicationId}.permission.CONTROL_TUNNELS"
         android:protectionLevel="dangerous"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/permission_label"
@@ -59,7 +59,7 @@
 
         <receiver
             android:name=".model.TunnelManager$IntentReceiver"
-            android:permission="com.wireguard.android.permission.CONTROL_TUNNELS">
+            android:permission="${applicationId}.permission.CONTROL_TUNNELS">
             <intent-filter>
                 <action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
                 <action android:name="com.wireguard.android.action.SET_TUNNEL_UP" />