Rename "pass phrase" to "passphrase"

10 files changed, 73 insertions, 73 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index 5062800db..84c7f0f41 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -58,7 +58,7 @@ public final class Constants {
         public static final String DEFAULT_ASCII_ARMOUR = "defaultAsciiArmour";
         public static final String DEFAULT_MESSAGE_COMPRESSION = "defaultMessageCompression";
         public static final String DEFAULT_FILE_COMPRESSION = "defaultFileCompression";
-        public static final String PASS_PHRASE_CACHE_TTL = "passphraseCacheTtl";
+        public static final String PASSPHRASE_CACHE_TTL = "passphraseCacheTtl";
         public static final String LANGUAGE = "language";
         public static final String FORCE_V3_SIGNATURES = "forceV3Signatures";
         public static final String KEY_SERVERS = "keyServers";
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
index 13b1df4d4..e91572ade 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
@@ -58,8 +58,8 @@ public class Preferences {
         editor.commit();
     }
 
-    public long getPassPhraseCacheTtl() {
-        int ttl = mSharedPreferences.getInt(Constants.Pref.PASS_PHRASE_CACHE_TTL, 180);
+    public long getPassphraseCacheTtl() {
+        int ttl = mSharedPreferences.getInt(Constants.Pref.PASSPHRASE_CACHE_TTL, 180);
         // fix the value if it was set to "never" in previous versions, which currently is not
         // supported
         if (ttl == 0) {
@@ -68,9 +68,9 @@ public class Preferences {
         return (long) ttl;
     }
 
-    public void setPassPhraseCacheTtl(int value) {
+    public void setPassphraseCacheTtl(int value) {
         SharedPreferences.Editor editor = mSharedPreferences.edit();
-        editor.putInt(Constants.Pref.PASS_PHRASE_CACHE_TTL, value);
+        editor.putInt(Constants.Pref.PASSPHRASE_CACHE_TTL, value);
         editor.commit();
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index ceccf7a70..48b959738 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -195,25 +195,25 @@ public class PgpKeyOperation {
             sha1Calc, isMasterKey, keyEncryptor);
     }
 
-    public PGPSecretKeyRing changeSecretKeyPassphrase(PGPSecretKeyRing keyRing, String oldPassPhrase,
-                                          String newPassPhrase)
+    public PGPSecretKeyRing changeSecretKeyPassphrase(PGPSecretKeyRing keyRing, String oldPassphrase,
+                                          String newPassphrase)
         throws IOException, PGPException, NoSuchProviderException {
 
         updateProgress(R.string.progress_building_key, 0, 100);
-        if (oldPassPhrase == null) {
-            oldPassPhrase = "";
+        if (oldPassphrase == null) {
+            oldPassphrase = "";
         }
-        if (newPassPhrase == null) {
-            newPassPhrase = "";
+        if (newPassphrase == null) {
+            newPassphrase = "";
         }
 
         PGPSecretKeyRing newKeyRing = PGPSecretKeyRing.copyWithNewPassword(
                 keyRing,
                 new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder()
                         .setProvider(Constants.BOUNCY_CASTLE_PROVIDER_NAME).build()).setProvider(
-                        Constants.BOUNCY_CASTLE_PROVIDER_NAME).build(oldPassPhrase.toCharArray()),
+                        Constants.BOUNCY_CASTLE_PROVIDER_NAME).build(oldPassphrase.toCharArray()),
                 new JcePBESecretKeyEncryptorBuilder(keyRing.getSecretKey()
-                        .getKeyEncryptionAlgorithm()).build(newPassPhrase.toCharArray()));
+                        .getKeyEncryptionAlgorithm()).build(newPassphrase.toCharArray()));
 
         return newKeyRing;
 
@@ -223,7 +223,7 @@ public class PgpKeyOperation {
                                    ArrayList<String> userIds, ArrayList<PGPSecretKey> keys,
                                    ArrayList<GregorianCalendar> keysExpiryDates,
                                    ArrayList<Integer> keysUsages,
-                                   String newPassPhrase, String oldPassPhrase)
+                                   String newPassphrase, String oldPassphrase)
             throws PgpGeneralMsgIdException, PGPException, SignatureException, IOException {
 
         int usageId = keysUsages.get(0);
@@ -236,7 +236,7 @@ public class PgpKeyOperation {
         PGPPublicKey masterPublicKey = masterKey.getPublicKey();
 
         PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider(
-                Constants.BOUNCY_CASTLE_PROVIDER_NAME).build(oldPassPhrase.toCharArray());
+                Constants.BOUNCY_CASTLE_PROVIDER_NAME).build(oldPassphrase.toCharArray());
         PGPPrivateKey masterPrivateKey = masterKey.extractPrivateKey(keyDecryptor);
 
         updateProgress(R.string.progress_certifying_master_key, 20, 100);
@@ -294,7 +294,7 @@ public class PgpKeyOperation {
         PBESecretKeyEncryptor keyEncryptor = new JcePBESecretKeyEncryptorBuilder(
                 PGPEncryptedData.CAST5, sha1Calc)
                 .setProvider(Constants.BOUNCY_CASTLE_PROVIDER_NAME).build(
-                        newPassPhrase.toCharArray());
+                        newPassphrase.toCharArray());
 
         PGPKeyRingGenerator keyGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION,
                 masterKeyPair, mainUserId, sha1Calc, hashedPacketsGen.generate(),
@@ -310,7 +310,7 @@ public class PgpKeyOperation {
 
             PBESecretKeyDecryptor keyDecryptor2 = new JcePBESecretKeyDecryptorBuilder()
                     .setProvider(Constants.BOUNCY_CASTLE_PROVIDER_NAME).build(
-                            oldPassPhrase.toCharArray());
+                            oldPassphrase.toCharArray());
             PGPPrivateKey subPrivateKey = subKey.extractPrivateKey(keyDecryptor2);
 
             // TODO: now used without algorithm and creation time?! (APG 1)
@@ -375,16 +375,16 @@ public class PgpKeyOperation {
         updateProgress(R.string.progress_building_key, 0, 100);
         PGPSecretKey masterKey = saveParcel.keys.get(0);
 
-        if (saveParcel.oldPassPhrase == null) {
-            saveParcel.oldPassPhrase = "";
+        if (saveParcel.oldPassphrase == null) {
+            saveParcel.oldPassphrase = "";
         }
-        if (saveParcel.newPassPhrase == null) {
-            saveParcel.newPassPhrase = "";
+        if (saveParcel.newPassphrase == null) {
+            saveParcel.newPassphrase = "";
         }
 
         if (mKR == null) {
             return buildNewSecretKey(saveParcel.userIDs, saveParcel.keys, saveParcel.keysExpiryDates,
-                    saveParcel.keysUsages, saveParcel.newPassPhrase, saveParcel.oldPassPhrase); //new Keyring
+                    saveParcel.keysUsages, saveParcel.newPassphrase, saveParcel.oldPassphrase); //new Keyring
         }
 
         /*
@@ -423,7 +423,7 @@ public class PgpKeyOperation {
         String mainUserId = saveParcel.userIDs.get(0);
 
         PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider(
-                Constants.BOUNCY_CASTLE_PROVIDER_NAME).build(saveParcel.oldPassPhrase.toCharArray());
+                Constants.BOUNCY_CASTLE_PROVIDER_NAME).build(saveParcel.oldPassphrase.toCharArray());
         PGPPrivateKey masterPrivateKey = masterKey.extractPrivateKey(keyDecryptor);
 
         updateProgress(R.string.progress_certifying_master_key, 20, 100);
@@ -565,7 +565,7 @@ public class PgpKeyOperation {
         PBESecretKeyEncryptor keyEncryptor = new JcePBESecretKeyEncryptorBuilder(
                 PGPEncryptedData.CAST5, sha1Calc)
                 .setProvider(Constants.BOUNCY_CASTLE_PROVIDER_NAME).build(
-                        saveParcel.oldPassPhrase.toCharArray());
+                        saveParcel.oldPassphrase.toCharArray());
 
         //this generates one more signature than necessary...
         PGPKeyRingGenerator keyGen = new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION,
@@ -586,7 +586,7 @@ public class PgpKeyOperation {
                 } else {
                     keyDecryptor2 = new JcePBESecretKeyDecryptorBuilder()
                             .setProvider(Constants.BOUNCY_CASTLE_PROVIDER_NAME).build(
-                                    saveParcel.oldPassPhrase.toCharArray());
+                                    saveParcel.oldPassphrase.toCharArray());
                 }
                 PGPPrivateKey subPrivateKey = subKey.extractPrivateKey(keyDecryptor2);
                 PGPKeyPair subKeyPair = new PGPKeyPair(subPublicKey, subPrivateKey);
@@ -667,7 +667,7 @@ public class PgpKeyOperation {
         PBESecretKeyEncryptor keyEncryptorNew = new JcePBESecretKeyEncryptorBuilder(
                 PGPEncryptedData.CAST5, sha1Calc)
                 .setProvider(Constants.BOUNCY_CASTLE_PROVIDER_NAME).build(
-                        saveParcel.newPassPhrase.toCharArray());
+                        saveParcel.newPassphrase.toCharArray());
 
         //update the passphrase
         mKR = PGPSecretKeyRing.copyWithNewPassword(mKR, keyDecryptor, keyEncryptorNew);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index 1c334e6d6..e9c949246 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -488,16 +488,16 @@ public class KeychainIntentService extends IntentService
             try {
                 /* Input */
                 SaveKeyringParcel saveParams = data.getParcelable(SAVE_KEYRING_PARCEL);
-                String oldPassPhrase = saveParams.oldPassPhrase;
-                String newPassPhrase = saveParams.newPassPhrase;
+                String oldPassphrase = saveParams.oldPassphrase;
+                String newPassphrase = saveParams.newPassphrase;
                 boolean canSign = true;
 
                 if (data.containsKey(SAVE_KEYRING_CAN_SIGN)) {
                     canSign = data.getBoolean(SAVE_KEYRING_CAN_SIGN);
                 }
 
-                if (newPassPhrase == null) {
-                    newPassPhrase = oldPassPhrase;
+                if (newPassphrase == null) {
+                    newPassphrase = oldPassphrase;
                 }
 
                 long masterKeyId = saveParams.keys.get(0).getKeyID();
@@ -508,7 +508,7 @@ public class KeychainIntentService extends IntentService
                     PGPSecretKeyRing keyRing = ProviderHelper
                             .getPGPSecretKeyRingByKeyId(this, masterKeyId);
                     keyRing = keyOperations.changeSecretKeyPassphrase(keyRing,
-                            oldPassPhrase, newPassPhrase);
+                            oldPassphrase, newPassphrase);
                     setProgress(R.string.progress_saving_key_ring, 50, 100);
                     ProviderHelper.saveKeyRing(this, keyRing);
                     setProgress(R.string.progress_done, 100, 100);
@@ -526,7 +526,7 @@ public class KeychainIntentService extends IntentService
                     ProviderHelper.saveKeyRing(this, pair.second);
                     setProgress(R.string.progress_done, 100, 100);
                 }
-                PassphraseCacheService.addCachedPassphrase(this, masterKeyId, newPassPhrase);
+                PassphraseCacheService.addCachedPassphrase(this, masterKeyId, newPassphrase);
 
                 /* Output */
                 sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY);
@@ -816,9 +816,9 @@ public class KeychainIntentService extends IntentService
                 ArrayList<String> userIds = data.getStringArrayList(CERTIFY_KEY_UIDS);
 
                 /* Operation */
-                String signaturePassPhrase = PassphraseCacheService.getCachedPassphrase(this,
+                String signaturePassphrase = PassphraseCacheService.getCachedPassphrase(this,
                         masterKeyId);
-                if (signaturePassPhrase == null) {
+                if (signaturePassphrase == null) {
                     throw new PgpGeneralException("Unable to obtain passphrase");
                 }
 
@@ -829,7 +829,7 @@ public class KeychainIntentService extends IntentService
                 PGPSecretKey certificationKey = PgpKeyHelper.getCertificationKey(this,
                         masterKeyId);
                 publicKey = keyOperation.certifyKey(certificationKey, publicKey,
-                        userIds, signaturePassPhrase);
+                        userIds, signaturePassphrase);
                 publicRing = PGPPublicKeyRing.insertPublicKey(publicRing, publicKey);
 
                 // store the signed key in our local cache
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index bdce9069e..a4b6ab6b9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -95,7 +95,7 @@ public class PassphraseCacheService extends Service {
 
         Intent intent = new Intent(context, PassphraseCacheService.class);
         intent.setAction(ACTION_PASSPHRASE_CACHE_ADD);
-        intent.putExtra(EXTRA_TTL, Preferences.getPreferences(context).getPassPhraseCacheTtl());
+        intent.putExtra(EXTRA_TTL, Preferences.getPreferences(context).getPassphraseCacheTtl());
         intent.putExtra(EXTRA_PASSPHRASE, passphrase);
         intent.putExtra(EXTRA_KEY_ID, keyId);
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
index 7012bfafd..7c2dcf2c1 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
@@ -38,8 +38,8 @@ public class SaveKeyringParcel implements Parcelable {
     public ArrayList<PGPSecretKey> deletedKeys;
     public ArrayList<GregorianCalendar> keysExpiryDates;
     public ArrayList<Integer> keysUsages;
-    public String newPassPhrase;
-    public String oldPassPhrase;
+    public String newPassphrase;
+    public String oldPassphrase;
     public boolean[] newKeys;
     public ArrayList<PGPSecretKey> keys;
     public String originalPrimaryID;
@@ -61,8 +61,8 @@ public class SaveKeyringParcel implements Parcelable {
         }
         keysExpiryDates = (ArrayList<GregorianCalendar>) source.readSerializable();
         keysUsages = source.readArrayList(Integer.class.getClassLoader());
-        newPassPhrase = source.readString();
-        oldPassPhrase = source.readString();
+        newPassphrase = source.readString();
+        oldPassphrase = source.readString();
         newKeys = source.createBooleanArray();
         keys = PgpConversionHelper.BytesToPGPSecretKeyList(source.createByteArray());
         originalPrimaryID = source.readString();
@@ -83,8 +83,8 @@ public class SaveKeyringParcel implements Parcelable {
         destination.writeByteArray(tmp);
         destination.writeSerializable(keysExpiryDates);
         destination.writeList(keysUsages);
-        destination.writeString(newPassPhrase);
-        destination.writeString(oldPassPhrase);
+        destination.writeString(newPassphrase);
+        destination.writeString(oldPassphrase);
         destination.writeBooleanArray(newKeys);
         destination.writeByteArray(PgpConversionHelper.PGPSecretKeyArrayListToBytes(keys));
         destination.writeString(originalPrimaryID);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index e0286b566..30636f849 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -97,9 +97,9 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
     private SectionView mKeysView;
 
     private String mCurrentPassphrase = null;
-    private String mNewPassPhrase = null;
-    private String mSavedNewPassPhrase = null;
-    private boolean mIsPassPhraseSet;
+    private String mNewPassphrase = null;
+    private String mSavedNewPassphrase = null;
+    private boolean mIsPassphraseSet;
     private boolean mNeedsSaving;
     private boolean mIsBrandNewKeyring = false;
 
@@ -403,8 +403,8 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
         mCurrentPassphrase = "";
         buildLayout(false);
 
-        mIsPassPhraseSet = PassphraseCacheService.hasPassphrase(this, masterKeyId);
-        if (!mIsPassPhraseSet) {
+        mIsPassphraseSet = PassphraseCacheService.hasPassphrase(this, masterKeyId);
+        if (!mIsPassphraseSet) {
             // check "no passphrase" checkbox and remove button
             mNoPassphrase.setChecked(true);
             mChangePassphrase.setVisibility(View.GONE);
@@ -423,10 +423,10 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
                     Bundle data = message.getData();
 
                     // set new returned passphrase!
-                    mNewPassPhrase = data
+                    mNewPassphrase = data
                             .getString(SetPassphraseDialogFragment.MESSAGE_NEW_PASSPHRASE);
 
-                    updatePassPhraseButtonText();
+                    updatePassphraseButtonText();
                     somethingChanged();
                 }
             }
@@ -466,7 +466,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
         LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
         LinearLayout container = (LinearLayout) findViewById(R.id.edit_key_container);
-        if (mIsPassPhraseSet) {
+        if (mIsPassphraseSet) {
             mChangePassphrase.setText(getString(R.string.btn_change_passphrase));
         }
         mUserIdsView = (SectionView) inflater.inflate(R.layout.edit_key_section, container, false);
@@ -482,7 +482,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
         mKeysView.setEditorListener(this);
         container.addView(mKeysView);
 
-        updatePassPhraseButtonText();
+        updatePassphraseButtonText();
 
         mChangePassphrase.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
@@ -497,11 +497,11 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (isChecked) {
                     // remove passphrase
-                    mSavedNewPassPhrase = mNewPassPhrase;
-                    mNewPassPhrase = "";
+                    mSavedNewPassphrase = mNewPassphrase;
+                    mNewPassphrase = "";
                     mChangePassphrase.setVisibility(View.GONE);
                 } else {
-                    mNewPassPhrase = mSavedNewPassPhrase;
+                    mNewPassphrase = mSavedNewPassphrase;
                     mChangePassphrase.setVisibility(View.VISIBLE);
                 }
                 somethingChanged();
@@ -519,8 +519,8 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
     public boolean isPassphraseSet() {
         if (mNoPassphrase.isChecked()) {
             return true;
-        } else if ((mIsPassPhraseSet)
-                || (mNewPassPhrase != null && !mNewPassPhrase.equals(""))) {
+        } else if ((mIsPassphraseSet)
+                || (mNewPassphrase != null && !mNewPassphrase.equals(""))) {
             return true;
         } else {
             return false;
@@ -530,9 +530,9 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
     public boolean hasPassphraseChanged() {
         if (mNoPassphrase != null) {
             if (mNoPassphrase.isChecked()) {
-                return mIsPassPhraseSet;
+                return mIsPassphraseSet;
             } else {
-                return (mNewPassPhrase != null && !mNewPassPhrase.equals(""));
+                return (mNewPassphrase != null && !mNewPassphrase.equals(""));
             }
         } else {
             return false;
@@ -548,7 +548,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
                 }
 
                 String passphrase;
-                if (mIsPassPhraseSet) {
+                if (mIsPassphraseSet) {
                     passphrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId);
                 } else {
                     passphrase = "";
@@ -638,8 +638,8 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
             saveParams.deletedKeys = mKeysView.getDeletedKeys();
             saveParams.keysExpiryDates = getKeysExpiryDates(mKeysView);
             saveParams.keysUsages = getKeysUsages(mKeysView);
-            saveParams.newPassPhrase = mNewPassPhrase;
-            saveParams.oldPassPhrase = mCurrentPassphrase;
+            saveParams.newPassphrase = mNewPassphrase;
+            saveParams.oldPassphrase = mCurrentPassphrase;
             saveParams.newKeys = toPrimitiveArray(mKeysView.getNewKeysArray());
             saveParams.keys = getKeys(mKeysView);
             saveParams.originalPrimaryID = mUserIdsView.getOriginalPrimaryID();
@@ -819,7 +819,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
         return keysExpiryDates;
     }
 
-    private void updatePassPhraseButtonText() {
+    private void updatePassphraseButtonText() {
         mChangePassphrase.setText(isPassphraseSet() ? getString(R.string.btn_change_passphrase)
                 : getString(R.string.btn_set_passphrase));
     }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
index c8ea6ffb7..8b440a552 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
@@ -224,9 +224,9 @@ public class EncryptFileFragment extends Fragment {
         if (mEncryptInterface.isModeSymmetric()) {
             // symmetric encryption
 
-            boolean gotPassPhrase = (mEncryptInterface.getPassphrase() != null
+            boolean gotPassphrase = (mEncryptInterface.getPassphrase() != null
                     && mEncryptInterface.getPassphrase().length() != 0);
-            if (!gotPassPhrase) {
+            if (!gotPassphrase) {
                 AppMsg.makeText(getActivity(), R.string.passphrase_must_not_be_empty, AppMsg.STYLE_ALERT)
                         .show();
                 return;
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
index 4522acf4e..a7818a1d8 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
@@ -125,9 +125,9 @@ public class EncryptMessageFragment extends Fragment {
         if (mEncryptInterface.isModeSymmetric()) {
             // symmetric encryption
 
-            boolean gotPassPhrase = (mEncryptInterface.getPassphrase() != null
+            boolean gotPassphrase = (mEncryptInterface.getPassphrase() != null
                     && mEncryptInterface.getPassphrase().length() != 0);
-            if (!gotPassPhrase) {
+            if (!gotPassphrase) {
                 AppMsg.makeText(getActivity(), R.string.passphrase_must_not_be_empty, AppMsg.STYLE_ALERT)
                         .show();
                 return;
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
index 54d37c72f..57841edde 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
@@ -61,8 +61,8 @@ public class PreferencesActivity extends PreferenceActivity {
         if (action != null && action.equals(ACTION_PREFS_GEN)) {
             addPreferencesFromResource(R.xml.gen_preferences);
 
-            initializePassPassPhraceCacheTtl(
-                    (IntegerListPreference) findPreference(Constants.Pref.PASS_PHRASE_CACHE_TTL));
+            initializePassPassphraceCacheTtl(
+                    (IntegerListPreference) findPreference(Constants.Pref.PASSPHRASE_CACHE_TTL));
 
             mKeyServerPreference = (PreferenceScreen) findPreference(Constants.Pref.KEY_SERVERS);
             String servers[] = sPreferences.getKeyServers();
@@ -165,8 +165,8 @@ public class PreferencesActivity extends PreferenceActivity {
             // Load the preferences from an XML resource
             addPreferencesFromResource(R.xml.gen_preferences);
 
-            initializePassPassPhraceCacheTtl(
-                    (IntegerListPreference) findPreference(Constants.Pref.PASS_PHRASE_CACHE_TTL));
+            initializePassPassphraceCacheTtl(
+                    (IntegerListPreference) findPreference(Constants.Pref.PASSPHRASE_CACHE_TTL));
 
             mKeyServerPreference = (PreferenceScreen) findPreference(Constants.Pref.KEY_SERVERS);
             String servers[] = sPreferences.getKeyServers();
@@ -261,15 +261,15 @@ public class PreferencesActivity extends PreferenceActivity {
                 || super.isValidFragment(fragmentName);
     }
 
-    private static void initializePassPassPhraceCacheTtl(final IntegerListPreference mPassphraseCacheTtl) {
-        mPassphraseCacheTtl.setValue("" + sPreferences.getPassPhraseCacheTtl());
+    private static void initializePassPassphraceCacheTtl(final IntegerListPreference mPassphraseCacheTtl) {
+        mPassphraseCacheTtl.setValue("" + sPreferences.getPassphraseCacheTtl());
         mPassphraseCacheTtl.setSummary(mPassphraseCacheTtl.getEntry());
         mPassphraseCacheTtl
                 .setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                     public boolean onPreferenceChange(Preference preference, Object newValue) {
                         mPassphraseCacheTtl.setValue(newValue.toString());
                         mPassphraseCacheTtl.setSummary(mPassphraseCacheTtl.getEntry());
-                        sPreferences.setPassPhraseCacheTtl(Integer.parseInt(newValue.toString()));
+                        sPreferences.setPassphraseCacheTtl(Integer.parseInt(newValue.toString()));
                         return false;
                     }
                 });