diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
index d2ede2e67..18afd2f23 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
@@ -116,7 +116,7 @@ public class AccountSettingsFragment extends Fragment {
             }
         }
 
-        // execute activity's handleActivityResult to show log notify
+        // execute activity's onActivityResult to show log notify
         super.onActivityResult(requestCode, resultCode, data);
     }
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
index e2d353cc5..d290c57a6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
@@ -465,7 +465,7 @@ public class EncryptFilesFragment
         if (actionsParcel.isIncomplete()) {
             // if this is still null, prepare output streams again
             if (mOutputUris == null) {
-                // this may interrupt the flow, and call us again from handleActivityResult
+                // this may interrupt the flow, and call us again from onActivityResult
                 if (prepareOutputStreams(mShareAfterEncrypt)) {
                     return null;
                 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java
index 9d072cc50..677acb1b8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java
@@ -70,7 +70,7 @@ public class FileHelper {
      * @param last        default selected Uri, not supported by all file managers
      * @param mimeType    can be text/plain for example
      * @param requestCode requestCode used to identify the result coming back from file manager to
-     *                    handleActivityResult() in your activity
+     *                    onActivityResult() in your activity
      */
     public static void openFile(Fragment fragment, Uri last, String mimeType, int requestCode) {
         Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
@@ -144,7 +144,7 @@ public class FileHelper {
      * @param fragment
      * @param mimeType    can be text/plain for example
      * @param multiple    allow file chooser to return multiple files
-     * @param requestCode used to identify the result coming back from storage browser handleActivityResult() in your
+     * @param requestCode used to identify the result coming back from storage browser onActivityResult() in your
      */
     @TargetApi(Build.VERSION_CODES.KITKAT)
     public static void openDocument(Fragment fragment, String mimeType, boolean multiple, int requestCode) {
@@ -162,7 +162,7 @@ public class FileHelper {
      * @param fragment
      * @param mimeType      can be text/plain for example
      * @param suggestedName a filename desirable for the file to be saved
-     * @param requestCode   used to identify the result coming back from storage browser handleActivityResult() in your
+     * @param requestCode   used to identify the result coming back from storage browser onActivityResult() in your
      */
     @TargetApi(Build.VERSION_CODES.KITKAT)
     public static void saveDocument(Fragment fragment, String mimeType, String suggestedName, int requestCode) {