diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index 90e76e0b1..f3937c178 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.zeapo.pwdstore.crypto.PgpHandler"
+    tools:context="com.zeapo.pwdstore.crypto.PgpActivity"
     android:orientation="vertical"
     android:background="@color/background">
 
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml
index fffc90322..66eee1877 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/encrypt_layout.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.zeapo.pwdstore.crypto.PgpHandler"
+    tools:context="com.zeapo.pwdstore.crypto.PgpActivity"
     android:background="@color/background"
     android:padding="@dimen/activity_horizontal_margin">
 
diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml
index 4e4972155..755ee209c 100644
--- a/app/src/main/res/menu/pgp_handler.xml
+++ b/app/src/main/res/menu/pgp_handler.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:pwstore="http://schemas.android.com/apk/res-auto"
-    tools:context="com.zeapo.pwdstore.crypto.PgpHandler" >
+    tools:context="com.zeapo.pwdstore.crypto.PgpActivity" >
     <item android:title="@string/share_as_plaintext"
         android:icon="@drawable/ic_share_white_24dp"
         pwstore:showAsAction="ifRoom"
diff --git a/app/src/main/res/menu/pgp_handler_new_password.xml b/app/src/main/res/menu/pgp_handler_new_password.xml
index 6c7e12c92..9c8dd34b7 100644
--- a/app/src/main/res/menu/pgp_handler_new_password.xml
+++ b/app/src/main/res/menu/pgp_handler_new_password.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:pwstore="http://schemas.android.com/apk/res-auto"
-    tools:context="com.zeapo.pwdstore.crypto.PgpHandler" >
+    tools:context="com.zeapo.pwdstore.crypto.PgpActivity" >
     <item android:title="@string/crypto_cancel"
         android:icon="@drawable/ic_clear_white_24dp"
         pwstore:showAsAction="ifRoom"