diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5ffcb928..fef6f59d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ConfigAddActivity"
+            android:name=".AddActivity"
             android:label="@string/edit_activity_title" />
         <activity
             android:name=".SettingsActivity"
diff --git a/app/src/main/java/com/wireguard/android/ConfigAddActivity.java b/app/src/main/java/com/wireguard/android/AddActivity.java
similarity index 89%
rename from app/src/main/java/com/wireguard/android/ConfigAddActivity.java
rename to app/src/main/java/com/wireguard/android/AddActivity.java
index f299a67c..7e31c876 100644
--- a/app/src/main/java/com/wireguard/android/ConfigAddActivity.java
+++ b/app/src/main/java/com/wireguard/android/AddActivity.java
@@ -10,11 +10,11 @@ import com.wireguard.config.Config;
  * Standalone activity for creating configurations.
  */
 
-public class ConfigAddActivity extends BaseConfigActivity {
+public class AddActivity extends BaseConfigActivity {
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.config_add_activity);
+        setContentView(R.layout.add_activity);
     }
 
     @Override
diff --git a/app/src/main/java/com/wireguard/android/ConfigActivity.java b/app/src/main/java/com/wireguard/android/ConfigActivity.java
index 628aaeb6..e81b6c9c 100644
--- a/app/src/main/java/com/wireguard/android/ConfigActivity.java
+++ b/app/src/main/java/com/wireguard/android/ConfigActivity.java
@@ -169,7 +169,7 @@ public class ConfigActivity extends BaseConfigActivity {
                 onBackPressed();
                 return true;
             case R.id.menu_action_add:
-                startActivity(new Intent(this, ConfigAddActivity.class));
+                startActivity(new Intent(this, AddActivity.class));
                 return true;
             case R.id.menu_action_edit:
                 // Try to make the editing fragment visible.
diff --git a/app/src/main/res/layout/config_add_activity.xml b/app/src/main/res/layout/add_activity.xml
similarity index 59%
rename from app/src/main/res/layout/config_add_activity.xml
rename to app/src/main/res/layout/add_activity.xml
index d67e64bc..0f21e2e8 100644
--- a/app/src/main/res/layout/config_add_activity.xml
+++ b/app/src/main/res/layout/add_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/master_fragment"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent"
+    tools:ignore="MergeRootFrame" />