Use more generic 'Security Token' where possible, add sutitle to create key what tokens are supported

55 files changed, 741 insertions, 715 deletions

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 945d7164c..c301973d2 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -761,7 +761,7 @@
               taskAffinity and allowTaskReparenting somehow prevents this from happening!
          -->
         <activity
-            android:name=".ui.NfcOperationActivity"
+            android:name=".ui.SecurityTokenOperationActivity"
             android:allowTaskReparenting="true"
             android:launchMode="singleTop"
             android:taskAffinity=":Nfc"
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index 7bac8aa97..3e48abccb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -105,7 +105,7 @@ public final class Constants {
         public static final String CACHED_CONSOLIDATE = "cachedConsolidate";
         public static final String SEARCH_KEYSERVER = "search_keyserver_pref";
         public static final String SEARCH_KEYBASE = "search_keybase_pref";
-        public static final String USE_NUMKEYPAD_FOR_YUBIKEY_PIN = "useNumKeypadForYubikeyPin";
+        public static final String USE_NUMKEYPAD_FOR_SECURITY_TOKEN_PIN = "useNumKeypadForYubikeyPin";
         public static final String ENCRYPT_FILENAMES = "encryptFilenames";
         public static final String FILE_USE_COMPRESSION = "useFileCompression";
         public static final String TEXT_USE_COMPRESSION = "useTextCompression";
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
index ed2123987..1e90c2cc3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
@@ -562,9 +562,9 @@ public abstract class OperationResult implements Parcelable {
         MSG_MF_ERROR_CONFLICTING_NFC_COMMANDS(LogLevel.ERROR, R.string.msg_mf_error_conflicting_nfc_commands),
         MSG_MF_ERROR_DUPLICATE_KEYTOCARD_FOR_SLOT(LogLevel.ERROR, R.string.msg_mf_error_duplicate_keytocard_for_slot),
         MSG_MF_ERROR_INVALID_FLAGS_FOR_KEYTOCARD(LogLevel.ERROR, R.string.msg_mf_error_invalid_flags_for_keytocard),
-        MSG_MF_ERROR_BAD_NFC_ALGO(LogLevel.ERROR, R.string.edit_key_error_bad_nfc_algo),
-        MSG_MF_ERROR_BAD_NFC_SIZE(LogLevel.ERROR, R.string.edit_key_error_bad_nfc_size),
-        MSG_MF_ERROR_BAD_NFC_STRIPPED(LogLevel.ERROR, R.string.edit_key_error_bad_nfc_stripped),
+        MSG_MF_ERROR_BAD_SECURITY_TOKEN_ALGO(LogLevel.ERROR, R.string.edit_key_error_bad_security_token_algo),
+        MSG_MF_ERROR_BAD_SECURITY_TOKEN_SIZE(LogLevel.ERROR, R.string.edit_key_error_bad_security_token_size),
+        MSG_MF_ERROR_BAD_SECURITY_TOKEN_STRIPPED(LogLevel.ERROR, R.string.edit_key_error_bad_security_token_stripped),
         MSG_MF_MASTER (LogLevel.DEBUG, R.string.msg_mf_master),
         MSG_MF_NOTATION_PIN (LogLevel.DEBUG, R.string.msg_mf_notation_pin),
         MSG_MF_NOTATION_EMPTY (LogLevel.DEBUG, R.string.msg_mf_notation_empty),
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 59b840054..40a17a918 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -413,8 +413,8 @@ public class PgpKeyOperation {
         boolean hasEncrypt = false;
         boolean hasAuth = false;
         for(SaveKeyringParcel.SubkeyChange change : saveParcel.mChangeSubKeys) {
-            if (change.mMoveKeyToCard) {
-                // If this is a keytocard operation, see if it was completed: look for a hash
+            if (change.mMoveKeyToSecurityToken) {
+                // If this is a moveKeyToSecurityToken operation, see if it was completed: look for a hash
                 // matching the given subkey ID in cryptoData.
                 byte[] subKeyId = new byte[8];
                 ByteBuffer buf = ByteBuffer.wrap(subKeyId);
@@ -422,13 +422,13 @@ public class PgpKeyOperation {
 
                 byte[] serialNumber = cryptoInput.getCryptoData().get(buf);
                 if (serialNumber != null) {
-                    change.mMoveKeyToCard = false;
-                    change.mDummyDivert = serialNumber;
+                    change.mMoveKeyToSecurityToken = false;
+                    change.mSecurityTokenSerialNo = serialNumber;
                 }
             }
 
-            if (change.mMoveKeyToCard) {
-                // Pending keytocard operation. Need to make sure that we don't have multiple
+            if (change.mMoveKeyToSecurityToken) {
+                // Pending moveKeyToSecurityToken operation. Need to make sure that we don't have multiple
                 // subkeys pending for the same slot.
                 CanonicalizedSecretKey wsK = wsKR.getSecretKey(change.mKeyId);
 
@@ -810,26 +810,26 @@ public class PgpKeyOperation {
                     // no really, it is. this operation irrevocably removes the private key data from the key
                     sKey = PGPSecretKey.constructGnuDummyKey(sKey.getPublicKey());
                     sKR = PGPSecretKeyRing.insertSecretKey(sKR, sKey);
-                } else if (change.mMoveKeyToCard) {
-                    if (checkSmartCardCompatibility(sKey, log, indent + 1)) {
+                } else if (change.mMoveKeyToSecurityToken) {
+                    if (checkSecurityTokenCompatibility(sKey, log, indent + 1)) {
                         log.add(LogType.MSG_MF_KEYTOCARD_START, indent + 1,
                                 KeyFormattingUtils.convertKeyIdToHex(change.mKeyId));
                         nfcKeyToCardOps.addSubkey(change.mKeyId);
                     } else {
-                        // Appropriate log message already set by checkSmartCardCompatibility
+                        // Appropriate log message already set by checkSecurityTokenCompatibility
                         return new PgpEditKeyResult(EditKeyResult.RESULT_ERROR, log, null);
                     }
-                } else if (change.mDummyDivert != null) {
+                } else if (change.mSecurityTokenSerialNo != null) {
                     // NOTE: Does this code get executed? Or always handled in internalRestricted?
-                    if (change.mDummyDivert.length != 16) {
+                    if (change.mSecurityTokenSerialNo.length != 16) {
                         log.add(LogType.MSG_MF_ERROR_DIVERT_SERIAL,
                                 indent + 1, KeyFormattingUtils.convertKeyIdToHex(change.mKeyId));
                         return new PgpEditKeyResult(PgpEditKeyResult.RESULT_ERROR, log, null);
                     }
                     log.add(LogType.MSG_MF_KEYTOCARD_FINISH, indent + 1,
                             KeyFormattingUtils.convertKeyIdToHex(change.mKeyId),
-                            Hex.toHexString(change.mDummyDivert, 8, 6));
-                    sKey = PGPSecretKey.constructGnuDummyKey(sKey.getPublicKey(), change.mDummyDivert);
+                            Hex.toHexString(change.mSecurityTokenSerialNo, 8, 6));
+                    sKey = PGPSecretKey.constructGnuDummyKey(sKey.getPublicKey(), change.mSecurityTokenSerialNo);
                     sKR = PGPSecretKeyRing.insertSecretKey(sKR, sKey);
                 }
 
@@ -1063,22 +1063,22 @@ public class PgpKeyOperation {
                 indent -= 1;
             }
 
-            // 7. if requested, change PIN and/or Admin PIN on card
-            if (saveParcel.mCardPin != null) {
+            // 7. if requested, change PIN and/or Admin PIN on security token
+            if (saveParcel.mSecurityTokenPin != null) {
                 progress(R.string.progress_modify_pin, 90);
                 log.add(LogType.MSG_MF_PIN, indent);
                 indent += 1;
 
-                nfcKeyToCardOps.setPin(saveParcel.mCardPin);
+                nfcKeyToCardOps.setPin(saveParcel.mSecurityTokenPin);
 
                 indent -= 1;
             }
-            if (saveParcel.mCardAdminPin != null) {
+            if (saveParcel.mSecurityTokenAdminPin != null) {
                 progress(R.string.progress_modify_admin_pin, 90);
                 log.add(LogType.MSG_MF_ADMIN_PIN, indent);
                 indent += 1;
 
-                nfcKeyToCardOps.setAdminPin(saveParcel.mCardAdminPin);
+                nfcKeyToCardOps.setAdminPin(saveParcel.mSecurityTokenAdminPin);
 
                 indent -= 1;
             }
@@ -1157,22 +1157,22 @@ public class PgpKeyOperation {
                 return new PgpEditKeyResult(PgpEditKeyResult.RESULT_ERROR, log, null);
             }
 
-            if (change.mDummyStrip || change.mDummyDivert != null) {
+            if (change.mDummyStrip || change.mSecurityTokenSerialNo != null) {
                 // IT'S DANGEROUS~
                 // no really, it is. this operation irrevocably removes the private key data from the key
                 if (change.mDummyStrip) {
                     sKey = PGPSecretKey.constructGnuDummyKey(sKey.getPublicKey());
                 } else {
                     // the serial number must be 16 bytes in length
-                    if (change.mDummyDivert.length != 16) {
+                    if (change.mSecurityTokenSerialNo.length != 16) {
                         log.add(LogType.MSG_MF_ERROR_DIVERT_SERIAL,
                                 indent + 1, KeyFormattingUtils.convertKeyIdToHex(change.mKeyId));
                         return new PgpEditKeyResult(PgpEditKeyResult.RESULT_ERROR, log, null);
                     }
                     log.add(LogType.MSG_MF_KEYTOCARD_FINISH, indent + 1,
                             KeyFormattingUtils.convertKeyIdToHex(change.mKeyId),
-                            Hex.toHexString(change.mDummyDivert, 8, 6));
-                    sKey = PGPSecretKey.constructGnuDummyKey(sKey.getPublicKey(), change.mDummyDivert);
+                            Hex.toHexString(change.mSecurityTokenSerialNo, 8, 6));
+                    sKey = PGPSecretKey.constructGnuDummyKey(sKey.getPublicKey(), change.mSecurityTokenSerialNo);
                 }
                 sKR = PGPSecretKeyRing.insertSecretKey(sKR, sKey);
             }
@@ -1625,26 +1625,26 @@ public class PgpKeyOperation {
                 && s2k.getProtectionMode() == S2K.GNU_PROTECTION_MODE_DIVERT_TO_CARD;
     }
 
-    private static boolean checkSmartCardCompatibility(PGPSecretKey key, OperationLog log, int indent) {
+    private static boolean checkSecurityTokenCompatibility(PGPSecretKey key, OperationLog log, int indent) {
         PGPPublicKey publicKey = key.getPublicKey();
         int algorithm = publicKey.getAlgorithm();
         if (algorithm != PublicKeyAlgorithmTags.RSA_ENCRYPT &&
                 algorithm != PublicKeyAlgorithmTags.RSA_SIGN &&
                 algorithm != PublicKeyAlgorithmTags.RSA_GENERAL) {
-            log.add(LogType.MSG_MF_ERROR_BAD_NFC_ALGO, indent + 1);
+            log.add(LogType.MSG_MF_ERROR_BAD_SECURITY_TOKEN_ALGO, indent + 1);
             return false;
         }
 
         // Key size must be 2048
         int keySize = publicKey.getBitStrength();
         if (keySize != 2048) {
-            log.add(LogType.MSG_MF_ERROR_BAD_NFC_SIZE, indent + 1);
+            log.add(LogType.MSG_MF_ERROR_BAD_SECURITY_TOKEN_SIZE, indent + 1);
             return false;
         }
 
         // Secret key parts must be available
         if (isDivertToCard(key) || isDummy(key)) {
-            log.add(LogType.MSG_MF_ERROR_BAD_NFC_STRIPPED, indent + 1);
+            log.add(LogType.MSG_MF_ERROR_BAD_SECURITY_TOKEN_STRIPPED, indent + 1);
             return false;
         }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index a6d505763..15c83d4dc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -59,7 +59,7 @@ import org.sufficientlysecure.keychain.remote.ui.SelectSignKeyIdActivity;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
 import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
 import org.sufficientlysecure.keychain.ui.ImportKeysActivity;
-import org.sufficientlysecure.keychain.ui.NfcOperationActivity;
+import org.sufficientlysecure.keychain.ui.SecurityTokenOperationActivity;
 import org.sufficientlysecure.keychain.ui.PassphraseDialogActivity;
 import org.sufficientlysecure.keychain.ui.ViewKeyActivity;
 import org.sufficientlysecure.keychain.util.InputData;
@@ -191,12 +191,12 @@ public class OpenPgpService extends Service {
             case NFC_MOVE_KEY_TO_CARD:
             case NFC_DECRYPT:
             case NFC_SIGN: {
-                // build PendingIntent for YubiKey NFC operations
-                Intent intent = new Intent(context, NfcOperationActivity.class);
+                // build PendingIntent for Security Token NFC operations
+                Intent intent = new Intent(context, SecurityTokenOperationActivity.class);
                 // pass params through to activity that it can be returned again later to repeat pgp operation
-                intent.putExtra(NfcOperationActivity.EXTRA_SERVICE_INTENT, data);
-                intent.putExtra(NfcOperationActivity.EXTRA_REQUIRED_INPUT, requiredInput);
-                intent.putExtra(NfcOperationActivity.EXTRA_CRYPTO_INPUT, cryptoInput);
+                intent.putExtra(SecurityTokenOperationActivity.EXTRA_SERVICE_INTENT, data);
+                intent.putExtra(SecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, requiredInput);
+                intent.putExtra(SecurityTokenOperationActivity.EXTRA_CRYPTO_INPUT, cryptoInput);
                 return PendingIntent.getActivity(context, 0, intent,
                         PendingIntent.FLAG_CANCEL_CURRENT);
             }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
index 6959fca56..472eb3b18 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
@@ -61,9 +61,9 @@ public class SaveKeyringParcel implements Parcelable {
     public ArrayList<String> mRevokeUserIds;
     public ArrayList<Long> mRevokeSubKeys;
 
-    // if these are non-null, PINs will be changed on the card
-    public Passphrase mCardPin;
-    public Passphrase mCardAdminPin;
+    // if these are non-null, PINs will be changed on the token
+    public Passphrase mSecurityTokenPin;
+    public Passphrase mSecurityTokenAdminPin;
 
     // private because they have to be set together with setUpdateOptions
     private boolean mUpload;
@@ -89,8 +89,8 @@ public class SaveKeyringParcel implements Parcelable {
         mChangeSubKeys = new ArrayList<>();
         mRevokeUserIds = new ArrayList<>();
         mRevokeSubKeys = new ArrayList<>();
-        mCardPin = null;
-        mCardAdminPin = null;
+        mSecurityTokenPin = null;
+        mSecurityTokenAdminPin = null;
         mUpload = false;
         mUploadAtomic = false;
         mKeyserver = null;
@@ -128,7 +128,7 @@ public class SaveKeyringParcel implements Parcelable {
 
         for (SubkeyChange change : mChangeSubKeys) {
             if (change.mRecertify || change.mFlags != null || change.mExpiry != null
-                    || change.mMoveKeyToCard) {
+                    || change.mMoveKeyToSecurityToken) {
                 return false;
             }
         }
@@ -175,11 +175,11 @@ public class SaveKeyringParcel implements Parcelable {
         public boolean mRecertify;
         // if this flag is true, the subkey should be changed to a stripped key
         public boolean mDummyStrip;
-        // if this flag is true, the subkey should be moved to a card
-        public boolean mMoveKeyToCard;
+        // if this flag is true, the subkey should be moved to a security token
+        public boolean mMoveKeyToSecurityToken;
         // if this is non-null, the subkey will be changed to a divert-to-card
-        // key for the given serial number
-        public byte[] mDummyDivert;
+        // (security token) key for the given serial number
+        public byte[] mSecurityTokenSerialNo;
 
         public SubkeyChange(long keyId) {
             mKeyId = keyId;
@@ -196,16 +196,17 @@ public class SaveKeyringParcel implements Parcelable {
             mExpiry = expiry;
         }
 
-        public SubkeyChange(long keyId, boolean dummyStrip, boolean moveKeyToCard) {
+        public SubkeyChange(long keyId, boolean dummyStrip, boolean moveKeyToSecurityToken) {
             this(keyId, null, null);
 
             // these flags are mutually exclusive!
-            if (dummyStrip && moveKeyToCard) {
+            if (dummyStrip && moveKeyToSecurityToken) {
                 throw new AssertionError(
-                        "cannot set strip and keytocard flags at the same time - this is a bug!");
+                        "cannot set strip and moveKeyToSecurityToken" +
+                                " flags at the same time - this is a bug!");
             }
             mDummyStrip = dummyStrip;
-            mMoveKeyToCard = moveKeyToCard;
+            mMoveKeyToSecurityToken = moveKeyToSecurityToken;
         }
 
         @Override
@@ -214,8 +215,8 @@ public class SaveKeyringParcel implements Parcelable {
             out += "mFlags: " + mFlags + ", ";
             out += "mExpiry: " + mExpiry + ", ";
             out += "mDummyStrip: " + mDummyStrip + ", ";
-            out += "mMoveKeyToCard: " + mMoveKeyToCard + ", ";
-            out += "mDummyDivert: [" + (mDummyDivert == null ? 0 : mDummyDivert.length) + " bytes]";
+            out += "mMoveKeyToSecurityToken: " + mMoveKeyToSecurityToken + ", ";
+            out += "mSecurityTokenSerialNo: [" + (mSecurityTokenSerialNo == null ? 0 : mSecurityTokenSerialNo.length) + " bytes]";
 
             return out;
         }
@@ -259,8 +260,8 @@ public class SaveKeyringParcel implements Parcelable {
         mRevokeUserIds = source.createStringArrayList();
         mRevokeSubKeys = (ArrayList<Long>) source.readSerializable();
 
-        mCardPin = source.readParcelable(Passphrase.class.getClassLoader());
-        mCardAdminPin  = source.readParcelable(Passphrase.class.getClassLoader());
+        mSecurityTokenPin = source.readParcelable(Passphrase.class.getClassLoader());
+        mSecurityTokenAdminPin = source.readParcelable(Passphrase.class.getClassLoader());
 
         mUpload = source.readByte() != 0;
         mUploadAtomic = source.readByte() != 0;
@@ -288,8 +289,8 @@ public class SaveKeyringParcel implements Parcelable {
         destination.writeStringList(mRevokeUserIds);
         destination.writeSerializable(mRevokeSubKeys);
 
-        destination.writeParcelable(mCardPin, flags);
-        destination.writeParcelable(mCardAdminPin, flags);
+        destination.writeParcelable(mSecurityTokenPin, flags);
+        destination.writeParcelable(mSecurityTokenAdminPin, flags);
 
         destination.writeByte((byte) (mUpload ? 1 : 0));
         destination.writeByte((byte) (mUploadAtomic ? 1 : 0));
@@ -322,8 +323,8 @@ public class SaveKeyringParcel implements Parcelable {
         out += "mChangePrimaryUserId: " + mChangePrimaryUserId + "\n";
         out += "mRevokeUserIds: " + mRevokeUserIds + "\n";
         out += "mRevokeSubKeys: " + mRevokeSubKeys + "\n";
-        out += "mCardPin: " + mCardPin + "\n";
-        out += "mCardAdminPin: " + mCardAdminPin;
+        out += "mSecurityTokenPin: " + mSecurityTokenPin + "\n";
+        out += "mSecurityTokenAdminPin: " + mSecurityTokenAdminPin;
 
         return out;
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
index a4163d7f9..925888813 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
@@ -28,7 +28,7 @@ import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
 import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
-import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity;
+import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.Passphrase;
 import org.sufficientlysecure.keychain.util.Preferences;
@@ -36,16 +36,16 @@ import org.sufficientlysecure.keychain.util.Preferences;
 import java.io.IOException;
 import java.util.ArrayList;
 
-public class CreateKeyActivity extends BaseNfcActivity {
+public class CreateKeyActivity extends BaseSecurityTokenNfcActivity {
 
     public static final String EXTRA_NAME = "name";
     public static final String EXTRA_EMAIL = "email";
     public static final String EXTRA_FIRST_TIME = "first_time";
     public static final String EXTRA_ADDITIONAL_EMAILS = "additional_emails";
     public static final String EXTRA_PASSPHRASE = "passphrase";
-    public static final String EXTRA_CREATE_YUBI_KEY = "create_yubi_key";
-    public static final String EXTRA_YUBI_KEY_PIN = "yubi_key_pin";
-    public static final String EXTRA_YUBI_KEY_ADMIN_PIN = "yubi_key_admin_pin";
+    public static final String EXTRA_CREATE_SECURITY_TOKEN = "create_yubi_key";
+    public static final String EXTRA_SECURITY_TOKEN_PIN = "yubi_key_pin";
+    public static final String EXTRA_SECURITY_TOKEN_ADMIN_PIN = "yubi_key_admin_pin";
 
     public static final String EXTRA_NFC_USER_ID = "nfc_user_id";
     public static final String EXTRA_NFC_AID = "nfc_aid";
@@ -58,9 +58,9 @@ public class CreateKeyActivity extends BaseNfcActivity {
     ArrayList<String> mAdditionalEmails;
     Passphrase mPassphrase;
     boolean mFirstTime;
-    boolean mCreateYubiKey;
-    Passphrase mYubiKeyPin;
-    Passphrase mYubiKeyAdminPin;
+    boolean mCreateSecurityToken;
+    Passphrase mSecurityTokenPin;
+    Passphrase mSecurityTokenAdminPin;
 
     Fragment mCurrentFragment;
 
@@ -93,9 +93,9 @@ public class CreateKeyActivity extends BaseNfcActivity {
             mAdditionalEmails = savedInstanceState.getStringArrayList(EXTRA_ADDITIONAL_EMAILS);
             mPassphrase = savedInstanceState.getParcelable(EXTRA_PASSPHRASE);
             mFirstTime = savedInstanceState.getBoolean(EXTRA_FIRST_TIME);
-            mCreateYubiKey = savedInstanceState.getBoolean(EXTRA_CREATE_YUBI_KEY);
-            mYubiKeyPin = savedInstanceState.getParcelable(EXTRA_YUBI_KEY_PIN);
-            mYubiKeyAdminPin = savedInstanceState.getParcelable(EXTRA_YUBI_KEY_ADMIN_PIN);
+            mCreateSecurityToken = savedInstanceState.getBoolean(EXTRA_CREATE_SECURITY_TOKEN);
+            mSecurityTokenPin = savedInstanceState.getParcelable(EXTRA_SECURITY_TOKEN_PIN);
+            mSecurityTokenAdminPin = savedInstanceState.getParcelable(EXTRA_SECURITY_TOKEN_ADMIN_PIN);
 
             mCurrentFragment = getSupportFragmentManager().findFragmentByTag(FRAGMENT_TAG);
         } else {
@@ -105,7 +105,7 @@ public class CreateKeyActivity extends BaseNfcActivity {
             mName = intent.getStringExtra(EXTRA_NAME);
             mEmail = intent.getStringExtra(EXTRA_EMAIL);
             mFirstTime = intent.getBooleanExtra(EXTRA_FIRST_TIME, false);
-            mCreateYubiKey = intent.getBooleanExtra(EXTRA_CREATE_YUBI_KEY, false);
+            mCreateSecurityToken = intent.getBooleanExtra(EXTRA_CREATE_SECURITY_TOKEN, false);
 
             if (intent.hasExtra(EXTRA_NFC_FINGERPRINTS)) {
                 byte[] nfcFingerprints = intent.getByteArrayExtra(EXTRA_NFC_FINGERPRINTS);
@@ -113,13 +113,13 @@ public class CreateKeyActivity extends BaseNfcActivity {
                 byte[] nfcAid = intent.getByteArrayExtra(EXTRA_NFC_AID);
 
                 if (containsKeys(nfcFingerprints)) {
-                    Fragment frag = CreateYubiKeyImportResetFragment.newInstance(
+                    Fragment frag = CreateSecurityTokenImportResetFragment.newInstance(
                             nfcFingerprints, nfcAid, nfcUserId);
                     loadFragment(frag, FragAction.START);
 
                     setTitle(R.string.title_import_keys);
                 } else {
-                    Fragment frag = CreateYubiKeyBlankFragment.newInstance();
+                    Fragment frag = CreateSecurityTokenBlankFragment.newInstance();
                     loadFragment(frag, FragAction.START);
                     setTitle(R.string.title_manage_my_keys);
                 }
@@ -169,19 +169,19 @@ public class CreateKeyActivity extends BaseNfcActivity {
 
                 Intent intent = new Intent(this, ViewKeyActivity.class);
                 intent.setData(KeyRings.buildGenericKeyRingUri(masterKeyId));
-                intent.putExtra(ViewKeyActivity.EXTRA_NFC_AID, mNfcAid);
-                intent.putExtra(ViewKeyActivity.EXTRA_NFC_USER_ID, mNfcUserId);
-                intent.putExtra(ViewKeyActivity.EXTRA_NFC_FINGERPRINTS, mScannedFingerprints);
+                intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_AID, mNfcAid);
+                intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_USER_ID, mNfcUserId);
+                intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_FINGERPRINTS, mScannedFingerprints);
                 startActivity(intent);
                 finish();
 
             } catch (PgpKeyNotFoundException e) {
-                Fragment frag = CreateYubiKeyImportResetFragment.newInstance(
+                Fragment frag = CreateSecurityTokenImportResetFragment.newInstance(
                         mScannedFingerprints, mNfcAid, mNfcUserId);
                 loadFragment(frag, FragAction.TO_RIGHT);
             }
         } else {
-            Fragment frag = CreateYubiKeyBlankFragment.newInstance();
+            Fragment frag = CreateSecurityTokenBlankFragment.newInstance();
             loadFragment(frag, FragAction.TO_RIGHT);
         }
     }
@@ -209,9 +209,9 @@ public class CreateKeyActivity extends BaseNfcActivity {
         outState.putStringArrayList(EXTRA_ADDITIONAL_EMAILS, mAdditionalEmails);
         outState.putParcelable(EXTRA_PASSPHRASE, mPassphrase);
         outState.putBoolean(EXTRA_FIRST_TIME, mFirstTime);
-        outState.putBoolean(EXTRA_CREATE_YUBI_KEY, mCreateYubiKey);
-        outState.putParcelable(EXTRA_YUBI_KEY_PIN, mYubiKeyPin);
-        outState.putParcelable(EXTRA_YUBI_KEY_ADMIN_PIN, mYubiKeyAdminPin);
+        outState.putBoolean(EXTRA_CREATE_SECURITY_TOKEN, mCreateSecurityToken);
+        outState.putParcelable(EXTRA_SECURITY_TOKEN_PIN, mSecurityTokenPin);
+        outState.putParcelable(EXTRA_SECURITY_TOKEN_ADMIN_PIN, mSecurityTokenAdminPin);
     }
 
     @Override
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
index acb768f55..b020a0dba 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
@@ -235,10 +235,10 @@ public class CreateKeyEmailFragment extends Fragment {
 
             CreateKeyActivity createKeyActivity = ((CreateKeyActivity) getActivity());
 
-            if (createKeyActivity.mCreateYubiKey) {
+            if (createKeyActivity.mCreateSecurityToken) {
                 hideKeyboard();
 
-                CreateYubiKeyPinFragment frag = CreateYubiKeyPinFragment.newInstance();
+                CreateSecurityTokenPinFragment frag = CreateSecurityTokenPinFragment.newInstance();
                 mCreateKeyActivity.loadFragment(frag, FragAction.TO_RIGHT);
             } else {
                 CreateKeyPassphraseFragment frag = CreateKeyPassphraseFragment.newInstance();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
index b79e4454d..5c3ac999c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
 import android.app.Activity;
 import android.content.Intent;
 import android.database.Cursor;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -188,7 +187,7 @@ public class CreateKeyFinalFragment extends Fragment {
         if (mSaveKeyringParcel == null) {
             mSaveKeyringParcel = new SaveKeyringParcel();
 
-            if (createKeyActivity.mCreateYubiKey) {
+            if (createKeyActivity.mCreateSecurityToken) {
                 mSaveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
                         2048, null, KeyFlags.SIGN_DATA | KeyFlags.CERTIFY_OTHER, 0L));
                 mSaveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
@@ -263,7 +262,7 @@ public class CreateKeyFinalFragment extends Fragment {
             return;
         }
 
-        final boolean createYubiKey = activity.mCreateYubiKey;
+        final boolean createSecurityToken = activity.mCreateSecurityToken;
 
         CryptoOperationHelper.Callback<SaveKeyringParcel, EditKeyResult> createKeyCallback
                 = new CryptoOperationHelper.Callback<SaveKeyringParcel, EditKeyResult>() {
@@ -275,7 +274,7 @@ public class CreateKeyFinalFragment extends Fragment {
             @Override
             public void onCryptoOperationSuccess(EditKeyResult result) {
 
-                if (createYubiKey) {
+                if (createSecurityToken) {
                     moveToCard(result);
                     return;
                 }
@@ -327,7 +326,7 @@ public class CreateKeyFinalFragment extends Fragment {
         try {
             changeKeyringParcel = new SaveKeyringParcel(key.getMasterKeyId(), key.getFingerprint());
         } catch (PgpKeyNotFoundException e) {
-            Log.e(Constants.TAG, "Key that should be moved to YubiKey not found in database!");
+            Log.e(Constants.TAG, "Key that should be moved to Security Token not found in database!");
             return;
         }
 
@@ -339,7 +338,7 @@ public class CreateKeyFinalFragment extends Fragment {
         try {
             while (cursor != null && cursor.moveToNext()) {
                 long subkeyId = cursor.getLong(0);
-                changeKeyringParcel.getOrCreateSubkeyChange(subkeyId).mMoveKeyToCard = true;
+                changeKeyringParcel.getOrCreateSubkeyChange(subkeyId).mMoveKeyToSecurityToken = true;
             }
         } finally {
             if (cursor != null) {
@@ -348,8 +347,8 @@ public class CreateKeyFinalFragment extends Fragment {
         }
 
         // define new PIN and Admin PIN for the card
-        changeKeyringParcel.mCardPin = activity.mYubiKeyPin;
-        changeKeyringParcel.mCardAdminPin = activity.mYubiKeyAdminPin;
+        changeKeyringParcel.mSecurityTokenPin = activity.mSecurityTokenPin;
+        changeKeyringParcel.mSecurityTokenAdminPin = activity.mSecurityTokenAdminPin;
 
         CryptoOperationHelper.Callback<SaveKeyringParcel, EditKeyResult> callback
                 = new CryptoOperationHelper.Callback<SaveKeyringParcel, EditKeyResult>() {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyStartFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyStartFragment.java
index 68ec0e8c8..c62ec97e7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyStartFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyStartFragment.java
@@ -38,7 +38,7 @@ public class CreateKeyStartFragment extends Fragment {
 
     View mCreateKey;
     View mImportKey;
-    View mYubiKey;
+    View mSecurityToken;
     TextView mSkipOrCancel;
     public static final int REQUEST_CODE_IMPORT_KEY = 0x00007012;
 
@@ -61,7 +61,7 @@ public class CreateKeyStartFragment extends Fragment {
 
         mCreateKey = view.findViewById(R.id.create_key_create_key_button);
         mImportKey = view.findViewById(R.id.create_key_import_button);
-        mYubiKey = view.findViewById(R.id.create_key_yubikey_button);
+        mSecurityToken = view.findViewById(R.id.create_key_security_token_button);
         mSkipOrCancel = (TextView) view.findViewById(R.id.create_key_cancel);
 
         if (mCreateKeyActivity.mFirstTime) {
@@ -78,10 +78,10 @@ public class CreateKeyStartFragment extends Fragment {
             }
         });
 
-        mYubiKey.setOnClickListener(new View.OnClickListener() {
+        mSecurityToken.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                CreateYubiKeyWaitFragment frag = new CreateYubiKeyWaitFragment();
+                CreateSecurityTokenWaitFragment frag = new CreateSecurityTokenWaitFragment();
                 mCreateKeyActivity.loadFragment(frag, FragAction.TO_RIGHT);
             }
         });
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyBlankFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenBlankFragment.java
index 5b13dc88e..08441c199 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyBlankFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenBlankFragment.java
@@ -27,7 +27,7 @@ import android.view.ViewGroup;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
 
-public class CreateYubiKeyBlankFragment extends Fragment {
+public class CreateSecurityTokenBlankFragment extends Fragment {
 
     CreateKeyActivity mCreateKeyActivity;
     View mBackButton;
@@ -36,8 +36,8 @@ public class CreateYubiKeyBlankFragment extends Fragment {
     /**
      * Creates new instance of this fragment
      */
-    public static CreateYubiKeyBlankFragment newInstance() {
-        CreateYubiKeyBlankFragment frag = new CreateYubiKeyBlankFragment();
+    public static CreateSecurityTokenBlankFragment newInstance() {
+        CreateSecurityTokenBlankFragment frag = new CreateSecurityTokenBlankFragment();
 
         Bundle args = new Bundle();
 
@@ -81,7 +81,7 @@ public class CreateYubiKeyBlankFragment extends Fragment {
     }
 
     private void nextClicked() {
-        mCreateKeyActivity.mCreateYubiKey = true;
+        mCreateKeyActivity.mCreateSecurityToken = true;
 
         CreateKeyNameFragment frag = CreateKeyNameFragment.newInstance();
         mCreateKeyActivity.loadFragment(frag, FragAction.TO_RIGHT);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportResetFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java
index 5712f4452..81f782149 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportResetFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java
@@ -49,7 +49,7 @@ import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.Preferences;
 
 
-public class CreateYubiKeyImportResetFragment
+public class CreateSecurityTokenImportResetFragment
         extends QueueingCryptoOperationFragment<ImportKeyringParcel, ImportKeyResult>
         implements NfcListenerFragment {
 
@@ -61,10 +61,10 @@ public class CreateYubiKeyImportResetFragment
 
     CreateKeyActivity mCreateKeyActivity;
 
-    private byte[] mNfcFingerprints;
-    private byte[] mNfcAid;
-    private String mNfcUserId;
-    private String mNfcFingerprint;
+    private byte[] mTokenFingerprints;
+    private byte[] mTokenAid;
+    private String mTokenUserId;
+    private String mTokenFingerprint;
     private ImportKeysListFragment mListFragment;
     private TextView vSerNo;
     private TextView vUserId;
@@ -79,7 +79,7 @@ public class CreateYubiKeyImportResetFragment
 
     public static Fragment newInstance(byte[] scannedFingerprints, byte[] nfcAid, String userId) {
 
-        CreateYubiKeyImportResetFragment frag = new CreateYubiKeyImportResetFragment();
+        CreateSecurityTokenImportResetFragment frag = new CreateSecurityTokenImportResetFragment();
 
         Bundle args = new Bundle();
         args.putByteArray(ARG_FINGERPRINTS, scannedFingerprints);
@@ -96,26 +96,26 @@ public class CreateYubiKeyImportResetFragment
 
         Bundle args = savedInstanceState != null ? savedInstanceState : getArguments();
 
-        mNfcFingerprints = args.getByteArray(ARG_FINGERPRINTS);
-        mNfcAid = args.getByteArray(ARG_AID);
-        mNfcUserId = args.getString(ARG_USER_ID);
+        mTokenFingerprints = args.getByteArray(ARG_FINGERPRINTS);
+        mTokenAid = args.getByteArray(ARG_AID);
+        mTokenUserId = args.getString(ARG_USER_ID);
 
         byte[] fp = new byte[20];
-        ByteBuffer.wrap(fp).put(mNfcFingerprints, 0, 20);
-        mNfcFingerprint = KeyFormattingUtils.convertFingerprintToHex(fp);
+        ByteBuffer.wrap(fp).put(mTokenFingerprints, 0, 20);
+        mTokenFingerprint = KeyFormattingUtils.convertFingerprintToHex(fp);
 
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.create_yubi_key_import_reset_fragment, container, false);
+        View view = inflater.inflate(R.layout.create_security_token_import_reset_fragment, container, false);
 
-        vSerNo = (TextView) view.findViewById(R.id.yubikey_serno);
-        vUserId = (TextView) view.findViewById(R.id.yubikey_userid);
+        vSerNo = (TextView) view.findViewById(R.id.token_serno);
+        vUserId = (TextView) view.findViewById(R.id.token_userid);
         mNextButton = (TextView) view.findViewById(R.id.create_key_next_button);
-        mRadioImport = (RadioButton) view.findViewById(R.id.yubikey_decision_import);
-        mRadioReset = (RadioButton) view.findViewById(R.id.yubikey_decision_reset);
-        mResetWarning = view.findViewById(R.id.yubikey_import_reset_warning);
+        mRadioImport = (RadioButton) view.findViewById(R.id.token_decision_import);
+        mRadioReset = (RadioButton) view.findViewById(R.id.token_decision_reset);
+        mResetWarning = view.findViewById(R.id.token_import_reset_warning);
 
         View mBackButton = view.findViewById(R.id.create_key_back_button);
         mBackButton.setOnClickListener(new View.OnClickListener() {
@@ -142,7 +142,7 @@ public class CreateYubiKeyImportResetFragment
         });
 
         mListFragment = ImportKeysListFragment.newInstance(null, null,
-                "0x" + mNfcFingerprint, true, null);
+                "0x" + mTokenFingerprint, true, null);
 
         mRadioImport.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -154,7 +154,7 @@ public class CreateYubiKeyImportResetFragment
                     mResetWarning.setVisibility(View.GONE);
 
                     getFragmentManager().beginTransaction()
-                            .replace(R.id.yubikey_import_fragment, mListFragment, "yubikey_import")
+                            .replace(R.id.security_token_import_fragment, mListFragment, "token_import")
                             .commit();
 
                     getFragmentManager().executePendingTransactions();
@@ -188,9 +188,9 @@ public class CreateYubiKeyImportResetFragment
     public void onSaveInstanceState(Bundle args) {
         super.onSaveInstanceState(args);
 
-        args.putByteArray(ARG_FINGERPRINTS, mNfcFingerprints);
-        args.putByteArray(ARG_AID, mNfcAid);
-        args.putString(ARG_USER_ID, mNfcUserId);
+        args.putByteArray(ARG_FINGERPRINTS, mTokenFingerprints);
+        args.putByteArray(ARG_AID, mTokenAid);
+        args.putString(ARG_USER_ID, mTokenUserId);
     }
 
     @Override
@@ -200,25 +200,25 @@ public class CreateYubiKeyImportResetFragment
     }
 
     public void setData() {
-        String serno = Hex.toHexString(mNfcAid, 10, 4);
-        vSerNo.setText(getString(R.string.yubikey_serno, serno));
+        String serno = Hex.toHexString(mTokenAid, 10, 4);
+        vSerNo.setText(getString(R.string.security_token_serial_no, serno));
 
-        if (!mNfcUserId.isEmpty()) {
-            vUserId.setText(getString(R.string.yubikey_key_holder, mNfcUserId));
+        if (!mTokenUserId.isEmpty()) {
+            vUserId.setText(getString(R.string.security_token_key_holder, mTokenUserId));
         } else {
-            vUserId.setText(getString(R.string.yubikey_key_holder_not_set));
+            vUserId.setText(getString(R.string.security_token_key_holder_not_set));
         }
     }
 
     public void refreshSearch() {
-        mListFragment.loadNew(new ImportKeysListFragment.CloudLoaderState("0x" + mNfcFingerprint,
+        mListFragment.loadNew(new ImportKeysListFragment.CloudLoaderState("0x" + mTokenFingerprint,
                 Preferences.getPreferences(getActivity()).getCloudSearchPrefs()));
     }
 
     public void importKey() {
 
         ArrayList<ParcelableKeyRing> keyList = new ArrayList<>();
-        keyList.add(new ParcelableKeyRing(mNfcFingerprint, null));
+        keyList.add(new ParcelableKeyRing(mTokenFingerprint, null));
         mKeyList = keyList;
 
         mKeyserver = Preferences.getPreferences(getActivity()).getPreferredKeyserver();
@@ -230,11 +230,11 @@ public class CreateYubiKeyImportResetFragment
     }
 
     public void resetCard() {
-        Intent intent = new Intent(getActivity(), NfcOperationActivity.class);
-        intent.putExtra(NfcOperationActivity.EXTRA_SERVICE_INTENT, (Parcelable[]) null);
+        Intent intent = new Intent(getActivity(), SecurityTokenOperationActivity.class);
+        intent.putExtra(SecurityTokenOperationActivity.EXTRA_SERVICE_INTENT, (Parcelable[]) null);
         RequiredInputParcel resetP = RequiredInputParcel.createNfcReset();
-        intent.putExtra(NfcOperationActivity.EXTRA_REQUIRED_INPUT, resetP);
-        intent.putExtra(NfcOperationActivity.EXTRA_CRYPTO_INPUT, new CryptoInputParcel());
+        intent.putExtra(SecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, resetP);
+        intent.putExtra(SecurityTokenOperationActivity.EXTRA_CRYPTO_INPUT, new CryptoInputParcel());
         startActivityForResult(intent, REQUEST_CODE_RESET);
     }
 
@@ -251,13 +251,13 @@ public class CreateYubiKeyImportResetFragment
     @Override
     public void doNfcInBackground() throws IOException {
 
-        mNfcFingerprints = mCreateKeyActivity.nfcGetFingerprints();
-        mNfcAid = mCreateKeyActivity.nfcGetAid();
-        mNfcUserId = mCreateKeyActivity.nfcGetUserId();
+        mTokenFingerprints = mCreateKeyActivity.nfcGetFingerprints();
+        mTokenAid = mCreateKeyActivity.nfcGetAid();
+        mTokenUserId = mCreateKeyActivity.nfcGetUserId();
 
         byte[] fp = new byte[20];
-        ByteBuffer.wrap(fp).put(mNfcFingerprints, 0, 20);
-        mNfcFingerprint = KeyFormattingUtils.convertFingerprintToHex(fp);
+        ByteBuffer.wrap(fp).put(mTokenFingerprints, 0, 20);
+        mTokenFingerprint = KeyFormattingUtils.convertFingerprintToHex(fp);
     }
 
     @Override
@@ -284,13 +284,13 @@ public class CreateYubiKeyImportResetFragment
         Activity activity = getActivity();
 
         Intent intent = new Intent(activity, ViewKeyActivity.class);
-        // use the imported masterKeyId, not the one from the yubikey, because
+        // use the imported masterKeyId, not the one from the token, because
         // that one might* just have been a subkey of the imported key
         intent.setData(KeyRings.buildGenericKeyRingUri(masterKeyIds[0]));
         intent.putExtra(ViewKeyActivity.EXTRA_DISPLAY_RESULT, result);
-        intent.putExtra(ViewKeyActivity.EXTRA_NFC_AID, mNfcAid);
-        intent.putExtra(ViewKeyActivity.EXTRA_NFC_USER_ID, mNfcUserId);
-        intent.putExtra(ViewKeyActivity.EXTRA_NFC_FINGERPRINTS, mNfcFingerprints);
+        intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_AID, mTokenAid);
+        intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_USER_ID, mTokenUserId);
+        intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_FINGERPRINTS, mTokenFingerprints);
         startActivity(intent);
         activity.finish();
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyPinFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenPinFragment.java
index 128383d6d..45cf7a665 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyPinFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenPinFragment.java
@@ -37,7 +37,7 @@ import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.HashSet;
 
-public class CreateYubiKeyPinFragment extends Fragment {
+public class CreateSecurityTokenPinFragment extends Fragment {
 
     // view
     CreateKeyActivity mCreateKeyActivity;
@@ -65,8 +65,8 @@ public class CreateYubiKeyPinFragment extends Fragment {
     /**
      * Creates new instance of this fragment
      */
-    public static CreateYubiKeyPinFragment newInstance() {
-        CreateYubiKeyPinFragment frag = new CreateYubiKeyPinFragment();
+    public static CreateSecurityTokenPinFragment newInstance() {
+        CreateSecurityTokenPinFragment frag = new CreateSecurityTokenPinFragment();
 
         Bundle args = new Bundle();
         frag.setArguments(args);
@@ -109,7 +109,7 @@ public class CreateYubiKeyPinFragment extends Fragment {
         mBackButton = view.findViewById(R.id.create_key_back_button);
         mNextButton = view.findViewById(R.id.create_key_next_button);
 
-        if (mCreateKeyActivity.mYubiKeyPin == null) {
+        if (mCreateKeyActivity.mSecurityTokenPin == null) {
             new AsyncTask<Void, Void, Passphrase>() {
                 @Override
                 protected Passphrase doInBackground(Void... unused) {
@@ -129,13 +129,13 @@ public class CreateYubiKeyPinFragment extends Fragment {
 
                 @Override
                 protected void onPostExecute(Passphrase adminPin) {
-                    mCreateKeyActivity.mYubiKeyAdminPin = adminPin;
+                    mCreateKeyActivity.mSecurityTokenAdminPin = adminPin;
 
-                    mAdminPin.setText(mCreateKeyActivity.mYubiKeyAdminPin.toStringUnsafe());
+                    mAdminPin.setText(mCreateKeyActivity.mSecurityTokenAdminPin.toStringUnsafe());
                 }
             }.execute();
         } else {
-            mAdminPin.setText(mCreateKeyActivity.mYubiKeyAdminPin.toStringUnsafe());
+            mAdminPin.setText(mCreateKeyActivity.mSecurityTokenAdminPin.toStringUnsafe());
         }
 
         mPin.requestFocus();
@@ -187,7 +187,7 @@ public class CreateYubiKeyPinFragment extends Fragment {
                 return;
             }
 
-            mCreateKeyActivity.mYubiKeyPin = new Passphrase(mPin.getText().toString());
+            mCreateKeyActivity.mSecurityTokenPin = new Passphrase(mPin.getText().toString());
 
             CreateKeyFinalFragment frag = CreateKeyFinalFragment.newInstance();
             hideKeyboard();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyWaitFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java
index d45195512..a3ea38e40 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyWaitFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java
@@ -28,14 +28,14 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
 
 
-public class CreateYubiKeyWaitFragment extends Fragment {
+public class CreateSecurityTokenWaitFragment extends Fragment {
 
     CreateKeyActivity mCreateKeyActivity;
     View mBackButton;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.create_yubi_key_wait_fragment, container, false);
+        View view = inflater.inflate(R.layout.create_security_token_wait_fragment, container, false);
 
         mBackButton = view.findViewById(R.id.create_key_back_button);
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
index 1c72cdf41..2d94d0d93 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
@@ -435,9 +435,9 @@ public class EditKeyFragment extends QueueingCryptoOperationFragment<SaveKeyring
                         }
                         // toggle
                         change.mDummyStrip = !change.mDummyStrip;
-                        if (change.mDummyStrip && change.mMoveKeyToCard) {
+                        if (change.mDummyStrip && change.mMoveKeyToSecurityToken) {
                             // User had chosen to divert key, but now wants to strip it instead.
-                            change.mMoveKeyToCard = false;
+                            change.mMoveKeyToSecurityToken = false;
                         }
                         break;
                     }
@@ -479,8 +479,8 @@ public class EditKeyFragment extends QueueingCryptoOperationFragment<SaveKeyring
 //                            break;
 //                        }
 //                        // toggle
-//                        change.mMoveKeyToCard = !change.mMoveKeyToCard;
-//                        if (change.mMoveKeyToCard && change.mDummyStrip) {
+//                        change.mMoveKeyToSecurityToken = !change.mMoveKeyToSecurityToken;
+//                        if (change.mMoveKeyToSecurityToken && change.mDummyStrip) {
 //                            // User had chosen to strip key, but now wants to divert it.
 //                            change.mDummyStrip = false;
 //                        }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index c54f55b6f..7cb6361eb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -35,7 +35,7 @@ import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
 import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
 import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
 import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
-import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity;
+import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity;
 import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.Notify;
@@ -47,7 +47,7 @@ import org.sufficientlysecure.keychain.util.Preferences;
 import java.io.IOException;
 import java.util.ArrayList;
 
-public class ImportKeysActivity extends BaseNfcActivity
+public class ImportKeysActivity extends BaseSecurityTokenNfcActivity
         implements CryptoOperationHelper.Callback<ImportKeyringParcel, ImportKeyResult> {
 
     public static final String ACTION_IMPORT_KEY = OpenKeychainIntents.IMPORT_KEY;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
index 7bd7bafcc..af60a1d9b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -40,11 +40,11 @@ import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
 import org.sufficientlysecure.keychain.remote.ui.AppsListFragment;
-import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity;
+import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity;
 import org.sufficientlysecure.keychain.util.FabContainer;
 import org.sufficientlysecure.keychain.util.Preferences;
 
-public class MainActivity extends BaseNfcActivity implements FabContainer, OnBackStackChangedListener {
+public class MainActivity extends BaseSecurityTokenNfcActivity implements FabContainer, OnBackStackChangedListener {
 
     static final int ID_KEYS = 1;
     static final int ID_ENCRYPT_DECRYPT = 2;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
index 2fcbbf6c2..b934f3d5f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -261,7 +261,7 @@ public class PassphraseDialogActivity extends FragmentActivity {
                             hint = getString(R.string.label_pin);
                             break;
                         case DIVERT_TO_CARD:
-                            message = getString(R.string.yubikey_pin_for, userId);
+                            message = getString(R.string.security_token_pin_for, userId);
                             hint = getString(R.string.label_pin);
                             break;
                         // special case: empty passphrase just returns the empty passphrase
@@ -313,7 +313,7 @@ public class PassphraseDialogActivity extends FragmentActivity {
             mPassphraseEditText.setImeActionLabel(getString(android.R.string.ok), EditorInfo.IME_ACTION_DONE);
             mPassphraseEditText.setOnEditorActionListener(this);
 
-            if ((keyType == CanonicalizedSecretKey.SecretKeyType.DIVERT_TO_CARD && Preferences.getPreferences(activity).useNumKeypadForYubiKeyPin())
+            if ((keyType == CanonicalizedSecretKey.SecretKeyType.DIVERT_TO_CARD && Preferences.getPreferences(activity).useNumKeypadForSecurityTokenPin())
                     || keyType == CanonicalizedSecretKey.SecretKeyType.PIN) {
                 mPassphraseEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
                 mPassphraseEditText.setTransformationMethod(PasswordTransformationMethod.getInstance());
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
index 86b0a36d0..130dd6a79 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
@@ -27,7 +27,6 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.TextView;
-import android.widget.Toast;
 import android.widget.ViewAnimator;
 
 import org.sufficientlysecure.keychain.Constants;
@@ -40,12 +39,11 @@ import org.sufficientlysecure.keychain.remote.CryptoInputParcelCacheService;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
 import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
-import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity;
+import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity;
 import org.sufficientlysecure.keychain.ui.util.ThemeChanger;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.OrientationUtils;
 import org.sufficientlysecure.keychain.util.Passphrase;
-import org.sufficientlysecure.keychain.util.Preferences;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -56,7 +54,7 @@ import java.util.Arrays;
  * NFC devices.
  * For the full specs, see http://g10code.com/docs/openpgp-card-2.0.pdf
  */
-public class NfcOperationActivity extends BaseNfcActivity {
+public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity {
 
     public static final String EXTRA_REQUIRED_INPUT = "required_input";
     public static final String EXTRA_CRYPTO_INPUT = "crypto_input";
@@ -99,12 +97,12 @@ public class NfcOperationActivity extends BaseNfcActivity {
 
         mInputParcel = getIntent().getParcelableExtra(EXTRA_CRYPTO_INPUT);
 
-        setTitle(R.string.nfc_text);
+        setTitle(R.string.security_token_nfc_text);
 
         vAnimator = (ViewAnimator) findViewById(R.id.view_animator);
         vAnimator.setDisplayedChild(0);
-        vErrorText = (TextView) findViewById(R.id.nfc_activity_3_error_text);
-        vErrorTryAgainButton = (Button) findViewById(R.id.nfc_activity_3_error_try_again);
+        vErrorText = (TextView) findViewById(R.id.security_token_activity_3_error_text);
+        vErrorTryAgainButton = (Button) findViewById(R.id.security_token_activity_3_error_try_again);
         vErrorTryAgainButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -114,7 +112,7 @@ public class NfcOperationActivity extends BaseNfcActivity {
                 vAnimator.setDisplayedChild(0);
             }
         });
-        Button vCancel = (Button) findViewById(R.id.nfc_activity_0_cancel);
+        Button vCancel = (Button) findViewById(R.id.security_token_activity_0_cancel);
         vCancel.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -136,13 +134,13 @@ public class NfcOperationActivity extends BaseNfcActivity {
         // obtain passphrase for this subkey
         if (mRequiredInput.mType != RequiredInputParcel.RequiredInputType.NFC_MOVE_KEY_TO_CARD
                 && mRequiredInput.mType != RequiredInputParcel.RequiredInputType.NFC_RESET_CARD) {
-            obtainYubiKeyPin(mRequiredInput);
+            obtainSecurityTokenPin(mRequiredInput);
         }
     }
 
     @Override
     protected void initLayout() {
-        setContentView(R.layout.nfc_operation_activity);
+        setContentView(R.layout.security_token_operation_activity);
     }
 
     @Override
@@ -186,7 +184,7 @@ public class NfcOperationActivity extends BaseNfcActivity {
                             KeychainContract.KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(mRequiredInput.getMasterKeyId())
                     );
                 } catch (ProviderHelper.NotFoundException e) {
-                    throw new IOException("Couldn't find subkey for key to card operation.");
+                    throw new IOException("Couldn't find subkey for key to token operation.");
                 }
 
                 byte[] newPin = mRequiredInput.mInputData[0];
@@ -202,7 +200,7 @@ public class NfcOperationActivity extends BaseNfcActivity {
                     long keyGenerationTimestampMillis = key.getCreationTime().getTime();
                     long keyGenerationTimestamp = keyGenerationTimestampMillis / 1000;
                     byte[] timestampBytes = ByteBuffer.allocate(4).putInt((int) keyGenerationTimestamp).array();
-                    byte[] cardSerialNumber = Arrays.copyOf(nfcGetAid(), 16);
+                    byte[] tokenSerialNumber = Arrays.copyOf(nfcGetAid(), 16);
 
                     Passphrase passphrase;
                     try {
@@ -218,7 +216,7 @@ public class NfcOperationActivity extends BaseNfcActivity {
                             nfcPutData(0xCE, timestampBytes);
                             nfcPutData(0xC7, key.getFingerprint());
                         } else {
-                            throw new IOException("Key slot occupied; card must be reset to put new signature key.");
+                            throw new IOException("Key slot occupied; token must be reset to put new signature key.");
                         }
                     } else if (key.canEncrypt()) {
                         if (shouldPutKey(key.getFingerprint(), 1)) {
@@ -226,7 +224,7 @@ public class NfcOperationActivity extends BaseNfcActivity {
                             nfcPutData(0xCF, timestampBytes);
                             nfcPutData(0xC8, key.getFingerprint());
                         } else {
-                            throw new IOException("Key slot occupied; card must be reset to put new decryption key.");
+                            throw new IOException("Key slot occupied; token must be reset to put new decryption key.");
                         }
                     } else if (key.canAuthenticate()) {
                         if (shouldPutKey(key.getFingerprint(), 2)) {
@@ -234,14 +232,14 @@ public class NfcOperationActivity extends BaseNfcActivity {
                             nfcPutData(0xD0, timestampBytes);
                             nfcPutData(0xC9, key.getFingerprint());
                         } else {
-                            throw new IOException("Key slot occupied; card must be reset to put new authentication key.");
+                            throw new IOException("Key slot occupied; token must be reset to put new authentication key.");
                         }
                     } else {
-                        throw new IOException("Inappropriate key flags for smart card key.");
+                        throw new IOException("Inappropriate key flags for Security Token key.");
                     }
 
                     // TODO: Is this really used anywhere?
-                    mInputParcel.addCryptoData(subkeyBytes, cardSerialNumber);
+                    mInputParcel.addCryptoData(subkeyBytes, tokenSerialNumber);
                 }
 
                 // change PINs afterwards
@@ -282,7 +280,7 @@ public class NfcOperationActivity extends BaseNfcActivity {
         new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... params) {
-                // check all 200ms if YubiKey has been taken away
+                // check all 200ms if Security Token has been taken away
                 while (true) {
                     if (isNfcConnected()) {
                         try {
@@ -307,7 +305,7 @@ public class NfcOperationActivity extends BaseNfcActivity {
     protected void onNfcError(String error) {
         pauseTagHandling();
 
-        vErrorText.setText(error + "\n\n" + getString(R.string.nfc_try_again_text));
+        vErrorText.setText(error + "\n\n" + getString(R.string.security_token_nfc_try_again_text));
         vAnimator.setDisplayedChild(3);
     }
 
@@ -321,17 +319,17 @@ public class NfcOperationActivity extends BaseNfcActivity {
     }
 
     private boolean shouldPutKey(byte[] fingerprint, int idx) throws IOException {
-        byte[] cardFingerprint = nfcGetMasterKeyFingerprint(idx);
+        byte[] tokenFingerprint = nfcGetMasterKeyFingerprint(idx);
 
         // Note: special case: This should not happen, but happens with
         // https://github.com/FluffyKaon/OpenPGP-Card, thus for now assume true
-        if (cardFingerprint == null) {
+        if (tokenFingerprint == null) {
             return true;
         }
 
         // Slot is empty, or contains this key already. PUT KEY operation is safe
-        if (Arrays.equals(cardFingerprint, BLANK_FINGERPRINT) ||
-                Arrays.equals(cardFingerprint, fingerprint)) {
+        if (Arrays.equals(tokenFingerprint, BLANK_FINGERPRINT) ||
+                Arrays.equals(tokenFingerprint, fingerprint)) {
             return true;
         }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 67487f2ca..03fc07936 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -84,7 +84,7 @@ import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
 import org.sufficientlysecure.keychain.ui.ViewKeyFragment.PostponeType;
-import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity;
+import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity;
 import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
 import org.sufficientlysecure.keychain.ui.dialog.SetPassphraseDialogFragment;
 import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
@@ -102,13 +102,13 @@ import org.sufficientlysecure.keychain.util.Passphrase;
 import org.sufficientlysecure.keychain.util.Preferences;
 
 
-public class ViewKeyActivity extends BaseNfcActivity implements
+public class ViewKeyActivity extends BaseSecurityTokenNfcActivity implements
         LoaderManager.LoaderCallbacks<Cursor>,
         CryptoOperationHelper.Callback<ImportKeyringParcel, ImportKeyResult> {
 
-    public static final String EXTRA_NFC_USER_ID = "nfc_user_id";
-    public static final String EXTRA_NFC_AID = "nfc_aid";
-    public static final String EXTRA_NFC_FINGERPRINTS = "nfc_fingerprints";
+    public static final String EXTRA_SECURITY_TOKEN_USER_ID = "security_token_user_id";
+    public static final String EXTRA_SECURITY_TOKEN_AID = "security_token_aid";
+    public static final String EXTRA_SECURITY_TOKEN_FINGERPRINTS = "security_token_fingerprints";
 
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({REQUEST_QR_FINGERPRINT, REQUEST_BACKUP, REQUEST_CERTIFY, REQUEST_DELETE})
@@ -159,7 +159,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
     private boolean mIsRevoked = false;
     private boolean mIsExpired = false;
 
-    private boolean mShowYubikeyAfterCreation = false;
+    private boolean mShowSecurityTokenAfterCreation = false;
 
     private MenuItem mRefreshItem;
     private boolean mIsRefreshing;
@@ -345,9 +345,9 @@ public class ViewKeyActivity extends BaseNfcActivity implements
                     .commit();
         }
 
-        // need to postpone loading of the yubikey fragment until after mMasterKeyId
+        // need to postpone loading of the security token fragment until after mMasterKeyId
         // is available, but we mark here that this should be done
-        mShowYubikeyAfterCreation = true;
+        mShowSecurityTokenAfterCreation = true;
 
     }
 
@@ -656,69 +656,69 @@ public class ViewKeyActivity extends BaseNfcActivity implements
     @Override
     protected void onNfcPostExecute() {
 
-        long yubiKeyId = KeyFormattingUtils.getKeyIdFromFingerprint(mNfcFingerprints);
+        long tokenId = KeyFormattingUtils.getKeyIdFromFingerprint(mNfcFingerprints);
 
         try {
 
-            // if the yubikey matches a subkey in any key
+            // if the security token matches a subkey in any key
             CachedPublicKeyRing ring = mProviderHelper.getCachedPublicKeyRing(
-                    KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(yubiKeyId));
+                    KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(tokenId));
             byte[] candidateFp = ring.getFingerprint();
 
-            // if the master key of that key matches this one, just show the yubikey dialog
+            // if the master key of that key matches this one, just show the token dialog
             if (KeyFormattingUtils.convertFingerprintToHex(candidateFp).equals(mFingerprintString)) {
-                showYubiKeyFragment(mNfcFingerprints, mNfcUserId, mNfcAid);
+                showSecurityTokenFragment(mNfcFingerprints, mNfcUserId, mNfcAid);
                 return;
             }
 
             // otherwise, offer to go to that key
             final long masterKeyId = KeyFormattingUtils.getKeyIdFromFingerprint(candidateFp);
-            Notify.create(this, R.string.snack_yubi_other, Notify.LENGTH_LONG,
+            Notify.create(this, R.string.snack_security_token_other, Notify.LENGTH_LONG,
                     Style.WARN, new ActionListener() {
                         @Override
                         public void onAction() {
                             Intent intent = new Intent(
                                     ViewKeyActivity.this, ViewKeyActivity.class);
                             intent.setData(KeyRings.buildGenericKeyRingUri(masterKeyId));
-                            intent.putExtra(ViewKeyActivity.EXTRA_NFC_AID, mNfcAid);
-                            intent.putExtra(ViewKeyActivity.EXTRA_NFC_USER_ID, mNfcUserId);
-                            intent.putExtra(ViewKeyActivity.EXTRA_NFC_FINGERPRINTS, mNfcFingerprints);
+                            intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_AID, mNfcAid);
+                            intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_USER_ID, mNfcUserId);
+                            intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_FINGERPRINTS, mNfcFingerprints);
                             startActivity(intent);
                             finish();
                         }
-                    }, R.string.snack_yubikey_view).show();
+                    }, R.string.snack_security_token_view).show();
             // and if it's not found, offer import
         } catch (PgpKeyNotFoundException e) {
-            Notify.create(this, R.string.snack_yubi_other, Notify.LENGTH_LONG,
+            Notify.create(this, R.string.snack_security_token_other, Notify.LENGTH_LONG,
                     Style.WARN, new ActionListener() {
                         @Override
                         public void onAction() {
                             Intent intent = new Intent(
                                     ViewKeyActivity.this, CreateKeyActivity.class);
-                            intent.putExtra(ViewKeyActivity.EXTRA_NFC_AID, mNfcAid);
-                            intent.putExtra(ViewKeyActivity.EXTRA_NFC_USER_ID, mNfcUserId);
-                            intent.putExtra(ViewKeyActivity.EXTRA_NFC_FINGERPRINTS, mNfcFingerprints);
+                            intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_AID, mNfcAid);
+                            intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_USER_ID, mNfcUserId);
+                            intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_FINGERPRINTS, mNfcFingerprints);
                             startActivity(intent);
                             finish();
                         }
-                    }, R.string.snack_yubikey_import).show();
+                    }, R.string.snack_security_token_import).show();
         }
     }
 
-    public void showYubiKeyFragment(
-            final byte[] nfcFingerprints, final String nfcUserId, final byte[] nfcAid) {
+    public void showSecurityTokenFragment(
+            final byte[] tokenFingerprints, final String tokenUserId, final byte[] tokenAid) {
 
         new Handler().post(new Runnable() {
             @Override
             public void run() {
-                ViewKeyYubiKeyFragment frag = ViewKeyYubiKeyFragment.newInstance(
-                        mMasterKeyId, nfcFingerprints, nfcUserId, nfcAid);
+                ViewKeySecurityTokenFragment frag = ViewKeySecurityTokenFragment.newInstance(
+                        mMasterKeyId, tokenFingerprints, tokenUserId, tokenAid);
 
                 FragmentManager manager = getSupportFragmentManager();
 
-                manager.popBackStack("yubikey", FragmentManager.POP_BACK_STACK_INCLUSIVE);
+                manager.popBackStack("security_token", FragmentManager.POP_BACK_STACK_INCLUSIVE);
                 manager.beginTransaction()
-                        .addToBackStack("yubikey")
+                        .addToBackStack("security_token")
                         .replace(R.id.view_key_fragment, frag)
                                 // if this is called while the activity wasn't resumed, just forget it happened
                         .commitAllowingStateLoss();
@@ -888,14 +888,14 @@ public class ViewKeyActivity extends BaseNfcActivity implements
                     mFingerprint = data.getBlob(INDEX_FINGERPRINT);
                     mFingerprintString = KeyFormattingUtils.convertFingerprintToHex(mFingerprint);
 
-                    // if it wasn't shown yet, display yubikey fragment
-                    if (mShowYubikeyAfterCreation && getIntent().hasExtra(EXTRA_NFC_AID)) {
-                        mShowYubikeyAfterCreation = false;
+                    // if it wasn't shown yet, display token fragment
+                    if (mShowSecurityTokenAfterCreation && getIntent().hasExtra(EXTRA_SECURITY_TOKEN_AID)) {
+                        mShowSecurityTokenAfterCreation = false;
                         Intent intent = getIntent();
-                        byte[] nfcFingerprints = intent.getByteArrayExtra(EXTRA_NFC_FINGERPRINTS);
-                        String nfcUserId = intent.getStringExtra(EXTRA_NFC_USER_ID);
-                        byte[] nfcAid = intent.getByteArrayExtra(EXTRA_NFC_AID);
-                        showYubiKeyFragment(nfcFingerprints, nfcUserId, nfcAid);
+                        byte[] tokenFingerprints = intent.getByteArrayExtra(EXTRA_SECURITY_TOKEN_FINGERPRINTS);
+                        String tokenUserId = intent.getStringExtra(EXTRA_SECURITY_TOKEN_USER_ID);
+                        byte[] tokenAid = intent.getByteArrayExtra(EXTRA_SECURITY_TOKEN_AID);
+                        showSecurityTokenFragment(tokenFingerprints, tokenUserId, tokenAid);
                     }
 
                     mIsSecret = data.getInt(INDEX_HAS_ANY_SECRET) != 0;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java
index 14477723e..fc6db1b92 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java
@@ -340,9 +340,9 @@ public class ViewKeyAdvSubkeysFragment extends LoaderFragment implements
                         }
                         // toggle
                         change.mDummyStrip = !change.mDummyStrip;
-                        if (change.mDummyStrip && change.mMoveKeyToCard) {
+                        if (change.mDummyStrip && change.mMoveKeyToSecurityToken) {
                             // User had chosen to divert key, but now wants to strip it instead.
-                            change.mMoveKeyToCard = false;
+                            change.mMoveKeyToSecurityToken = false;
                         }
                         break;
                     }
@@ -384,8 +384,8 @@ public class ViewKeyAdvSubkeysFragment extends LoaderFragment implements
 //                            break;
 //                        }
 //                        // toggle
-//                        change.mMoveKeyToCard = !change.mMoveKeyToCard;
-//                        if (change.mMoveKeyToCard && change.mDummyStrip) {
+//                        change.mMoveKeyToSecurityToken = !change.mMoveKeyToSecurityToken;
+//                        if (change.mMoveKeyToSecurityToken && change.mDummyStrip) {
 //                            // User had chosen to strip key, but now wants to divert it.
 //                            change.mDummyStrip = false;
 //                        }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyYubiKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeySecurityTokenFragment.java
index f980f297b..48e41c7bb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyYubiKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeySecurityTokenFragment.java
@@ -44,7 +44,7 @@ import org.sufficientlysecure.keychain.ui.base.QueueingCryptoOperationFragment;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 
 
-public class ViewKeyYubiKeyFragment
+public class ViewKeySecurityTokenFragment
         extends QueueingCryptoOperationFragment<PromoteKeyringParcel, PromoteKeyResult>
         implements LoaderCallbacks<Cursor> {
 
@@ -62,9 +62,9 @@ public class ViewKeyYubiKeyFragment
     private Button vButton;
     private TextView vStatus;
 
-    public static ViewKeyYubiKeyFragment newInstance(long masterKeyId,
+    public static ViewKeySecurityTokenFragment newInstance(long masterKeyId,
             byte[] fingerprints, String userId, byte[] aid) {
-        ViewKeyYubiKeyFragment frag = new ViewKeyYubiKeyFragment();
+        ViewKeySecurityTokenFragment frag = new ViewKeySecurityTokenFragment();
 
         Bundle args = new Bundle();
         args.putLong(ARG_MASTER_KEY_ID, masterKeyId);
@@ -76,7 +76,7 @@ public class ViewKeyYubiKeyFragment
         return frag;
     }
 
-    public ViewKeyYubiKeyFragment() {
+    public ViewKeySecurityTokenFragment() {
         super(null);
     }
 
@@ -102,18 +102,18 @@ public class ViewKeyYubiKeyFragment
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.view_key_yubikey, null);
+        View view = inflater.inflate(R.layout.view_key_security_token, null);
 
-        TextView vSerNo = (TextView) view.findViewById(R.id.yubikey_serno);
-        TextView vUserId = (TextView) view.findViewById(R.id.yubikey_userid);
+        TextView vSerNo = (TextView) view.findViewById(R.id.token_serno);
+        TextView vUserId = (TextView) view.findViewById(R.id.token_userid);
 
         String serno = Hex.toHexString(mCardAid, 10, 4);
-        vSerNo.setText(getString(R.string.yubikey_serno, serno));
+        vSerNo.setText(getString(R.string.security_token_serial_no, serno));
 
         if (!mUserId.isEmpty()) {
-            vUserId.setText(getString(R.string.yubikey_key_holder, mUserId));
+            vUserId.setText(getString(R.string.security_token_key_holder, mUserId));
         } else {
-            vUserId.setText(getString(R.string.yubikey_key_holder_not_set));
+            vUserId.setText(getString(R.string.security_token_key_holder_not_set));
         }
 
         vButton = (Button) view.findViewById(R.id.button_bind);
@@ -124,7 +124,7 @@ public class ViewKeyYubiKeyFragment
             }
         });
 
-        vStatus = (TextView) view.findViewById(R.id.yubikey_status);
+        vStatus = (TextView) view.findViewById(R.id.token_status);
 
         return view;
     }
@@ -185,12 +185,12 @@ public class ViewKeyYubiKeyFragment
 
         if (allBound) {
             vButton.setVisibility(View.GONE);
-            vStatus.setText(R.string.yubikey_status_bound);
+            vStatus.setText(R.string.security_token_status_bound);
         } else {
             vButton.setVisibility(View.VISIBLE);
             vStatus.setText(noneBound
-                    ? R.string.yubikey_status_unbound
-                    : R.string.yubikey_status_partly);
+                    ? R.string.security_token_status_unbound
+                    : R.string.security_token_status_partly);
         }
 
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
index 84608f2dc..b5ef1d5e4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
@@ -174,7 +174,7 @@ public class SubkeysAdapter extends CursorAdapter {
                 ? mSaveKeyringParcel.getSubkeyChange(keyId)
                 : null;
 
-        if (change != null && (change.mDummyStrip || change.mMoveKeyToCard)) {
+        if (change != null && (change.mDummyStrip || change.mMoveKeyToSecurityToken)) {
             if (change.mDummyStrip) {
                 algorithmStr.append(", ");
                 final SpannableString boldStripped = new SpannableString(
@@ -183,7 +183,7 @@ public class SubkeysAdapter extends CursorAdapter {
                 boldStripped.setSpan(new StyleSpan(Typeface.BOLD), 0, boldStripped.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                 algorithmStr.append(boldStripped);
             }
-            if (change.mMoveKeyToCard) {
+            if (change.mMoveKeyToSecurityToken) {
                 algorithmStr.append(", ");
                 final SpannableString boldDivert = new SpannableString(
                         context.getString(R.string.key_divert)
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenNfcActivity.java
index 3e0bc7890..0f00fcd92 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenNfcActivity.java
@@ -60,9 +60,8 @@ import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import org.sufficientlysecure.keychain.util.Iso7816TLV;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.Passphrase;
-import org.sufficientlysecure.keychain.util.Preferences;
 
-public abstract class BaseNfcActivity extends BaseActivity {
+public abstract class BaseSecurityTokenNfcActivity extends BaseActivity {
 
     public static final int REQUEST_CODE_PIN = 1;
 
@@ -113,9 +112,9 @@ public abstract class BaseNfcActivity extends BaseActivity {
 
             Intent intent = new Intent(this, ViewKeyActivity.class);
             intent.setData(KeyRings.buildGenericKeyRingUri(masterKeyId));
-            intent.putExtra(ViewKeyActivity.EXTRA_NFC_AID, mNfcAid);
-            intent.putExtra(ViewKeyActivity.EXTRA_NFC_USER_ID, mNfcUserId);
-            intent.putExtra(ViewKeyActivity.EXTRA_NFC_FINGERPRINTS, mNfcFingerprints);
+            intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_AID, mNfcAid);
+            intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_USER_ID, mNfcUserId);
+            intent.putExtra(ViewKeyActivity.EXTRA_SECURITY_TOKEN_FINGERPRINTS, mNfcFingerprints);
             startActivity(intent);
         } catch (PgpKeyNotFoundException e) {
             Intent intent = new Intent(this, CreateKeyActivity.class);
@@ -224,12 +223,12 @@ public abstract class BaseNfcActivity extends BaseActivity {
     private void handleNfcError(IOException e) {
 
         if (e instanceof TagLostException) {
-            onNfcError(getString(R.string.error_nfc_tag_lost));
+            onNfcError(getString(R.string.security_token_error_tag_lost));
             return;
         }
 
         if (e instanceof IsoDepNotSupportedException) {
-            onNfcError(getString(R.string.error_nfc_iso_dep_not_supported));
+            onNfcError(getString(R.string.security_token_error_iso_dep_not_supported));
             return;
         }
 
@@ -244,69 +243,69 @@ public abstract class BaseNfcActivity extends BaseActivity {
         if ((status & (short) 0xFFF0) == 0x63C0) {
             int tries = status & 0x000F;
             // hook to do something different when PIN is wrong
-            onNfcPinError(getResources().getQuantityString(R.plurals.error_pin, tries, tries));
+            onNfcPinError(getResources().getQuantityString(R.plurals.security_token_error_pin, tries, tries));
             return;
         }
 
         // Otherwise, all status codes are fixed values.
         switch (status) {
             // These errors should not occur in everyday use; if they are returned, it means we
-            // made a mistake sending data to the card, or the card is misbehaving.
+            // made a mistake sending data to the token, or the token is misbehaving.
             case 0x6A80: {
-                onNfcError(getString(R.string.error_nfc_bad_data));
+                onNfcError(getString(R.string.security_token_error_bad_data));
                 break;
             }
             case 0x6883: {
-                onNfcError(getString(R.string.error_nfc_chaining_error));
+                onNfcError(getString(R.string.security_token_error_chaining_error));
                 break;
             }
             case 0x6B00: {
-                onNfcError(getString(R.string.error_nfc_header, "P1/P2"));
+                onNfcError(getString(R.string.security_token_error_header, "P1/P2"));
                 break;
             }
             case 0x6D00: {
-                onNfcError(getString(R.string.error_nfc_header, "INS"));
+                onNfcError(getString(R.string.security_token_error_header, "INS"));
                 break;
             }
             case 0x6E00: {
-                onNfcError(getString(R.string.error_nfc_header, "CLA"));
+                onNfcError(getString(R.string.security_token_error_header, "CLA"));
                 break;
             }
             // These error conditions are more likely to be experienced by an end user.
             case 0x6285: {
-                onNfcError(getString(R.string.error_nfc_terminated));
+                onNfcError(getString(R.string.security_token_error_terminated));
                 break;
             }
             case 0x6700: {
-                onNfcPinError(getString(R.string.error_nfc_wrong_length));
+                onNfcPinError(getString(R.string.security_token_error_wrong_length));
                 break;
             }
             case 0x6982: {
-                onNfcError(getString(R.string.error_nfc_security_not_satisfied));
+                onNfcError(getString(R.string.security_token_error_security_not_satisfied));
                 break;
             }
             case 0x6983: {
-                onNfcError(getString(R.string.error_nfc_authentication_blocked));
+                onNfcError(getString(R.string.security_token_error_authentication_blocked));
                 break;
             }
             case 0x6985: {
-                onNfcError(getString(R.string.error_nfc_conditions_not_satisfied));
+                onNfcError(getString(R.string.security_token_error_conditions_not_satisfied));
                 break;
             }
             // 6A88 is "Not Found" in the spec, but Yubikey also returns 6A83 for this in some cases.
             case 0x6A88:
             case 0x6A83: {
-                onNfcError(getString(R.string.error_nfc_data_not_found));
+                onNfcError(getString(R.string.security_token_error_data_not_found));
                 break;
             }
             // 6F00 is a JavaCard proprietary status code, SW_UNKNOWN, and usually represents an
-            // unhandled exception on the smart card.
+            // unhandled exception on the security token.
             case 0x6F00: {
-                onNfcError(getString(R.string.error_nfc_unknown));
+                onNfcError(getString(R.string.security_token_error_unknown));
                 break;
             }
             default: {
-                onNfcError(getString(R.string.error_nfc, e.getMessage()));
+                onNfcError(getString(R.string.security_token_error, e.getMessage()));
                 break;
             }
         }
@@ -335,7 +334,7 @@ public abstract class BaseNfcActivity extends BaseActivity {
         enableNfcForegroundDispatch();
     }
 
-    protected void obtainYubiKeyPin(RequiredInputParcel requiredInput) {
+    protected void obtainSecurityTokenPin(RequiredInputParcel requiredInput) {
 
         try {
             Passphrase passphrase = PassphraseCacheService.getCachedPassphrase(this,
@@ -471,7 +470,7 @@ public abstract class BaseNfcActivity extends BaseActivity {
         return fptlv.mV;
     }
 
-    /** Return the PW Status Bytes from the card. This is a simple DO; no TLV decoding needed.
+    /** Return the PW Status Bytes from the token. This is a simple DO; no TLV decoding needed.
      *
      * @return Seven bytes in fixed format, plus 0x9000 status word at the end.
      */
@@ -697,7 +696,7 @@ public abstract class BaseNfcActivity extends BaseActivity {
             }
         }
 
-        // reactivate card!
+        // reactivate token!
         String reactivate1 = "00" + "e6" + "00" + "00";
         String reactivate2 = "00" + "44" + "00" + "00";
         String response1 = nfcCommunicate(reactivate1);
@@ -722,7 +721,7 @@ public abstract class BaseNfcActivity extends BaseActivity {
     }
 
     /** Modifies the user's PW1 or PW3. Before sending, the new PIN will be validated for
-     *  conformance to the card's requirements for key length.
+     *  conformance to the token's requirements for key length.
      *
      * @param pw For PW1, this is 0x81. For PW3 (Admin PIN), mode is 0x83.
      * @param newPin The new PW1 or PW3.
@@ -767,7 +766,7 @@ public abstract class BaseNfcActivity extends BaseActivity {
     }
 
     /**
-     * Stores a data object on the card. Automatically validates the proper PIN for the operation.
+     * Stores a data object on the token. Automatically validates the proper PIN for the operation.
      * Supported for all data objects < 255 bytes in length. Only the cardholder certificate
      * (0x7F21) can exceed this length.
      *
@@ -800,9 +799,9 @@ public abstract class BaseNfcActivity extends BaseActivity {
     }
 
     /**
-     * Puts a key on the card in the given slot.
+     * Puts a key on the token in the given slot.
      *
-     * @param slot The slot on the card where the key should be stored:
+     * @param slot The slot on the token where the key should be stored:
      *             0xB6: Signature Key
      *             0xB8: Decipherment Key
      *             0xA4: Authentication Key
@@ -823,12 +822,12 @@ public abstract class BaseNfcActivity extends BaseActivity {
 
         // Shouldn't happen; the UI should block the user from getting an incompatible key this far.
         if (crtSecretKey.getModulus().bitLength() > 2048) {
-            throw new IOException("Key too large to export to smart card.");
+            throw new IOException("Key too large to export to Security Token.");
         }
 
         // Should happen only rarely; all GnuPG keys since 2006 use public exponent 65537.
         if (!crtSecretKey.getPublicExponent().equals(new BigInteger("65537"))) {
-            throw new IOException("Invalid public exponent for smart card key.");
+            throw new IOException("Invalid public exponent for smart Security Token.");
         }
 
         if (!mPw3Validated) {
@@ -884,7 +883,7 @@ public abstract class BaseNfcActivity extends BaseActivity {
         String putKeyCommand = "10DB3FFF";
         String lastPutKeyCommand = "00DB3FFF";
 
-        // Now we're ready to communicate with the card.
+        // Now we're ready to communicate with the token.
         offset = 0;
         String response;
         while(offset < dataToSend.length) {
@@ -903,7 +902,7 @@ public abstract class BaseNfcActivity extends BaseActivity {
             }
 
             if (!response.endsWith("9000")) {
-                throw new CardException("Key export to card failed", parseCardStatus(response));
+                throw new CardException("Key export to Security Token failed", parseCardStatus(response));
             }
         }
 
@@ -914,7 +913,7 @@ public abstract class BaseNfcActivity extends BaseActivity {
     /**
      * Parses out the status word from a JavaCard response string.
      *
-     * @param response A hex string with the response from the card
+     * @param response A hex string with the response from the token
      * @return A short indicating the SW1/SW2, or 0 if a status could not be determined.
      */
     short parseCardStatus(String response) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java
index 7ab9c7237..451065d6b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java
@@ -39,7 +39,7 @@ import org.sufficientlysecure.keychain.service.KeychainService;
 import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
 import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
-import org.sufficientlysecure.keychain.ui.NfcOperationActivity;
+import org.sufficientlysecure.keychain.ui.SecurityTokenOperationActivity;
 import org.sufficientlysecure.keychain.ui.OrbotRequiredDialogActivity;
 import org.sufficientlysecure.keychain.ui.PassphraseDialogActivity;
 import org.sufficientlysecure.keychain.ui.RetryUploadDialogActivity;
@@ -133,9 +133,9 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
             case NFC_MOVE_KEY_TO_CARD:
             case NFC_DECRYPT:
             case NFC_SIGN: {
-                Intent intent = new Intent(activity, NfcOperationActivity.class);
-                intent.putExtra(NfcOperationActivity.EXTRA_REQUIRED_INPUT, requiredInput);
-                intent.putExtra(NfcOperationActivity.EXTRA_CRYPTO_INPUT, cryptoInputParcel);
+                Intent intent = new Intent(activity, SecurityTokenOperationActivity.class);
+                intent.putExtra(SecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, requiredInput);
+                intent.putExtra(SecurityTokenOperationActivity.EXTRA_CRYPTO_INPUT, cryptoInputParcel);
                 startActivityForResult(intent, REQUEST_CODE_NFC);
                 return;
             }
@@ -212,7 +212,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
             case REQUEST_CODE_NFC: {
                 if (resultCode == Activity.RESULT_OK && data != null) {
                     CryptoInputParcel cryptoInput =
-                            data.getParcelableExtra(NfcOperationActivity.RESULT_CRYPTO_INPUT);
+                            data.getParcelableExtra(SecurityTokenOperationActivity.RESULT_CRYPTO_INPUT);
                     cryptoOperation(cryptoInput);
                 }
                 break;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
index 75a7dcaba..8eafbbdf1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
@@ -124,8 +124,8 @@ public class Preferences {
         return mSharedPreferences.getBoolean(Constants.Pref.FIRST_TIME, true);
     }
 
-    public boolean useNumKeypadForYubiKeyPin() {
-        return mSharedPreferences.getBoolean(Pref.USE_NUMKEYPAD_FOR_YUBIKEY_PIN, true);
+    public boolean useNumKeypadForSecurityTokenPin() {
+        return mSharedPreferences.getBoolean(Pref.USE_NUMKEYPAD_FOR_SECURITY_TOKEN_PIN, true);
     }
 
     public void setFirstTime(boolean value) {
diff --git a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
index 622cdf5a0..5221fa6e6 100644
--- a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
@@ -50,22 +50,52 @@
             android:clickable="true"
             style="?android:attr/borderlessButtonStyle" />
 
-        <TextView
-            android:id="@+id/create_key_yubikey_button"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+        <RelativeLayout
+            android:id="@+id/create_key_security_token_button"
+            style="?android:attr/borderlessButtonStyle"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/first_time_yubikey"
-            android:textAllCaps="true"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
-            android:drawablePadding="8dp"
             android:gravity="right|center_vertical"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:layout_weight="1"
             android:clickable="true"
-            style="?android:attr/borderlessButtonStyle" />
+            android:minHeight="?android:attr/listPreferredItemHeight">
+
+            <TextView
+                android:id="@+id/textView4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="16dp"
+                android:paddingRight="10dp"
+                android:text="@string/first_time_security_token"
+                android:textAllCaps="true"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_alignParentTop="true"
+                android:layout_toLeftOf="@+id/imageView5"
+                android:layout_toStartOf="@+id/imageView5" />
+
+            <ImageView
+                android:id="@+id/imageView5"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:paddingRight="10dp"
+                android:src="@drawable/ic_chevron_right_grey_24dp" />
+
+            <TextView
+                android:id="@+id/textView3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="16dp"
+                android:paddingRight="10dp"
+                android:text="@string/first_time_security_token_subtitle"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_alignParentBottom="true"
+                android:layout_toLeftOf="@+id/imageView5"
+                android:layout_toStartOf="@+id/imageView5" />
+
+        </RelativeLayout>
 
         <TextView
             android:id="@+id/create_key_import_button"
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_import_reset_fragment.xml b/OpenKeychain/src/main/res/layout/create_security_token_import_reset_fragment.xml
index 7acc2dca9..e97b99076 100644
--- a/OpenKeychain/src/main/res/layout/create_yubi_key_import_reset_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_security_token_import_reset_fragment.xml
@@ -36,14 +36,14 @@
                     android:orientation="vertical">
 
                     <TextView
-                        android:id="@+id/yubikey_serno"
+                        android:id="@+id/token_serno"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:text="Yubikey #" />
 
                     <TextView
-                        android:id="@+id/yubikey_userid"
+                        android:id="@+id/token_userid"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
@@ -67,7 +67,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="8dp"
                     android:layout_marginTop="8dp"
-                    android:text="@string/yubikey_reset_or_import"
+                    android:text="@string/security_token_reset_or_import"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
                 <RadioGroup
@@ -76,19 +76,19 @@
                     android:orientation="vertical">
 
                     <RadioButton
-                        android:id="@+id/yubikey_decision_import"
+                        android:id="@+id/token_decision_import"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
-                        android:text="@string/yubikey_import_radio" />
+                        android:text="@string/security_token_import_radio" />
 
                     <RadioButton
-                        android:id="@+id/yubikey_decision_reset"
+                        android:id="@+id/token_decision_reset"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="16dp"
                         android:layout_marginTop="16dp"
-                        android:text="@string/yubikey_reset_radio" />
+                        android:text="@string/security_token_reset_radio" />
                 </RadioGroup>
 
             </LinearLayout>
@@ -101,19 +101,19 @@
                 android:background="?android:attr/listDivider" />
 
             <FrameLayout
-                android:id="@+id/yubikey_import_fragment"
+                android:id="@+id/security_token_import_fragment"
                 android:layout_width="fill_parent"
                 android:layout_height="match_parent"
                 android:layout_below="@id/yubikey_decision"
                 android:layout_marginTop="8dp">
 
                 <TextView
-                    android:id="@+id/yubikey_import_reset_warning"
+                    android:id="@+id/token_import_reset_warning"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:layout_margin="24dp"
-                    android:text="@string/yubikey_reset_warning"
+                    android:text="@string/security_token_reset_warning"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="@color/android_red_dark"
                     android:visibility="gone" />
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml b/OpenKeychain/src/main/res/layout/create_security_token_wait_fragment.xml
index 7f26995a7..4436cfe01 100644
--- a/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_security_token_wait_fragment.xml
@@ -22,7 +22,7 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginLeft="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/yubikey_create" />
+                android:text="@string/security_token_create" />
 
             <ImageView
                 android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml
index 7e2bf2246..05c837059 100644
--- a/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml
@@ -22,7 +22,7 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginLeft="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/first_time_blank_yubikey" />
+                android:text="@string/first_time_blank_security_token" />
 
         </LinearLayout>
     </ScrollView>
@@ -64,7 +64,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_gravity="center_vertical"
-            android:text="@string/first_time_blank_yubikey_yes"
+            android:text="@string/first_time_blank_security_token_yes"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
diff --git a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml b/OpenKeychain/src/main/res/layout/security_token_operation_activity.xml
index d3ee363d5..1644f6a6f 100644
--- a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml
+++ b/OpenKeychain/src/main/res/layout/security_token_operation_activity.xml
@@ -21,34 +21,34 @@
             android:layout_height="wrap_content">
 
             <TextView
-                android:id="@+id/nfc_activity_0_text"
+                android:id="@+id/security_token_activity_0_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="24dp"
                 android:layout_marginRight="24dp"
                 android:layout_marginTop="24dp"
-                android:text="@string/nfc_text"
+                android:text="@string/security_token_nfc_text"
                 android:textAppearance="@android:style/TextAppearance.Medium" />
 
             <ImageView
-                android:id="@+id/nfc_activity_0_image"
+                android:id="@+id/security_token_activity_0_image"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
-                android:layout_below="@+id/nfc_activity_0_text"
+                android:layout_below="@+id/security_token_activity_0_text"
                 android:layout_margin="24dp"
                 android:adjustViewBounds="true"
                 android:background="@android:color/transparent"
                 android:src="@drawable/yubikey_phone" />
 
             <Button
-                android:id="@+id/nfc_activity_0_cancel"
+                android:id="@+id/security_token_activity_0_cancel"
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
-                android:layout_below="@+id/nfc_activity_0_image"
+                android:layout_below="@+id/security_token_activity_0_image"
                 android:layout_margin="8dp"
                 android:text="@string/progress_cancel" />
         </RelativeLayout>
@@ -58,13 +58,13 @@
             android:layout_height="wrap_content">
 
             <TextView
-                android:id="@+id/nfc_activity_1_text"
+                android:id="@+id/security_token_activity_1_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="24dp"
                 android:layout_marginRight="24dp"
                 android:layout_marginTop="24dp"
-                android:text="@string/nfc_wait"
+                android:text="@string/security_token_nfc_wait"
                 android:textAppearance="@android:style/TextAppearance.Medium" />
 
             <ProgressBar
@@ -77,12 +77,12 @@
 
             <!-- placeholder to retain dialog size -->
             <ImageView
-                android:id="@+id/nfc_activity_1_placeholder"
+                android:id="@+id/security_token_activity_1_placeholder"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
-                android:layout_below="@+id/nfc_activity_1_text"
+                android:layout_below="@+id/security_token_activity_1_text"
                 android:layout_margin="24dp"
                 android:adjustViewBounds="true"
                 android:background="@android:color/transparent"
@@ -90,12 +90,12 @@
                 android:visibility="invisible" />
 
             <Button
-                android:id="@+id/nfc_activity_1_button_placeholder"
+                android:id="@+id/security_token_activity_1_button_placeholder"
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
-                android:layout_below="@+id/nfc_activity_1_placeholder"
+                android:layout_below="@+id/security_token_activity_1_placeholder"
                 android:layout_margin="8dp"
                 android:text=""
                 android:visibility="invisible" />
@@ -107,23 +107,23 @@
             android:layout_height="wrap_content">
 
             <TextView
-                android:id="@+id/nfc_activity_2_text"
+                android:id="@+id/security_token_activity_2_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="24dp"
                 android:layout_marginRight="24dp"
                 android:layout_marginTop="24dp"
-                android:text="@string/nfc_finished"
+                android:text="@string/security_token_nfc_finished"
                 android:textAppearance="@android:style/TextAppearance.Medium" />
 
             <!-- placeholder to retain dialog size -->
             <ImageView
-                android:id="@+id/nfc_activity_2_placeholder"
+                android:id="@+id/security_token_activity_2_placeholder"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
-                android:layout_below="@+id/nfc_activity_2_text"
+                android:layout_below="@+id/security_token_activity_2_text"
                 android:layout_margin="24dp"
                 android:adjustViewBounds="true"
                 android:background="@android:color/transparent"
@@ -140,12 +140,12 @@
                 android:src="@drawable/ic_check_circle_black_48dp" />
 
             <Button
-                android:id="@+id/nfc_activity_2_button_placeholder"
+                android:id="@+id/security_token_activity_2_button_placeholder"
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
-                android:layout_below="@+id/nfc_activity_2_placeholder"
+                android:layout_below="@+id/security_token_activity_2_placeholder"
                 android:layout_margin="8dp"
                 android:text=""
                 android:visibility="invisible" />
@@ -157,11 +157,11 @@
             android:layout_height="wrap_content">
 
             <TextView
-                android:id="@+id/nfc_activity_3_text_placeholder"
+                android:id="@+id/security_token_activity_3_text_placeholder"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignEnd="@+id/nfc_activity_3_placeholder"
-                android:layout_alignRight="@+id/nfc_activity_3_placeholder"
+                android:layout_alignEnd="@+id/security_token_activity_3_placeholder"
+                android:layout_alignRight="@+id/security_token_activity_3_placeholder"
                 android:layout_marginLeft="24dp"
                 android:layout_marginTop="24dp"
                 android:text=""
@@ -169,12 +169,12 @@
 
             <!-- placeholder to retain dialog size -->
             <ImageView
-                android:id="@+id/nfc_activity_3_placeholder"
+                android:id="@+id/security_token_activity_3_placeholder"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
-                android:layout_below="@+id/nfc_activity_3_text_placeholder"
+                android:layout_below="@+id/security_token_activity_3_text_placeholder"
                 android:layout_margin="24dp"
                 android:adjustViewBounds="true"
                 android:background="@android:color/transparent"
@@ -182,7 +182,7 @@
                 android:visibility="invisible" />
 
             <TextView
-                android:id="@+id/nfc_activity_3_error_text"
+                android:id="@+id/security_token_activity_3_error_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
@@ -193,14 +193,14 @@
                 tools:text="Error text" />
 
             <Button
-                android:id="@+id/nfc_activity_3_error_try_again"
+                android:id="@+id/security_token_activity_3_error_try_again"
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
-                android:layout_below="@+id/nfc_activity_3_placeholder"
+                android:layout_below="@+id/security_token_activity_3_placeholder"
                 android:layout_margin="8dp"
-                android:text="@string/error_nfc_try_again" />
+                android:text="@string/security_token_error_try_again" />
 
         </RelativeLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml b/OpenKeychain/src/main/res/layout/view_key_security_token.xml
index 5e2bfbfe6..27fa3d53c 100644
--- a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_security_token.xml
@@ -33,7 +33,7 @@
                     style="@style/CardViewHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/section_yubikey"/>
+                    android:text="@string/section_security_token"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -56,7 +56,7 @@
                         android:orientation="vertical">
 
                         <TextView
-                            android:id="@+id/yubikey_serno"
+                            android:id="@+id/token_serno"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
@@ -64,7 +64,7 @@
                             />
 
                         <TextView
-                            android:id="@+id/yubikey_userid"
+                            android:id="@+id/token_userid"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
@@ -72,7 +72,7 @@
                             />
 
                         <TextView
-                            android:id="@+id/yubikey_status"
+                            android:id="@+id/token_status"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index 6b080e665..9aacacd99 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -32,7 +32,7 @@
   <string name="title_manage_my_keys">Spravovat klíče</string>
   <!--section-->
   <string name="section_user_ids">Identity</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_linked_system_contact">Propojený kontakt v systému</string>
   <string name="section_should_you_trust">Důvěřujete tomuto klíči?</string>
   <string name="section_proof_details">Doložit ověření</string>
@@ -98,7 +98,7 @@
   <string name="label_file_ascii_armor">Povolit ASCII armor</string>
   <string name="label_write_version_header">Dát ostatním vědět, že používáte OpenKeychain</string>
   <string name="label_write_version_header_summary">Zapisovat \'OpenKeychain v2.7\' do OpenPGP podpisů, šifrovaného textu a exportovaných klíčů</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Použít numerickou klávesnici pro YubiKey PIN</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Použít numerickou klávesnici pro YubiKey PIN</string>
   <string name="label_to">Zašifrovat pro:</string>
   <string name="label_delete_after_encryption">Smazat soubory po zašifrování</string>
   <string name="label_delete_after_decryption">Smazat po rozšifrování</string>
@@ -180,7 +180,7 @@
   <string name="passphrase_must_not_be_empty">Zadejte heslo.</string>
   <string name="passphrase_for">Zadejte heslo pro \'%s\'</string>
   <string name="pin_for">Zadejte PIN pro \'%s\'</string>
-  <string name="yubikey_pin_for">Zadejte PIN pro přístup k YubiKey pro \'%s\'</string>
+  <string name="security_token_pin_for">Zadejte PIN pro přístup k YubiKey pro \'%s\'</string>
   <string name="file_delete_confirmation_title">Smazat původní soubory?</string>
   <string name="file_delete_confirmation">Následjící soubory budou vymazány:%s</string>
   <string name="file_delete_successful">%1$d z %2$d souborů bylo vymazáno.%3$s</string>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 6a29c338f..aba8320d2 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -36,7 +36,7 @@
   <string name="title_manage_my_keys">Meine Schlüssel verwalten</string>
   <!--section-->
   <string name="section_user_ids">Identitäten</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_linked_system_contact">Verknüpfter Systemkontakt</string>
   <string name="section_keybase_proofs">Keybase.io-Nachweise</string>
   <string name="section_should_you_trust">Sollte ich diesem Schlüssel vertrauen?</string>
@@ -128,7 +128,7 @@
   <string name="label_file_ascii_armor">Aktiviere ASCII Armor</string>
   <string name="label_write_version_header">Lass andere wissen dass du OpenKeychain nutzt</string>
   <string name="label_write_version_header_summary">Fügt \'OpenKeychain v2.7\' zu OpenPGP-Signaturen, Daten und exportierten Schlüsseln hinzu</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Zifferntastatur für YubiKey-PINs verwenden</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Zifferntastatur für YubiKey-PINs verwenden</string>
   <string name="label_asymmetric_from">Signiere mit:</string>
   <string name="label_to">Verschlüsselt an:</string>
   <string name="label_delete_after_encryption">Dateien nach Verschlüsselung löschen</string>
@@ -256,10 +256,10 @@
   <string name="passphrase_for_backup">Backupcode eingeben</string>
   <string name="passphrase_for">Passwort für \'%s\' eingeben</string>
   <string name="pin_for">PIN für \'%s\' eingeben</string>
-  <string name="yubikey_pin_for">PIN des YubiKeys für \'%s\' eingeben</string>
-  <string name="nfc_text">Halte den YubiKey gegen die Rückseite deines Geräts in die Nähe der NFC-Markierung.</string>
-  <string name="nfc_wait">Halte den YubiKey an die Rückseite!</string>
-  <string name="nfc_finished">Entferne jetzt den YubiKey.</string>
+  <string name="security_token_pin_for">PIN des YubiKeys für \'%s\' eingeben</string>
+  <string name="security_token_nfc_text">Halte den YubiKey gegen die Rückseite deines Geräts in die Nähe der NFC-Markierung.</string>
+  <string name="security_token_nfc_wait">Halte den YubiKey an die Rückseite!</string>
+  <string name="security_token_nfc_finished">Entferne jetzt den YubiKey.</string>
   <string name="file_delete_confirmation_title">Originaldateien löschen?</string>
   <string name="file_delete_confirmation">Die folgenden Dateien werden gelöscht: %s</string>
   <string name="file_delete_successful">%1$d von %2$d Dateien wurden gelöscht.%3$s</string>
@@ -650,9 +650,9 @@
   <string name="edit_key_select_flag">Bitte mindestens ein Attribut wählen!</string>
   <string name="edit_key_error_add_identity">Füge mindestens eine Identität hinzu!</string>
   <string name="edit_key_error_add_subkey">Füge mindestens einen Unterschlüssel hinzu!</string>
-  <string name="edit_key_error_bad_nfc_algo">Hash-Algorithmus wird von dieser Smartcard nicht unterstützt!</string>
-  <string name="edit_key_error_bad_nfc_size">Die Schlüssellänge wird von dieser Smartcard nicht unterstützt!</string>
-  <string name="edit_key_error_bad_nfc_stripped">Schlüssel kann nicht auf Smartcard verschoben werden (entweder er ist gekürzt oder \'auf Karte umgeleitet\')!</string>
+  <string name="edit_key_error_bad_security_token_algo">Hash-Algorithmus wird von dieser Smartcard nicht unterstützt!</string>
+  <string name="edit_key_error_bad_security_token_size">Die Schlüssellänge wird von dieser Smartcard nicht unterstützt!</string>
+  <string name="edit_key_error_bad_security_token_stripped">Schlüssel kann nicht auf Smartcard verschoben werden (entweder er ist gekürzt oder \'auf Karte umgeleitet\')!</string>
   <!--Create key-->
   <string name="create_key_upload">Mit dem Internet synchronisieren</string>
   <string name="create_key_empty">Dieses Feld wird benötigt</string>
@@ -1250,10 +1250,10 @@
   <string name="first_time_text1">Hol dir deine Privatsphäre mit OpenKeychain zurück!</string>
   <string name="first_time_create_key">Meinen Schlüssel erzeugen</string>
   <string name="first_time_import_key">Schlüssel aus Datei importieren</string>
-  <string name="first_time_yubikey">YubiKey NEO verwenden</string>
+  <string name="first_time_security_token">YubiKey NEO verwenden</string>
   <string name="first_time_skip">Setup überspringen</string>
-  <string name="first_time_blank_yubikey">Möchtest du diesen leeren YubiKey NEO mit OpenKeychain verwenden?\n\nBitte nimm den YubiKey nun weg, du wirst aufgefordert, wenn er erneut benötigt wird!</string>
-  <string name="first_time_blank_yubikey_yes">Diesen YubiKey verwenden</string>
+  <string name="first_time_blank_security_token">Möchtest du diesen leeren YubiKey NEO mit OpenKeychain verwenden?\n\nBitte nimm den YubiKey nun weg, du wirst aufgefordert, wenn er erneut benötigt wird!</string>
+  <string name="first_time_blank_security_token_yes">Diesen YubiKey verwenden</string>
   <string name="backup_text">Backups, die deine eigenen Schlüssel beinhalten, dürfen unter keinen Umständen an anderen Personen gegeben werden.</string>
   <string name="backup_all">Alle Schlüssel + deine eigenen Schlüssel</string>
   <string name="backup_public_keys">Alle Schlüssel</string>
@@ -1319,38 +1319,38 @@
   <string name="nfc_wrong_tag">Falscher Tag, bitte versuche es erneut.</string>
   <string name="enable_nfc">Bitte aktiviere NFC in deinen Einstellungen.</string>
   <string name="no_nfc_support">Dieses Gerät unterstützt kein NFC</string>
-  <string name="nfc_write_succesful">Erfolgreich auf den NFC-Tag geschrieben</string>
+  <string name="nfc_write_successful">Erfolgreich auf den NFC-Tag geschrieben</string>
   <string name="unlocked">Entsperrt</string>
   <string name="nfc_settings">Einstellungen</string>
-  <string name="snack_yubikey_view">Anzeigen</string>
-  <string name="snack_yubikey_import">Import</string>
+  <string name="snack_security_token_view">Anzeigen</string>
+  <string name="snack_security_token_import">Import</string>
   <string name="button_bind_key">Schlüssel verbinden</string>
-  <string name="yubikey_serno">Seriennummer: %s</string>
-  <string name="yubikey_key_holder">Schlüsselinhaber:</string>
-  <string name="yubikey_key_holder_not_set"><![CDATA[Schlüsselinhaber: <nicht festgelegt>]]></string>
-  <string name="yubikey_status_bound">YubiKey stimmt überein und ist mit dem Schlüssel gekoppelt</string>
-  <string name="yubikey_status_unbound">YubiKey stimmt überein und kann mit dem Schlüssel gekoppelt werden</string>
-  <string name="yubikey_status_partly">YubiKey stimmt überein und ist teilweise mit dem Schlüssel gekoppelt</string>
-  <string name="yubikey_create">Halte den YubiKey gegen die Rückseite deines Geräts.</string>
+  <string name="security_token_serial_no">Seriennummer: %s</string>
+  <string name="security_token_key_holder">Schlüsselinhaber:</string>
+  <string name="security_token_key_holder_not_set"><![CDATA[Schlüsselinhaber: <nicht festgelegt>]]></string>
+  <string name="security_token_status_bound">YubiKey stimmt überein und ist mit dem Schlüssel gekoppelt</string>
+  <string name="security_token_status_unbound">YubiKey stimmt überein und kann mit dem Schlüssel gekoppelt werden</string>
+  <string name="security_token_status_partly">YubiKey stimmt überein und ist teilweise mit dem Schlüssel gekoppelt</string>
+  <string name="security_token_create">Halte den YubiKey gegen die Rückseite deines Geräts.</string>
   <string name="btn_import">Import</string>
-  <string name="snack_yubi_other">Anderer Schlüssel auf YubiKey gespeichert!</string>
-  <string name="error_nfc">NFC-Fehler: %s</string>
-  <plurals name="error_pin">
+  <string name="snack_security_token_other">Anderer Schlüssel auf YubiKey gespeichert!</string>
+  <string name="security_token_error">NFC-Fehler: %s</string>
+  <plurals name="security_token_error_pin">
     <item quantity="one">PIN falsch!\n%d Versuch verbleibend.</item>
     <item quantity="other">PIN falsch!\n%d Versuche verbleibend.</item>
   </plurals>
-  <string name="error_nfc_terminated">YubiKey befindet sich in beendetem Zustand.</string>
-  <string name="error_nfc_wrong_length">Eingegebene PIN zu kurz. PINs müssen aus mindestens 6 Ziffern bestehen.</string>
-  <string name="error_nfc_conditions_not_satisfied">Nutzungsbedingungen werden nicht erfüllt. </string>
-  <string name="error_nfc_security_not_satisfied">Sicherheitsstatus nicht erfüllt.</string>
-  <string name="error_nfc_authentication_blocked">PIN nach zu vielen Versuchen gesperrt.</string>
-  <string name="error_nfc_data_not_found">Schlüssel oder Objekt nicht gefunden.</string>
-  <string name="error_nfc_unknown">Unbekannter Fehler</string>
-  <string name="error_nfc_bad_data">YubiKey meldete ungültige Daten.</string>
-  <string name="error_nfc_chaining_error">YubiKey erwartete das letzte Kommando in einer Kette.</string>
-  <string name="error_nfc_header">YubiKey meldete ungültige %s Byte.</string>
-  <string name="error_nfc_tag_lost">YubiKey wurde zu früh abgenommen. Halte den YubiKey an die Rückseite, bis der Vorgang beendet ist.</string>
-  <string name="error_nfc_try_again">Erneut versuchen</string>
+  <string name="security_token_error_terminated">YubiKey befindet sich in beendetem Zustand.</string>
+  <string name="security_token_error_wrong_length">Eingegebene PIN zu kurz. PINs müssen aus mindestens 6 Ziffern bestehen.</string>
+  <string name="security_token_error_conditions_not_satisfied">Nutzungsbedingungen werden nicht erfüllt. </string>
+  <string name="security_token_error_security_not_satisfied">Sicherheitsstatus nicht erfüllt.</string>
+  <string name="security_token_error_authentication_blocked">PIN nach zu vielen Versuchen gesperrt.</string>
+  <string name="security_token_error_data_not_found">Schlüssel oder Objekt nicht gefunden.</string>
+  <string name="security_token_error_unknown">Unbekannter Fehler</string>
+  <string name="security_token_error_bad_data">YubiKey meldete ungültige Daten.</string>
+  <string name="security_token_error_chaining_error">YubiKey erwartete das letzte Kommando in einer Kette.</string>
+  <string name="security_token_error_header">YubiKey meldete ungültige %s Byte.</string>
+  <string name="security_token_error_tag_lost">YubiKey wurde zu früh abgenommen. Halte den YubiKey an die Rückseite, bis der Vorgang beendet ist.</string>
+  <string name="security_token_error_try_again">Erneut versuchen</string>
   <string name="error_temp_file">Erzeugen der temporären Datei fehlgeschlagen.</string>
   <string name="btn_delete_original">Originaldatei löschen</string>
   <string name="snack_encrypt_filenames_on">Dateinamen <b>sind</b> verschlüsselt.</string>
diff --git a/OpenKeychain/src/main/res/values-es-rMX/strings.xml b/OpenKeychain/src/main/res/values-es-rMX/strings.xml
index 6b4d5b332..083e5b813 100644
--- a/OpenKeychain/src/main/res/values-es-rMX/strings.xml
+++ b/OpenKeychain/src/main/res/values-es-rMX/strings.xml
@@ -36,7 +36,7 @@
   <string name="title_manage_my_keys">Administrar mis claves</string>
   <!--section-->
   <string name="section_user_ids">Identidades</string>
-  <string name="section_yubikey">Clave Yubi</string>
+  <string name="section_security_token">Clave Yubi</string>
   <string name="section_should_you_trust">¿Debería confiar en esta clave?</string>
   <string name="section_proof_details">Prueba de verificación</string>
   <string name="section_keys">Subclave</string>
@@ -122,7 +122,7 @@
   <string name="label_show_passphrase">Mostrar contraseña</string>
   <string name="label_algorithm">Algoritmo</string>
   <string name="label_write_version_header">Permitir que otros sepan que estás usando OpenKeychain</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Usar teclado numérico para NIP de clave Yubi</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Usar teclado numérico para NIP de clave Yubi</string>
   <string name="label_asymmetric_from">Firmar con...</string>
   <string name="label_to">Cifrar para:</string>
   <string name="label_delete_after_encryption">Eliminar archivos después de cifrado</string>
@@ -233,7 +233,7 @@
   <string name="passphrase_for_backup">Ingrese un código de respaldo</string>
   <string name="passphrase_for">Ingrese una contraseña para \'%s\'</string>
   <string name="pin_for">Ingrese un NIP para \'%s\'</string>
-  <string name="yubikey_pin_for">Ingrese NIP para acceder a una clave Yubi para \'%s\'</string>
+  <string name="security_token_pin_for">Ingrese NIP para acceder a una clave Yubi para \'%s\'</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index b895ced33..90c0c4940 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -36,7 +36,7 @@
   <string name="title_manage_my_keys">Administrar mis claves</string>
   <!--section-->
   <string name="section_user_ids">Identidades</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_linked_system_contact">Contacto del sistema vinculado</string>
   <string name="section_keybase_proofs">Pruebas de Keybase.io</string>
   <string name="section_should_you_trust">¿Debería confiar en esta clave?</string>
@@ -130,7 +130,7 @@
   <string name="label_file_ascii_armor">Habilitar armadura ASCII</string>
   <string name="label_write_version_header">Permitir a otros conocer que usted está usando OpenKeychain</string>
   <string name="label_write_version_header_summary">Escribe \'OpenKeychain v2.7\' en las firmas OpenPGP, texto cifrado, y claves exportadas</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Usar teclado numérico para el PIN de la YubiKey</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Usar teclado numérico para el PIN de la YubiKey</string>
   <string name="label_asymmetric_from">Firmar con:</string>
   <string name="label_to">Cifrar hacia:</string>
   <string name="label_delete_after_encryption">Borrar ficheros tras el cifrado</string>
@@ -262,10 +262,10 @@
   <string name="passphrase_for_backup">Ingrese código de respaldo</string>
   <string name="passphrase_for">Introduzca contraseña para \'%s\'</string>
   <string name="pin_for">Introduzca PIN para \'%s\'</string>
-  <string name="yubikey_pin_for">Introduzca PIN para acceder a la YubiKey para \'%s\'</string>
-  <string name="nfc_text">Sostenga la YubiKey contra el marcador NFC en el reverso de su dispositivo.</string>
-  <string name="nfc_wait">¡Mantenga la YubiKey en el reverso!</string>
-  <string name="nfc_finished">Retire la YubiKey ahora.</string>
+  <string name="security_token_pin_for">Introduzca PIN para acceder a la YubiKey para \'%s\'</string>
+  <string name="security_token_nfc_text">Sostenga la YubiKey contra el marcador NFC en el reverso de su dispositivo.</string>
+  <string name="security_token_nfc_wait">¡Mantenga la YubiKey en el reverso!</string>
+  <string name="security_token_nfc_finished">Retire la YubiKey ahora.</string>
   <string name="file_delete_confirmation_title">¿Borrar ficheros originales?</string>
   <string name="file_delete_confirmation">Se borrarán los siguientes ficheros:%s</string>
   <string name="file_delete_successful">%1$d de %2$d ficheros han sido borrados.%3$s</string>
@@ -659,9 +659,9 @@
   <string name="edit_key_select_flag">¡Por favor, seleccione al menos un indicador!</string>
   <string name="edit_key_error_add_identity">¡Añada al menos una identidad!</string>
   <string name="edit_key_error_add_subkey">¡Añadir al menos una subclave!</string>
-  <string name="edit_key_error_bad_nfc_algo">¡Algoritmo no soportado por la tarjeta inteligente!</string>
-  <string name="edit_key_error_bad_nfc_size">¡El tamaño de la clave no está soportado por la tarjeta inteligente!</string>
-  <string name="edit_key_error_bad_nfc_stripped">¡No se puede mover la clave a la tarjeta inteligente (tanto desnuda como \'derivar-a-tarjeta\')!</string>
+  <string name="edit_key_error_bad_security_token_algo">¡Algoritmo no soportado por la tarjeta inteligente!</string>
+  <string name="edit_key_error_bad_security_token_size">¡El tamaño de la clave no está soportado por la tarjeta inteligente!</string>
+  <string name="edit_key_error_bad_security_token_stripped">¡No se puede mover la clave a la tarjeta inteligente (tanto desnuda como \'derivar-a-tarjeta\')!</string>
   <!--Create key-->
   <string name="create_key_upload">Sincronizar con Internet</string>
   <string name="create_key_empty">Este campo es obligatorio</string>
@@ -1293,10 +1293,10 @@
   <string name="first_time_text1">¡Recupere su privacidad con OpenKeychain!</string>
   <string name="first_time_create_key">Crear mi clave</string>
   <string name="first_time_import_key">Importar clave desde fichero</string>
-  <string name="first_time_yubikey">Usar Yubikey NEO</string>
+  <string name="first_time_security_token">Usar Yubikey NEO</string>
   <string name="first_time_skip">Omitir configuración</string>
-  <string name="first_time_blank_yubikey">¿Desea usar esta YubiKey NEO en blanco con OpenKeychain?\n\n¡Por favor, retire ahora la YubiKey, se le solicitará cuando sea necesaria de nuevo!</string>
-  <string name="first_time_blank_yubikey_yes">Usar esta YubiKey</string>
+  <string name="first_time_blank_security_token">¿Desea usar esta YubiKey NEO en blanco con OpenKeychain?\n\n¡Por favor, retire ahora la YubiKey, se le solicitará cuando sea necesaria de nuevo!</string>
+  <string name="first_time_blank_security_token_yes">Usar esta YubiKey</string>
   <string name="backup_text">¡Las copias de seguridad que incluyen sus propias claves nunca se deben compartir con otras personas!</string>
   <string name="backup_all">Todas las claves + sus propias claves</string>
   <string name="backup_public_keys">Todas las claves</string>
@@ -1365,44 +1365,44 @@
   <string name="nfc_wrong_tag">Etiqueta incorrecta. Por favor inténtelo de nuevo.</string>
   <string name="enable_nfc">Por favor active NFC en su configuración</string>
   <string name="no_nfc_support">Este dispositivo no soporta NFC</string>
-  <string name="nfc_write_succesful">Se escribió con éxito en la etiqueta NFC</string>
+  <string name="nfc_write_successful">Se escribió con éxito en la etiqueta NFC</string>
   <string name="unlocked">Desbloqueado</string>
   <string name="nfc_settings">Configuración</string>
-  <string name="snack_yubikey_view">Ver</string>
-  <string name="snack_yubikey_import">Importar</string>
+  <string name="snack_security_token_view">Ver</string>
+  <string name="snack_security_token_import">Importar</string>
   <string name="button_bind_key">Ligar clave</string>
-  <string name="yubikey_serno">Nº de serie: %s</string>
-  <string name="yubikey_key_holder">Titular de la clave:</string>
-  <string name="yubikey_key_holder_not_set"><![CDATA[Titular de la clave: <not set>]]></string>
-  <string name="yubikey_status_bound">La YubiKey coincide y está ligada a la clave</string>
-  <string name="yubikey_status_unbound">La YubiKey coincide, puede ligarse a la clave</string>
-  <string name="yubikey_status_partly">La YubiKey coincide, parcialmente ligada a la clave</string>
-  <string name="yubikey_create">Sostenga la YubiKey contra el reverso de su dispositivo.</string>
-  <string name="yubikey_reset_or_import">Esta YubiKey ya contiene una llave. Usted puede importar la llave usando la nube o reiniciando la YubiKey.</string>
+  <string name="security_token_serial_no">Nº de serie: %s</string>
+  <string name="security_token_key_holder">Titular de la clave:</string>
+  <string name="security_token_key_holder_not_set"><![CDATA[Titular de la clave: <not set>]]></string>
+  <string name="security_token_status_bound">La YubiKey coincide y está ligada a la clave</string>
+  <string name="security_token_status_unbound">La YubiKey coincide, puede ligarse a la clave</string>
+  <string name="security_token_status_partly">La YubiKey coincide, parcialmente ligada a la clave</string>
+  <string name="security_token_create">Sostenga la YubiKey contra el reverso de su dispositivo.</string>
+  <string name="security_token_reset_or_import">Esta YubiKey ya contiene una llave. Usted puede importar la llave usando la nube o reiniciando la YubiKey.</string>
   <string name="btn_import">Importar</string>
   <string name="btn_reset">Reiniciar</string>
-  <string name="yubikey_import_radio">Importar llave</string>
-  <string name="yubikey_reset_radio">Reiniciar la YubiKey</string>
-  <string name="yubikey_reset_warning">¡Reiniciar la YubiKey destruirá completamente las llaves en ella. Más adelante, usted no podrá descifrar mensajes/archivos cifrados con esta llave!</string>
-  <string name="snack_yubi_other">¡Clave almacenada en YubiKey distinta!</string>
-  <string name="error_nfc">Error de NFC: %s</string>
-  <plurals name="error_pin">
+  <string name="security_token_import_radio">Importar llave</string>
+  <string name="security_token_reset_radio">Reiniciar la YubiKey</string>
+  <string name="security_token_reset_warning">¡Reiniciar la YubiKey destruirá completamente las llaves en ella. Más adelante, usted no podrá descifrar mensajes/archivos cifrados con esta llave!</string>
+  <string name="snack_security_token_other">¡Clave almacenada en YubiKey distinta!</string>
+  <string name="security_token_error">Error de NFC: %s</string>
+  <plurals name="security_token_error_pin">
     <item quantity="one">¡PIN incorrecto!\nLe queda %d intento.</item>
     <item quantity="other">¡PIN incorrecto!\nLe quedan %d intentos.</item>
   </plurals>
-  <string name="error_nfc_terminated">YubiKey en estado de vencimiento.</string>
-  <string name="error_nfc_wrong_length">El PIN introducido es demasiado corto. Los PINs tienen al menos 6 dígitos de largo.</string>
-  <string name="error_nfc_conditions_not_satisfied">Condiciones de uso no satisfechas.</string>
-  <string name="error_nfc_security_not_satisfied">Estado de seguridad no satisfecho.</string>
-  <string name="error_nfc_authentication_blocked">PIN bloqueado después de demasiados intentos.</string>
-  <string name="error_nfc_data_not_found">Clave u objeto no encontrado.</string>
-  <string name="error_nfc_unknown">Error desconocido</string>
-  <string name="error_nfc_bad_data">La YubiKey informó de datos no válidos.</string>
-  <string name="error_nfc_chaining_error">La YubiKey esperaba el último comando en una cadena.</string>
-  <string name="error_nfc_header">La YubiKey informó de un byte %s no válido.</string>
-  <string name="error_nfc_tag_lost">La YubiKey ha sido retirada demasiado pronto. Mantenga la YubiKey en el reverso hasta que la operación finalice.</string>
-  <string name="error_nfc_iso_dep_not_supported">La etiqueta no soporta ISO-DEP (ISO 14443-4)</string>
-  <string name="error_nfc_try_again">Intentar de nuevo</string>
+  <string name="security_token_error_terminated">YubiKey en estado de vencimiento.</string>
+  <string name="security_token_error_wrong_length">El PIN introducido es demasiado corto. Los PINs tienen al menos 6 dígitos de largo.</string>
+  <string name="security_token_error_conditions_not_satisfied">Condiciones de uso no satisfechas.</string>
+  <string name="security_token_error_security_not_satisfied">Estado de seguridad no satisfecho.</string>
+  <string name="security_token_error_authentication_blocked">PIN bloqueado después de demasiados intentos.</string>
+  <string name="security_token_error_data_not_found">Clave u objeto no encontrado.</string>
+  <string name="security_token_error_unknown">Error desconocido</string>
+  <string name="security_token_error_bad_data">La YubiKey informó de datos no válidos.</string>
+  <string name="security_token_error_chaining_error">La YubiKey esperaba el último comando en una cadena.</string>
+  <string name="security_token_error_header">La YubiKey informó de un byte %s no válido.</string>
+  <string name="security_token_error_tag_lost">La YubiKey ha sido retirada demasiado pronto. Mantenga la YubiKey en el reverso hasta que la operación finalice.</string>
+  <string name="security_token_error_iso_dep_not_supported">La etiqueta no soporta ISO-DEP (ISO 14443-4)</string>
+  <string name="security_token_error_try_again">Intentar de nuevo</string>
   <string name="error_pin_wrong">¡El NIP es incorrecto!</string>
   <string name="error_temp_file">Error al crear fichero temporal.</string>
   <string name="btn_delete_original">Borrar fichero original</string>
diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml
index b26be00ce..592f7b784 100644
--- a/OpenKeychain/src/main/res/values-eu/strings.xml
+++ b/OpenKeychain/src/main/res/values-eu/strings.xml
@@ -36,7 +36,7 @@
   <string name="title_manage_my_keys">Kudeatu nire giltzak</string>
   <!--section-->
   <string name="section_user_ids">Nortasunak</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_linked_system_contact">Loturatutako Sistema Harremana</string>
   <string name="section_keybase_proofs">Keybase.io Probak</string>
   <string name="section_should_you_trust">Fidatu behar zara giltza honetaz?</string>
@@ -129,7 +129,7 @@
   <string name="label_file_ascii_armor">Gaitu ASCII Armor</string>
   <string name="label_write_version_header">Jakinarazi besteei OpenKeychain erabiltzen ari zarela</string>
   <string name="label_write_version_header_summary">\'OpenKeychain v2.7\' idazten du OpenPGP sinadura, idazkia zifratzen du eta giltzak esportatzen ditu</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Erabili zenbaki teklatua YubiKey PIN-erako</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Erabili zenbaki teklatua YubiKey PIN-erako</string>
   <string name="label_asymmetric_from">Hasi saioa honekin:</string>
   <string name="label_to">Enkriptatu hona:</string>
   <string name="label_delete_after_encryption">Ezabatu agiriak enkriptatu ondoren</string>
@@ -260,10 +260,10 @@
   <string name="passphrase_for_backup">Sartu babeskopia kodea</string>
   <string name="passphrase_for">Sartu \'%s\'-rako sarhitza</string>
   <string name="pin_for">Sartu PIN-a \'%s\'-rako</string>
-  <string name="yubikey_pin_for">Sartu PIN-a YubKey-ra sartzeko \'%s\'-rentzat</string>
-  <string name="nfc_text">Heutsi YubiKey NFC markatzailearen kontra zure gailuaren atzealdean.</string>
-  <string name="nfc_wait">Eduki YubiKey atzealdean!</string>
-  <string name="nfc_finished">Irten YubiKey-tik orain</string>
+  <string name="security_token_pin_for">Sartu PIN-a YubKey-ra sartzeko \'%s\'-rentzat</string>
+  <string name="security_token_nfc_text">Heutsi YubiKey NFC markatzailearen kontra zure gailuaren atzealdean.</string>
+  <string name="security_token_nfc_wait">Eduki YubiKey atzealdean!</string>
+  <string name="security_token_nfc_finished">Irten YubiKey-tik orain</string>
   <string name="file_delete_confirmation_title">Ezabatu jatorrizko agiriak?</string>
   <string name="file_delete_confirmation">Hurrengo agiriak ezabatu egingo dira: %s</string>
   <string name="file_delete_successful">%1$d -&gt; %2$d-tik agiri ezbatu dira.%3$s</string>
@@ -651,8 +651,8 @@
   <string name="edit_key_select_flag">Mesedez hautatu gutxienez ikur bat!</string>
   <string name="edit_key_error_add_identity">Gehitu nortasun bat gutxienez!</string>
   <string name="edit_key_error_add_subkey">Gehitu azpigiltza bat gutxienez!</string>
-  <string name="edit_key_error_bad_nfc_algo">Txartel adimentsuak ez du algoritmoa sostengatzen!</string>
-  <string name="edit_key_error_bad_nfc_size">Txartel adimentsuak ez du giltzaren neurria sostengatzen!</string>
+  <string name="edit_key_error_bad_security_token_algo">Txartel adimentsuak ez du algoritmoa sostengatzen!</string>
+  <string name="edit_key_error_bad_security_token_size">Txartel adimentsuak ez du giltzaren neurria sostengatzen!</string>
   <!--Create key-->
   <string name="create_key_upload">Aldiberetu Internetekin</string>
   <string name="create_key_empty">Eremu hau beharrezkoa da</string>
@@ -1217,10 +1217,10 @@
   <string name="first_time_text1">Berreskuratu zure pribatutasuna OpenKeychain-ekin!</string>
   <string name="first_time_create_key">Sortu nire giltza</string>
   <string name="first_time_import_key">Inportatu giltza agiritik</string>
-  <string name="first_time_yubikey">Erabili YubiKey NEO</string>
+  <string name="first_time_security_token">Erabili YubiKey NEO</string>
   <string name="first_time_skip">Jauzi Ezarpena</string>
-  <string name="first_time_blank_yubikey">YubiKey huts hau erabiltzea nahi duzu OpenKeychain-ekin?\n\nMesedez irten Yubikey-tik orain, berriro galdetuko zaizu beharrezkoa denean!</string>
-  <string name="first_time_blank_yubikey_yes">Erabili YubiKey hau</string>
+  <string name="first_time_blank_security_token">YubiKey huts hau erabiltzea nahi duzu OpenKeychain-ekin?\n\nMesedez irten Yubikey-tik orain, berriro galdetuko zaizu beharrezkoa denean!</string>
+  <string name="first_time_blank_security_token_yes">Erabili YubiKey hau</string>
   <string name="backup_text">Zure jabetzako giltzak dituzten babeskopiak inoiz ez dira besteekin elkarbanatu behar!</string>
   <string name="backup_all">Giltza guztiak + zeure jabetzako giltzak</string>
   <string name="backup_public_keys">Giltza guztiak</string>
@@ -1288,36 +1288,36 @@
   <string name="nfc_wrong_tag">Etiketa Okerra. Mesedez saiatu berriro.</string>
   <string name="enable_nfc">Mesedez gaitu NFC zure ezarpenetan</string>
   <string name="no_nfc_support">Gailu honek ez du NFC sostengatzen</string>
-  <string name="nfc_write_succesful">Ongi idatzi da NFC etiketan</string>
+  <string name="nfc_write_successful">Ongi idatzi da NFC etiketan</string>
   <string name="unlocked">Desblokeatuta</string>
   <string name="nfc_settings">Ezarpenak</string>
-  <string name="snack_yubikey_view">Ikusi</string>
-  <string name="snack_yubikey_import">Inportatu</string>
+  <string name="snack_security_token_view">Ikusi</string>
+  <string name="snack_security_token_import">Inportatu</string>
   <string name="button_bind_key">Blindatu Giltza</string>
-  <string name="yubikey_serno">Serie Zbk: %s</string>
-  <string name="yubikey_create">Jarri YubiKey zure gailuaren atzealdean.</string>
+  <string name="security_token_serial_no">Serie Zbk: %s</string>
+  <string name="security_token_create">Jarri YubiKey zure gailuaren atzealdean.</string>
   <string name="btn_import">Inportatu</string>
   <string name="btn_reset">Berrezarri</string>
-  <string name="yubikey_import_radio">Inportatu giltza</string>
-  <string name="yubikey_reset_radio">Berrezrri YubiKey</string>
-  <string name="snack_yubi_other">Giltza ezberdina biltegiratuta YubiKey-n!</string>
-  <string name="error_nfc">NFC Akatsa: %s</string>
-  <plurals name="error_pin">
+  <string name="security_token_import_radio">Inportatu giltza</string>
+  <string name="security_token_reset_radio">Berrezrri YubiKey</string>
+  <string name="snack_security_token_other">Giltza ezberdina biltegiratuta YubiKey-n!</string>
+  <string name="security_token_error">NFC Akatsa: %s</string>
+  <plurals name="security_token_error_pin">
     <item quantity="one">PIN okerra!\n%d saiakera gelditzen da.</item>
     <item quantity="other">PIN okerra!\n%d saiakera gelditzen dira.</item>
   </plurals>
-  <string name="error_nfc_terminated">YubiKey amaiera egoeran.</string>
-  <string name="error_nfc_wrong_length">Sartutako PIN-a laburregia da. PIN-ak gutxienez 6 digituko luzera du.</string>
-  <string name="error_nfc_conditions_not_satisfied">Ez dira erabilpen baldintzak asetu.</string>
-  <string name="error_nfc_security_not_satisfied">Ez da segurtasun egoera asetu.</string>
-  <string name="error_nfc_authentication_blocked">PIN-a blokeatuta saiakera gehiegiren ondoren.</string>
-  <string name="error_nfc_data_not_found">Giltza edo objetua ez da aurkitu.</string>
-  <string name="error_nfc_unknown">Akats Ezezaguna</string>
-  <string name="error_nfc_bad_data">YubiKeyk datu baliogabeak jakinarazi ditu.</string>
-  <string name="error_nfc_chaining_error">YubiKeyk itxaroten zuen azken agindua kate batean.</string>
-  <string name="error_nfc_header">YubiKeyk %s byte baliogabe jakinarazi ditu.</string>
-  <string name="error_nfc_iso_dep_not_supported">Etiketak ez du sostengatzen ISO-DEP (ISO 14443-4)</string>
-  <string name="error_nfc_try_again">Saitu berriro</string>
+  <string name="security_token_error_terminated">YubiKey amaiera egoeran.</string>
+  <string name="security_token_error_wrong_length">Sartutako PIN-a laburregia da. PIN-ak gutxienez 6 digituko luzera du.</string>
+  <string name="security_token_error_conditions_not_satisfied">Ez dira erabilpen baldintzak asetu.</string>
+  <string name="security_token_error_security_not_satisfied">Ez da segurtasun egoera asetu.</string>
+  <string name="security_token_error_authentication_blocked">PIN-a blokeatuta saiakera gehiegiren ondoren.</string>
+  <string name="security_token_error_data_not_found">Giltza edo objetua ez da aurkitu.</string>
+  <string name="security_token_error_unknown">Akats Ezezaguna</string>
+  <string name="security_token_error_bad_data">YubiKeyk datu baliogabeak jakinarazi ditu.</string>
+  <string name="security_token_error_chaining_error">YubiKeyk itxaroten zuen azken agindua kate batean.</string>
+  <string name="security_token_error_header">YubiKeyk %s byte baliogabe jakinarazi ditu.</string>
+  <string name="security_token_error_iso_dep_not_supported">Etiketak ez du sostengatzen ISO-DEP (ISO 14443-4)</string>
+  <string name="security_token_error_try_again">Saitu berriro</string>
   <string name="error_pin_wrong">PIN-a okerra da!</string>
   <string name="error_temp_file">Akatsa aldibaterako agiria sortzerakoan.</string>
   <string name="btn_delete_original">Ezabatu jatorrizko agiria</string>
diff --git a/OpenKeychain/src/main/res/values-fa/strings.xml b/OpenKeychain/src/main/res/values-fa/strings.xml
index 3f18ac342..1a3317ec5 100644
--- a/OpenKeychain/src/main/res/values-fa/strings.xml
+++ b/OpenKeychain/src/main/res/values-fa/strings.xml
@@ -34,7 +34,7 @@
   <string name="title_manage_my_keys">مدیریت کلیدهام</string>
   <!--section-->
   <string name="section_user_ids">هویت‌ها</string>
-  <string name="section_yubikey">کلید Yubi</string>
+  <string name="section_security_token">کلید Yubi</string>
   <string name="section_should_you_trust">آیا به این کلید اعتماد دارید؟</string>
   <string name="section_keys">زیرکلیدها</string>
   <string name="section_gui">رابط</string>
@@ -104,7 +104,7 @@
   <string name="label_file_ascii_armor">فعال‌کردن ASCII Armor</string>
   <string name="label_write_version_header">به دیگران اطلاع دهید که شما از OpenKeyChain استفاده می‌کنید</string>
   <string name="label_write_version_header_summary">عبارت \'OpenKeychain v2.7\' را در امضاها، متن رمزگذاری‌شده و کلیدها می‌نویسید</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">از صفحه‌کلیدِ شماره‌ای برای وارد کردن رمز کلیدِ Yubi استفاده کن</string>
+  <string name="label_use_num_keypad_for_security_token_pin">از صفحه‌کلیدِ شماره‌ای برای وارد کردن رمز کلیدِ Yubi استفاده کن</string>
   <string name="label_asymmetric_from">امضاء با:</string>
   <string name="label_to">رمزگذاری به:</string>
   <string name="label_delete_after_encryption">حذف فایل‌ها پس از رمزگذاری</string>
diff --git a/OpenKeychain/src/main/res/values-fi/strings.xml b/OpenKeychain/src/main/res/values-fi/strings.xml
index ed3bf2f95..054c61bc4 100644
--- a/OpenKeychain/src/main/res/values-fi/strings.xml
+++ b/OpenKeychain/src/main/res/values-fi/strings.xml
@@ -32,7 +32,7 @@
   <string name="title_manage_my_keys">Hallitse avaimiani</string>
   <!--section-->
   <string name="section_user_ids">Identiteetit</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_keys">Aliavaimet</string>
   <string name="section_gui">Käyttöliittymä</string>
   <string name="section_experimental_features">Kokeelliset ominaisuudet</string>
@@ -95,7 +95,7 @@
   <string name="label_file_ascii_armor">Käytä ASCII Armoria</string>
   <string name="label_write_version_header">Anna muiden tietää että käytät OpenKeychainia</string>
   <string name="label_write_version_header_summary">Kirjoittaa \'OpenKeychain v2.7\' OpenPGP-allekirjoituksiin, kryptattuun tekstiin sekä vietyihin avaimiin</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Käytä numeerista näppäimistöä YuniKey PIN:iin</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Käytä numeerista näppäimistöä YuniKey PIN:iin</string>
   <string name="label_to">Salaa:</string>
   <string name="label_delete_after_decryption">Poista salauksen purkamisen jälkeen</string>
   <string name="label_encryption_algorithm">Salausalgoritmi</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 506cf2af9..7748b66b7 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -36,7 +36,7 @@
   <string name="title_manage_my_keys">Gérer mes clefs</string>
   <!--section-->
   <string name="section_user_ids">identités</string>
-  <string name="section_yubikey">Yubikey</string>
+  <string name="section_security_token">Yubikey</string>
   <string name="section_linked_system_contact">Contact système relié</string>
   <string name="section_keybase_proofs">Preuves keybase.io</string>
   <string name="section_should_you_trust">Devriez-vous faire confiance à cette clef ?</string>
@@ -130,7 +130,7 @@
   <string name="label_file_ascii_armor">Activer l\'armure ASCII</string>
   <string name="label_write_version_header">Faire savoir aux autres que vous utilisez OpenKeychain</string>
   <string name="label_write_version_header_summary">Ajoute « OpenKeychain v2.7 » aux signatures OpenPGP, aux cryptogrammes et aux clefs exportées</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Utiliser le pavé numérique pour le NIP de la Yubikey</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Utiliser le pavé numérique pour le NIP de la Yubikey</string>
   <string name="label_asymmetric_from">Signer avec :</string>
   <string name="label_to">Chiffrer pour :</string>
   <string name="label_delete_after_encryption">Supprimer les fichiers après chiffrement</string>
@@ -266,10 +266,10 @@
   <string name="passphrase_for_backup">Saisir le code de sauvegarde</string>
   <string name="passphrase_for">Saisir le mot de passe pour « %s »</string>
   <string name="pin_for">Saisir le NIP pour « %s »</string>
-  <string name="yubikey_pin_for">Saisir le NIP pour accéder à la Yubikey pour « %s »</string>
-  <string name="nfc_text">Tenez la Yubikey contre le logo NFC au dos de votre appareil.</string>
-  <string name="nfc_wait">Gardez la Yubikey contre le dos !</string>
-  <string name="nfc_finished">Retirez la Yubikey maintenant.</string>
+  <string name="security_token_pin_for">Saisir le NIP pour accéder à la Yubikey pour « %s »</string>
+  <string name="security_token_nfc_text">Tenez la Yubikey contre le logo NFC au dos de votre appareil.</string>
+  <string name="security_token_nfc_wait">Gardez la Yubikey contre le dos !</string>
+  <string name="security_token_nfc_finished">Retirez la Yubikey maintenant.</string>
   <string name="file_delete_confirmation_title">Supprimer les fichiers originaux ?</string>
   <string name="file_delete_confirmation">Les fichiers suivants seront détruits : %s</string>
   <string name="file_delete_successful">%1$d fichiers sur %2$d ont déjà été supprimés. %3$s</string>
@@ -664,9 +664,9 @@
   <string name="edit_key_select_flag">Veuillez sélectionner au moins un drapeau !</string>
   <string name="edit_key_error_add_identity">Ajouter au moins une identité !</string>
   <string name="edit_key_error_add_subkey">Ajouter au moins une sous-clef !</string>
-  <string name="edit_key_error_bad_nfc_algo">L’algorithme n\'est pas pris en charge par cette carte à puce ! </string>
-  <string name="edit_key_error_bad_nfc_size">La taille de clef n\'est pas prise en charge par la carte à puce !</string>
-  <string name="edit_key_error_bad_nfc_stripped">Impossible de déplacer la clef vers la carte à puce (soit dépouillée, soit « dévier-vers-la-carte ») !</string>
+  <string name="edit_key_error_bad_security_token_algo">L’algorithme n\'est pas pris en charge par cette carte à puce ! </string>
+  <string name="edit_key_error_bad_security_token_size">La taille de clef n\'est pas prise en charge par la carte à puce !</string>
+  <string name="edit_key_error_bad_security_token_stripped">Impossible de déplacer la clef vers la carte à puce (soit dépouillée, soit « dévier-vers-la-carte ») !</string>
   <!--Create key-->
   <string name="create_key_upload">Synchroniser avec l\'Internet</string>
   <string name="create_key_empty">Ce champ est exigé</string>
@@ -1323,10 +1323,10 @@
   <string name="first_time_text1">Reprenez le contrôle de votre vie privée avec OpenKeychain |</string>
   <string name="first_time_create_key">Créer ma clef</string>
   <string name="first_time_import_key">Importer la clef d\'un fichier</string>
-  <string name="first_time_yubikey">Utiliser la Yubikey NEO</string>
+  <string name="first_time_security_token">Utiliser la Yubikey NEO</string>
   <string name="first_time_skip">Ignorer le paramétrage</string>
-  <string name="first_time_blank_yubikey">Voulez-vous utiliser cette Yubikey NEO vide avec OpenKeychain ?\n\nVeuillez retirer la Yubikey maintenant, vous serez informé quand elle sera requise de nouveau !</string>
-  <string name="first_time_blank_yubikey_yes">Utiliser cette Yubikey</string>
+  <string name="first_time_blank_security_token">Voulez-vous utiliser cette Yubikey NEO vide avec OpenKeychain ?\n\nVeuillez retirer la Yubikey maintenant, vous serez informé quand elle sera requise de nouveau !</string>
+  <string name="first_time_blank_security_token_yes">Utiliser cette Yubikey</string>
   <string name="backup_text">Les sauvegardes incluant vos propres clefs ne doivent jamais être partagées avec d\'autres personnes !</string>
   <string name="backup_all">Toutes les clefs  + vos propres clefs</string>
   <string name="backup_public_keys">Toutes les clefs</string>
@@ -1396,44 +1396,44 @@
   <string name="nfc_wrong_tag">Mauvaise balise. Veuillez ressayer.</string>
   <string name="enable_nfc">Veuillez activer la NFC dans vos paramètres</string>
   <string name="no_nfc_support">Cet appareil ne prends pas en charge la NFC</string>
-  <string name="nfc_write_succesful">Écrit avec succès sur la balise NFC</string>
+  <string name="nfc_write_successful">Écrit avec succès sur la balise NFC</string>
   <string name="unlocked">Déverrouillé</string>
   <string name="nfc_settings">Paramètres</string>
-  <string name="snack_yubikey_view">Visualiser</string>
-  <string name="snack_yubikey_import">Importer</string>
+  <string name="snack_security_token_view">Visualiser</string>
+  <string name="snack_security_token_import">Importer</string>
   <string name="button_bind_key">Relier la clef</string>
-  <string name="yubikey_serno">No de série : %s</string>
-  <string name="yubikey_key_holder">Détenteur de la clef :</string>
-  <string name="yubikey_key_holder_not_set"><![CDATA[Détenteur de la clef : <not set>]]></string>
-  <string name="yubikey_status_bound">La Yubikey correspond et est reliée à la clef</string>
-  <string name="yubikey_status_unbound">La Yubikey correspond et peut être reliée à la clef</string>
-  <string name="yubikey_status_partly">La Yubikey correspond et est partiellement reliée à la clef</string>
-  <string name="yubikey_create">Tenez la Yubikey contre le dos de votre appareil.</string>
-  <string name="yubikey_reset_or_import">Cette Yubikey contient déjà une clef. Vous pouvez importer la clef grâce au nuage, ou réinitialiser la Yubikey.</string>
+  <string name="security_token_serial_no">No de série : %s</string>
+  <string name="security_token_key_holder">Détenteur de la clef :</string>
+  <string name="security_token_key_holder_not_set"><![CDATA[Détenteur de la clef : <not set>]]></string>
+  <string name="security_token_status_bound">La Yubikey correspond et est reliée à la clef</string>
+  <string name="security_token_status_unbound">La Yubikey correspond et peut être reliée à la clef</string>
+  <string name="security_token_status_partly">La Yubikey correspond et est partiellement reliée à la clef</string>
+  <string name="security_token_create">Tenez la Yubikey contre le dos de votre appareil.</string>
+  <string name="security_token_reset_or_import">Cette Yubikey contient déjà une clef. Vous pouvez importer la clef grâce au nuage, ou réinitialiser la Yubikey.</string>
   <string name="btn_import">Importer</string>
   <string name="btn_reset">Réinitialiser</string>
-  <string name="yubikey_import_radio">Importer la clef</string>
-  <string name="yubikey_reset_radio">Réinitialiser la Yubikey</string>
-  <string name="yubikey_reset_warning">La réinitialisation de la Yubikey détruit complètement les clefs qu\'elle contient. Par la suite, vous ne pourrez plus déchiffrer les messages et les fichiers chiffrés avec cette clef !</string>
-  <string name="snack_yubi_other">Une clef différente est stockée sur la Yubikey !</string>
-  <string name="error_nfc">Erreur NFC ; %s</string>
-  <plurals name="error_pin">
+  <string name="security_token_import_radio">Importer la clef</string>
+  <string name="security_token_reset_radio">Réinitialiser la Yubikey</string>
+  <string name="security_token_reset_warning">La réinitialisation de la Yubikey détruit complètement les clefs qu\'elle contient. Par la suite, vous ne pourrez plus déchiffrer les messages et les fichiers chiffrés avec cette clef !</string>
+  <string name="snack_security_token_other">Une clef différente est stockée sur la Yubikey !</string>
+  <string name="security_token_error">Erreur NFC ; %s</string>
+  <plurals name="security_token_error_pin">
     <item quantity="one">NIP erroné !\nil reste %d essai.</item>
     <item quantity="other">NIP erroné !\nil reste %d essais.</item>
   </plurals>
-  <string name="error_nfc_terminated">La Yubikey est en état de fin d\'opération.</string>
-  <string name="error_nfc_wrong_length">Le NIP saisi est trop court. Les NIP comportent au moins 6 chiffres.</string>
-  <string name="error_nfc_conditions_not_satisfied">Les conditions d\'utilisation ne sont pas satisfaites.</string>
-  <string name="error_nfc_security_not_satisfied">L\'état de sécurité n\'est pas satisfait.</string>
-  <string name="error_nfc_authentication_blocked">NIP bloqué après trop d\'essais.</string>
-  <string name="error_nfc_data_not_found">Clef ou objet introuvable.</string>
-  <string name="error_nfc_unknown">Erreur inconnue</string>
-  <string name="error_nfc_bad_data">La Yubikey a signalé des données invalides.</string>
-  <string name="error_nfc_chaining_error">La Yubikey attendait la dernière commande d\'une chaîne.</string>
-  <string name="error_nfc_header">La Yubikey a signalé %s bytes invalides.</string>
-  <string name="error_nfc_tag_lost">La Yubikey a été retirée trop tôt. Gardez la Yubikey contre le dos jusqu\'à la fin de l\'opération.</string>
-  <string name="error_nfc_iso_dep_not_supported">La balise ne prend pas en charge ISO-DEP (ISO 14443-4)</string>
-  <string name="error_nfc_try_again">Ressayer</string>
+  <string name="security_token_error_terminated">La Yubikey est en état de fin d\'opération.</string>
+  <string name="security_token_error_wrong_length">Le NIP saisi est trop court. Les NIP comportent au moins 6 chiffres.</string>
+  <string name="security_token_error_conditions_not_satisfied">Les conditions d\'utilisation ne sont pas satisfaites.</string>
+  <string name="security_token_error_security_not_satisfied">L\'état de sécurité n\'est pas satisfait.</string>
+  <string name="security_token_error_authentication_blocked">NIP bloqué après trop d\'essais.</string>
+  <string name="security_token_error_data_not_found">Clef ou objet introuvable.</string>
+  <string name="security_token_error_unknown">Erreur inconnue</string>
+  <string name="security_token_error_bad_data">La Yubikey a signalé des données invalides.</string>
+  <string name="security_token_error_chaining_error">La Yubikey attendait la dernière commande d\'une chaîne.</string>
+  <string name="security_token_error_header">La Yubikey a signalé %s bytes invalides.</string>
+  <string name="security_token_error_tag_lost">La Yubikey a été retirée trop tôt. Gardez la Yubikey contre le dos jusqu\'à la fin de l\'opération.</string>
+  <string name="security_token_error_iso_dep_not_supported">La balise ne prend pas en charge ISO-DEP (ISO 14443-4)</string>
+  <string name="security_token_error_try_again">Ressayer</string>
   <string name="error_pin_wrong">Le NIP est erroné !</string>
   <string name="error_temp_file">Erreur de création du fichier temporaire.</string>
   <string name="btn_delete_original">Supprimer le fichier original</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 8a9fc394f..00dbd7cee 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -35,7 +35,7 @@
   <string name="title_manage_my_keys">Gestisci le mie chiavi</string>
   <!--section-->
   <string name="section_user_ids">Identità</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_should_you_trust">Ci si potrà fidare di questa chiave?</string>
   <string name="section_proof_details">Verifica prova</string>
   <string name="section_keys">Sottochiavi</string>
@@ -114,7 +114,7 @@
   <string name="label_file_ascii_armor">Abilita Armatura ASCII</string>
   <string name="label_write_version_header">Fai sapere agli altri che utilizzi OpenKeychain</string>
   <string name="label_write_version_header_summary">Scrive \'OpenKeychain v2.7\' nelle firme OpenPGP, testi cifrati e chiavi esportate</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Utilizza la tastiera numerica per il PIN di YubiKey</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Utilizza la tastiera numerica per il PIN di YubiKey</string>
   <string name="label_to">Codifica per:</string>
   <string name="label_delete_after_encryption">Elimina file dopo la codifica</string>
   <string name="label_delete_after_decryption">Elimina dopo la decodifica</string>
@@ -212,7 +212,7 @@
   <string name="passphrase_must_not_be_empty">Si prega di inserire una password.</string>
   <string name="passphrase_for">Inserisci la password per \'%s\'</string>
   <string name="pin_for">Inserisci il PIN per \'%s\'</string>
-  <string name="yubikey_pin_for">Inserisci il PIN per accedere a YubiKey con \'%s\'</string>
+  <string name="security_token_pin_for">Inserisci il PIN per accedere a YubiKey con \'%s\'</string>
   <string name="file_delete_confirmation_title">Eliminare i file originali?</string>
   <string name="file_delete_confirmation">I seguenti file verranno cancellati:%s</string>
   <string name="file_delete_successful">%1$d di %2$d file sono stati cancellati.%3$s</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 5b1b3e9ef..8bf73a4b2 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -36,7 +36,7 @@
   <string name="title_manage_my_keys">自分の鍵の管理</string>
   <!--section-->
   <string name="section_user_ids">ユーザID</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_linked_system_contact">リンクしているシステムの連絡先</string>
   <string name="section_keybase_proofs">Keybase.io 検証</string>
   <string name="section_should_you_trust">この鍵を信頼しますか?</string>
@@ -130,7 +130,7 @@
   <string name="label_file_ascii_armor">アスキー形式ファイルを有効</string>
   <string name="label_write_version_header">OpenKeychainの利用を通知する</string>
   <string name="label_write_version_header_summary">OpenPGPの 署名、暗号文、そしてエクスポートした鍵に  \'OpenKeychain v2.7\' と書くようになりました</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Yubikey PINで数字キーパッドを使う</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Yubikey PINで数字キーパッドを使う</string>
   <string name="label_asymmetric_from">署名:</string>
   <string name="label_to">暗号化:</string>
   <string name="label_delete_after_encryption">暗号化後にファイル削除</string>
@@ -260,10 +260,10 @@
   <string name="passphrase_for_backup">バックアップコードの入力</string>
   <string name="passphrase_for">\'%s\' にパスワードを入れてください</string>
   <string name="pin_for">\'%s\' にPINを入力してください</string>
-  <string name="yubikey_pin_for">\'%s\' の Yubikey にアクセスするためのPINを入力してください</string>
-  <string name="nfc_text">YubiKeyをあなたのデバイスの背中にあるNFCの印に対向させて固定してください。</string>
-  <string name="nfc_wait">YubiKeyを背後に維持してください!</string>
-  <string name="nfc_finished">YubiKeyを取り外してください。</string>
+  <string name="security_token_pin_for">\'%s\' の Yubikey にアクセスするためのPINを入力してください</string>
+  <string name="security_token_nfc_text">YubiKeyをあなたのデバイスの背中にあるNFCの印に対向させて固定してください。</string>
+  <string name="security_token_nfc_wait">YubiKeyを背後に維持してください!</string>
+  <string name="security_token_nfc_finished">YubiKeyを取り外してください。</string>
   <string name="file_delete_confirmation_title">オリジナルのファイルを削除しますか?</string>
   <string name="file_delete_confirmation">以下のファイルを削除します:%s</string>
   <string name="file_delete_successful">%1$d 中の %2$d のファイルの削除が完了しました。%3$s</string>
@@ -651,9 +651,9 @@
   <string name="edit_key_select_flag">最低1つフラグを選択してください!</string>
   <string name="edit_key_error_add_identity">最低でも1つのユーザIDを追加!</string>
   <string name="edit_key_error_add_subkey">最低でも1つの副鍵を追加!</string>
-  <string name="edit_key_error_bad_nfc_algo">スマートカードではアルゴリズムをサポートしません!</string>
-  <string name="edit_key_error_bad_nfc_size">スマートカードでは鍵サイズをサポートしません!</string>
-  <string name="edit_key_error_bad_nfc_stripped">鍵をスマートカードに移動できません(ストリップしてあるか、\'カードへ迂回\'がない)</string>
+  <string name="edit_key_error_bad_security_token_algo">スマートカードではアルゴリズムをサポートしません!</string>
+  <string name="edit_key_error_bad_security_token_size">スマートカードでは鍵サイズをサポートしません!</string>
+  <string name="edit_key_error_bad_security_token_stripped">鍵をスマートカードに移動できません(ストリップしてあるか、\'カードへ迂回\'がない)</string>
   <!--Create key-->
   <string name="create_key_upload">インターネットでの同期</string>
   <string name="create_key_empty">このフィールドは必須です</string>
@@ -1294,10 +1294,10 @@
   <string name="first_time_text1">OpenKeychainであなたのプライバシーを取り戻しましょう!</string>
   <string name="first_time_create_key">自分のキーを作る</string>
   <string name="first_time_import_key">ファイルから鍵をインポート</string>
-  <string name="first_time_yubikey">YubiKey NEOを使用する</string>
+  <string name="first_time_security_token">YubiKey NEOを使用する</string>
   <string name="first_time_skip">セットアップをスキップ</string>
-  <string name="first_time_blank_yubikey">OpenKeychainで、この空白のYubiKey NEOを使用しますか?\n\nYubiKeyを取り除いてください。再度必要になったときにプロンプトが表示されます!</string>
-  <string name="first_time_blank_yubikey_yes">YubiKeyを使用する</string>
+  <string name="first_time_blank_security_token">OpenKeychainで、この空白のYubiKey NEOを使用しますか?\n\nYubiKeyを取り除いてください。再度必要になったときにプロンプトが表示されます!</string>
+  <string name="first_time_blank_security_token_yes">YubiKeyを使用する</string>
   <string name="backup_text">あなた自身の鍵を含んだバックアップは、決して他の人と共有しないでください!</string>
   <string name="backup_all">すべての鍵とあなた所有の鍵</string>
   <string name="backup_public_keys">すべての鍵</string>
@@ -1366,43 +1366,43 @@
   <string name="nfc_wrong_tag">ダメなタグ。再度実施してください。</string>
   <string name="enable_nfc">設定からNFCを有効にしてください</string>
   <string name="no_nfc_support">この装置ではNFCをサポートしていません</string>
-  <string name="nfc_write_succesful">NFCタグに書けました!</string>
+  <string name="nfc_write_successful">NFCタグに書けました!</string>
   <string name="unlocked">アンロック</string>
   <string name="nfc_settings">設定</string>
-  <string name="snack_yubikey_view">閲覧</string>
-  <string name="snack_yubikey_import">インポート</string>
+  <string name="snack_security_token_view">閲覧</string>
+  <string name="snack_security_token_import">インポート</string>
   <string name="button_bind_key">鍵と紐付け</string>
-  <string name="yubikey_serno">シリアルナンバー: %s</string>
-  <string name="yubikey_key_holder">鍵ホルダ:</string>
-  <string name="yubikey_key_holder_not_set"><![CDATA[Key holder: <not set>]]></string>
-  <string name="yubikey_status_bound">鍵がYubiKeyがマッチし紐付いている</string>
-  <string name="yubikey_status_unbound">YubiKeyがマッチ、鍵に紐付けることができる</string>
-  <string name="yubikey_status_partly">YubiKeyがマッチ、鍵に部分的に紐付いている</string>
-  <string name="yubikey_create">あなたのデバイスの背面にYubiKeyを固定してください。</string>
-  <string name="yubikey_reset_or_import">このYubiKeyは既に鍵を含んでいます。クラウドを使用して鍵をインポートしたり、YubiKeyをリセットすることができます。</string>
+  <string name="security_token_serial_no">シリアルナンバー: %s</string>
+  <string name="security_token_key_holder">鍵ホルダ:</string>
+  <string name="security_token_key_holder_not_set"><![CDATA[Key holder: <not set>]]></string>
+  <string name="security_token_status_bound">鍵がYubiKeyがマッチし紐付いている</string>
+  <string name="security_token_status_unbound">YubiKeyがマッチ、鍵に紐付けることができる</string>
+  <string name="security_token_status_partly">YubiKeyがマッチ、鍵に部分的に紐付いている</string>
+  <string name="security_token_create">あなたのデバイスの背面にYubiKeyを固定してください。</string>
+  <string name="security_token_reset_or_import">このYubiKeyは既に鍵を含んでいます。クラウドを使用して鍵をインポートしたり、YubiKeyをリセットすることができます。</string>
   <string name="btn_import">インポート</string>
   <string name="btn_reset">リセット</string>
-  <string name="yubikey_import_radio">鍵のインポート</string>
-  <string name="yubikey_reset_radio">YubiKeyをリセット</string>
-  <string name="yubikey_reset_warning">YubiKeyをリセットすると、その上のキーを完全に破壊します。その後は、この鍵で暗号化されたメッセージ/ファイルを復号化することができなくなります!</string>
-  <string name="snack_yubi_other">違う鍵がYubiKeyに格納されています!</string>
-  <string name="error_nfc">NFCエラー: %s</string>
-  <plurals name="error_pin">
+  <string name="security_token_import_radio">鍵のインポート</string>
+  <string name="security_token_reset_radio">YubiKeyをリセット</string>
+  <string name="security_token_reset_warning">YubiKeyをリセットすると、その上のキーを完全に破壊します。その後は、この鍵で暗号化されたメッセージ/ファイルを復号化することができなくなります!</string>
+  <string name="snack_security_token_other">違う鍵がYubiKeyに格納されています!</string>
+  <string name="security_token_error">NFCエラー: %s</string>
+  <plurals name="security_token_error_pin">
     <item quantity="other">PINが正しくありません! 再挑戦はあと%d回です。</item>
   </plurals>
-  <string name="error_nfc_terminated">YubiKeyが完了状態</string>
-  <string name="error_nfc_wrong_length">入力されたPINが短すぎます。 PINの長さは少なくとも6桁にします。</string>
-  <string name="error_nfc_conditions_not_satisfied">使用条件を満たしていません。</string>
-  <string name="error_nfc_security_not_satisfied">セキュリティステータスを満していません。</string>
-  <string name="error_nfc_authentication_blocked">試行回数が多すぎるためPINがブロックされています。</string>
-  <string name="error_nfc_data_not_found">鍵もしくはオブジェクトが見当りません。</string>
-  <string name="error_nfc_unknown">不明なエラー</string>
-  <string name="error_nfc_bad_data">YubiKeyが不正なデータを報告した。</string>
-  <string name="error_nfc_chaining_error">YubiKeyがチェーン中の最後のコマンドを待っています。</string>
-  <string name="error_nfc_header">YubiKeyが不正な%sバイトを報告。</string>
-  <string name="error_nfc_tag_lost">YubiKeyを取り出すのが早すぎました。操作が完了するまでYubiKeyを戻してしてください。</string>
-  <string name="error_nfc_iso_dep_not_supported">タグは ISO-DEP (ISO 14443-4) をサポートしていません</string>
-  <string name="error_nfc_try_again">再実行</string>
+  <string name="security_token_error_terminated">YubiKeyが完了状態</string>
+  <string name="security_token_error_wrong_length">入力されたPINが短すぎます。 PINの長さは少なくとも6桁にします。</string>
+  <string name="security_token_error_conditions_not_satisfied">使用条件を満たしていません。</string>
+  <string name="security_token_error_security_not_satisfied">セキュリティステータスを満していません。</string>
+  <string name="security_token_error_authentication_blocked">試行回数が多すぎるためPINがブロックされています。</string>
+  <string name="security_token_error_data_not_found">鍵もしくはオブジェクトが見当りません。</string>
+  <string name="security_token_error_unknown">不明なエラー</string>
+  <string name="security_token_error_bad_data">YubiKeyが不正なデータを報告した。</string>
+  <string name="security_token_error_chaining_error">YubiKeyがチェーン中の最後のコマンドを待っています。</string>
+  <string name="security_token_error_header">YubiKeyが不正な%sバイトを報告。</string>
+  <string name="security_token_error_tag_lost">YubiKeyを取り出すのが早すぎました。操作が完了するまでYubiKeyを戻してしてください。</string>
+  <string name="security_token_error_iso_dep_not_supported">タグは ISO-DEP (ISO 14443-4) をサポートしていません</string>
+  <string name="security_token_error_try_again">再実行</string>
   <string name="error_pin_wrong">PINが正しくありません!</string>
   <string name="error_temp_file">一時ファイルの生成でエラーしました。</string>
   <string name="btn_delete_original">オリジナルのファイルを削除します</string>
diff --git a/OpenKeychain/src/main/res/values-ko/strings.xml b/OpenKeychain/src/main/res/values-ko/strings.xml
index e8d9eb5c6..fc4f2cc7d 100644
--- a/OpenKeychain/src/main/res/values-ko/strings.xml
+++ b/OpenKeychain/src/main/res/values-ko/strings.xml
@@ -36,7 +36,7 @@
   <string name="title_manage_my_keys">내 키 관리</string>
   <!--section-->
   <string name="section_user_ids">신원</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_linked_system_contact">연결된 시스템 연락처</string>
   <string name="section_keybase_proofs">Keybase.io 증명</string>
   <string name="section_should_you_trust">이 키를 믿어야 할까요?</string>
@@ -127,7 +127,7 @@
   <string name="label_file_ascii_armor">ASCII 표시 활성화</string>
   <string name="label_write_version_header">다른 사람에게 OpenKeychain을 사용하고 있다는 걸 알리세요</string>
   <string name="label_write_version_header_summary">\'OpenKeychain v2.7\'을 OpenPGP 서명, 암호화 텍스트, 내보낸 키에 쓰기</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">YubiKey PIN 입력에 숫자 키패드 사용</string>
+  <string name="label_use_num_keypad_for_security_token_pin">YubiKey PIN 입력에 숫자 키패드 사용</string>
   <string name="label_asymmetric_from">다음으로 서명:</string>
   <string name="label_to">다음에게 암호화:</string>
   <string name="label_delete_after_encryption">암호화 후 파일들 삭제</string>
@@ -257,10 +257,10 @@
   <string name="passphrase_for_backup">백업 코드 입력</string>
   <string name="passphrase_for">\'%s\'을(를) 위해 암호를 입력 해 주세요</string>
   <string name="pin_for">\'%s\'을(를) 위해 PIN을 입력 해 주세요</string>
-  <string name="yubikey_pin_for">\'%s\'를 위해 YubiKey를 엑세스 하기 위한 PIN을 입력 해 주세요</string>
-  <string name="nfc_text">YubiKey를 장치 뒤의 NFC 표시에 대어 주세요</string>
-  <string name="nfc_wait">YubiKey를 뒷면에 계속 대고 있으세요!</string>
-  <string name="nfc_finished">이제 YubiKey를 떼어도 됩니다.</string>
+  <string name="security_token_pin_for">\'%s\'를 위해 YubiKey를 엑세스 하기 위한 PIN을 입력 해 주세요</string>
+  <string name="security_token_nfc_text">YubiKey를 장치 뒤의 NFC 표시에 대어 주세요</string>
+  <string name="security_token_nfc_wait">YubiKey를 뒷면에 계속 대고 있으세요!</string>
+  <string name="security_token_nfc_finished">이제 YubiKey를 떼어도 됩니다.</string>
   <string name="file_delete_confirmation_title">원본 파일을 삭제할까요?</string>
   <string name="file_delete_confirmation">다음 파일이 삭제 될 것입니다:%s</string>
   <string name="file_delete_successful">%2$d개 중 %1$d개의 파일이 삭제되었습니다.%3$s</string>
diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index 932832f60..a7f0d73fc 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -32,7 +32,7 @@
   <string name="title_manage_my_keys">Beheer mijn sleutels</string>
   <!--section-->
   <string name="section_user_ids">Identiteiten</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_linked_system_contact">Verbonden systeemcontact</string>
   <string name="section_should_you_trust">Zou je deze sleutel vertrouwen?</string>
   <string name="section_proof_details">Bewijs van verificatie</string>
@@ -106,7 +106,7 @@
   <string name="label_file_ascii_armor">ASCII Armor aanzetten</string>
   <string name="label_write_version_header">Laat anderen weten dat je OpenKeychain gebruikt</string>
   <string name="label_write_version_header_summary">Voegt \'OpenKeychain v2.7\' toe aan OpenPGP ondertekeningen, cijfertekst en geëxporteerde sleutels</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Gebruik numeriek toetsenbord voor YubiKey PIN</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Gebruik numeriek toetsenbord voor YubiKey PIN</string>
   <string name="label_asymmetric_from">Ondertekenen met:</string>
   <string name="label_to">Versleutelen naar:</string>
   <string name="label_delete_after_encryption">Verwijder bestanden na versleuteling</string>
@@ -212,10 +212,10 @@
   <string name="passphrase_must_not_be_empty">Geef een wachtwoord in.</string>
   <string name="passphrase_for">Voer het wachtwoord in voor \'%s\'</string>
   <string name="pin_for">Voer PIN in voor \'%s\'</string>
-  <string name="yubikey_pin_for">Voer PIN in om toegang te verkrijgen tot YubiKey voor \'%s\'</string>
-  <string name="nfc_text">Hou de YubiKey tegen de NFC-aanduiding aan de achterkant van je toestel.</string>
-  <string name="nfc_wait">Hou de YubiKey tegen de achterkant!</string>
-  <string name="nfc_finished">Neem de YubiKey nu weg.</string>
+  <string name="security_token_pin_for">Voer PIN in om toegang te verkrijgen tot YubiKey voor \'%s\'</string>
+  <string name="security_token_nfc_text">Hou de YubiKey tegen de NFC-aanduiding aan de achterkant van je toestel.</string>
+  <string name="security_token_nfc_wait">Hou de YubiKey tegen de achterkant!</string>
+  <string name="security_token_nfc_finished">Neem de YubiKey nu weg.</string>
   <string name="file_delete_confirmation_title">Oorspronkelijke bestanden verwijderen?</string>
   <string name="file_delete_confirmation">De volgende bestanden zullen worden verwijderd:%s</string>
   <string name="file_delete_successful">%1$d van %2$d bestanden zijn verwijderd.%3$s</string>
@@ -554,9 +554,9 @@
   <string name="edit_key_select_flag">Gelieve minstens een vlag te selecteren!</string>
   <string name="edit_key_error_add_identity">Voeg minstens een identiteit toe!</string>
   <string name="edit_key_error_add_subkey">Voeg minstens een subsleutel toe!</string>
-  <string name="edit_key_error_bad_nfc_algo">Algoritme wordt niet ondersteund door smartcard!</string>
-  <string name="edit_key_error_bad_nfc_size">Sleutelgrootte wordt niet ondersteund door smartcard!</string>
-  <string name="edit_key_error_bad_nfc_stripped">Kan sleutel niet verplaatsen naar smartcard (ofwel gestript ofwel \'doorschakelen-naar-kaart\')!</string>
+  <string name="edit_key_error_bad_security_token_algo">Algoritme wordt niet ondersteund door smartcard!</string>
+  <string name="edit_key_error_bad_security_token_size">Sleutelgrootte wordt niet ondersteund door smartcard!</string>
+  <string name="edit_key_error_bad_security_token_stripped">Kan sleutel niet verplaatsen naar smartcard (ofwel gestript ofwel \'doorschakelen-naar-kaart\')!</string>
   <!--Create key-->
   <string name="create_key_empty">Dit veld moet ingevuld worden</string>
   <string name="create_key_passphrases_not_equal">Wachtwoorden komen niet overeen</string>
@@ -1105,10 +1105,10 @@
   <string name="first_time_text1">Neem je privacy terug met OpenKeychain!</string>
   <string name="first_time_create_key">Mijn sleutel aanmaken</string>
   <string name="first_time_import_key">Sleutel importeren uit bestand</string>
-  <string name="first_time_yubikey">Gebruik YubiKey NEO</string>
+  <string name="first_time_security_token">Gebruik YubiKey NEO</string>
   <string name="first_time_skip">Setup overslaan</string>
-  <string name="first_time_blank_yubikey">Wil je deze lege YubiKey NEO gebruiken met OpenKeychain?\n\nNeem de YubiKey nu weg, je zal gevraagd worden deze terug boven te halen wanneer nodig!</string>
-  <string name="first_time_blank_yubikey_yes">Gebruik deze YubiKey</string>
+  <string name="first_time_blank_security_token">Wil je deze lege YubiKey NEO gebruiken met OpenKeychain?\n\nNeem de YubiKey nu weg, je zal gevraagd worden deze terug boven te halen wanneer nodig!</string>
+  <string name="first_time_blank_security_token_yes">Gebruik deze YubiKey</string>
   <string name="backup_all">Alle sleutels + je eigen sleutels</string>
   <string name="backup_public_keys">Alle sleutels</string>
   <!--unsorted-->
@@ -1168,33 +1168,33 @@
   <string name="nfc_wrong_tag">Verkeerde tag. Gelieve opnieuw te proberen.</string>
   <string name="enable_nfc">Gelieve NFC in je instellingen te activeren</string>
   <string name="no_nfc_support">Dit toestel biedt geen ondersteuning voor NFC</string>
-  <string name="nfc_write_succesful">Succesvol geschreven op NFC-tag</string>
+  <string name="nfc_write_successful">Succesvol geschreven op NFC-tag</string>
   <string name="unlocked">Ontgrendeld</string>
   <string name="nfc_settings">Instellingen</string>
-  <string name="snack_yubikey_view">Bekijken</string>
-  <string name="snack_yubikey_import">Importeren</string>
+  <string name="snack_security_token_view">Bekijken</string>
+  <string name="snack_security_token_import">Importeren</string>
   <string name="button_bind_key">Sleutel binden</string>
-  <string name="yubikey_serno">Serienummer: %s</string>
-  <string name="yubikey_key_holder">Sleutelhouder:</string>
-  <string name="yubikey_status_bound">YubiKey komt overeen en is gebonden aan sleutel</string>
-  <string name="yubikey_status_unbound">YubiKey komt overeen en kan worden gebonden aan sleutel</string>
-  <string name="yubikey_status_partly">YubiKey komt overeen en is gedeeltelijk gebonden aan sleutel</string>
-  <string name="yubikey_create">Hou de YubiKey tegen de achterkant van je toestel.</string>
+  <string name="security_token_serial_no">Serienummer: %s</string>
+  <string name="security_token_key_holder">Sleutelhouder:</string>
+  <string name="security_token_status_bound">YubiKey komt overeen en is gebonden aan sleutel</string>
+  <string name="security_token_status_unbound">YubiKey komt overeen en kan worden gebonden aan sleutel</string>
+  <string name="security_token_status_partly">YubiKey komt overeen en is gedeeltelijk gebonden aan sleutel</string>
+  <string name="security_token_create">Hou de YubiKey tegen de achterkant van je toestel.</string>
   <string name="btn_import">Importeren</string>
-  <string name="snack_yubi_other">Andere sleutel opgeslagen op YubiKey!</string>
-  <string name="error_nfc">NFC-fout: %s</string>
-  <plurals name="error_pin">
+  <string name="snack_security_token_other">Andere sleutel opgeslagen op YubiKey!</string>
+  <string name="security_token_error">NFC-fout: %s</string>
+  <plurals name="security_token_error_pin">
     <item quantity="one">Ongeldige PIN!\n%d resterende poging.</item>
     <item quantity="other">Ongeldige PIN!\n%d resterende pogingen.</item>
   </plurals>
-  <string name="error_nfc_terminated">YubiKey in beëindigingsstaat.</string>
-  <string name="error_nfc_wrong_length">Ingevoerde PIN is te kort. PIN\'s zijn minstens 6 tekens lang.</string>
-  <string name="error_nfc_conditions_not_satisfied">Gebruiksvoorwaarden niet voldaan.</string>
-  <string name="error_nfc_security_not_satisfied">Veiligheidsstatus niet voldaan.</string>
-  <string name="error_nfc_authentication_blocked">PIN geblokkeerd na te veel pogingen.</string>
-  <string name="error_nfc_data_not_found">Sleutel of object niet gevonden.</string>
-  <string name="error_nfc_unknown">Onbekende fout</string>
-  <string name="error_nfc_try_again">Opnieuw proberen</string>
+  <string name="security_token_error_terminated">YubiKey in beëindigingsstaat.</string>
+  <string name="security_token_error_wrong_length">Ingevoerde PIN is te kort. PIN\'s zijn minstens 6 tekens lang.</string>
+  <string name="security_token_error_conditions_not_satisfied">Gebruiksvoorwaarden niet voldaan.</string>
+  <string name="security_token_error_security_not_satisfied">Veiligheidsstatus niet voldaan.</string>
+  <string name="security_token_error_authentication_blocked">PIN geblokkeerd na te veel pogingen.</string>
+  <string name="security_token_error_data_not_found">Sleutel of object niet gevonden.</string>
+  <string name="security_token_error_unknown">Onbekende fout</string>
+  <string name="security_token_error_try_again">Opnieuw proberen</string>
   <string name="error_temp_file">Fout bij aanmaken van tijdelijk bestand.</string>
   <string name="btn_delete_original">Oorspronkelijk bestand verwijderen</string>
   <string name="snack_encrypt_filenames_on">Bestandsnamen <b>zijn</b> versleuteld.</string>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index adb3cf49f..590a98321 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -71,7 +71,7 @@
   <string name="label_file_ascii_armor">Włącz ASCII Armor</string>
   <string name="label_write_version_header">Niech inni wiedzą, że używasz OpenKeychain</string>
   <string name="label_write_version_header_summary">Wpisuje \'\'OpenKeychain v2.7\' do podpisów, szyfrogramów i wyeksportowanych kluczy OpenPGP.</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Użyj klawiatury numerycznej dla PIN-u YubiKey</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Użyj klawiatury numerycznej dla PIN-u YubiKey</string>
   <string name="label_to">Szyfruj do:</string>
   <string name="label_delete_after_decryption">Usuń po odszyfrowaniu</string>
   <string name="label_encryption_algorithm">Algorytm szyfrowania</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 10dd79cba..58ce26dbc 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -36,7 +36,7 @@
   <string name="title_manage_my_keys">Управление ключами</string>
   <!--section-->
   <string name="section_user_ids">Идентификаторы</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_linked_system_contact">Связанные контакты</string>
   <string name="section_keybase_proofs">Доказательства Keybase.io</string>
   <string name="section_should_you_trust">Должны ли Вы доверять этому ключу?</string>
@@ -127,7 +127,7 @@
   <string name="label_file_ascii_armor">Использовать ASCII формат</string>
   <string name="label_write_version_header">Добавить комментарий об использовании OpenKeychain</string>
   <string name="label_write_version_header_summary">Дописывать \'OpenKeychain v2.x\' в OpenPGP подписи, шифры, и экспортируемые ключи</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Использовать цифровую клавиатуру для YubiKey PIN</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Использовать цифровую клавиатуру для YubiKey PIN</string>
   <string name="label_asymmetric_from">Подписать:</string>
   <string name="label_to">Зашифровать для:</string>
   <string name="label_delete_after_encryption">Удалить файлы после шифрования</string>
@@ -258,7 +258,7 @@
   <string name="passphrase_for">Введите пароль для \'%s\'</string>
   <string name="pin_for">Введите PIN для
 \'%s\'</string>
-  <string name="yubikey_pin_for">Введите PIN для доступа к YubiKey для
+  <string name="security_token_pin_for">Введите PIN для доступа к YubiKey для
 \'%s\'</string>
   <string name="file_delete_confirmation_title">Удалить исходные файлы?</string>
   <string name="file_delete_confirmation">Следующие файлы будут удалены:%s</string>
@@ -893,7 +893,7 @@
   <string name="first_time_text1">Верните вашу приватность с помощью OpenKeychain!</string>
   <string name="first_time_create_key">Создать свой ключ</string>
   <string name="first_time_import_key">Импорт ключа из файла</string>
-  <string name="first_time_yubikey">Использовать YubiKey NEO</string>
+  <string name="first_time_security_token">Использовать YubiKey NEO</string>
   <string name="first_time_skip">Пропустить настройку</string>
   <!--unsorted-->
   <string name="section_certifier_id">Кем подписан</string>
@@ -935,10 +935,10 @@
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
   <string name="unlocked">Разблокирован</string>
   <string name="nfc_settings">Настройки</string>
-  <string name="snack_yubikey_view">Просмотр</string>
-  <string name="snack_yubikey_import">Импорт</string>
-  <string name="yubikey_key_holder">Владелец ключа:</string>
-  <string name="error_nfc">Ошибка NFC: %s</string>
+  <string name="snack_security_token_view">Просмотр</string>
+  <string name="snack_security_token_import">Импорт</string>
+  <string name="security_token_key_holder">Владелец ключа:</string>
+  <string name="security_token_error">Ошибка NFC: %s</string>
   <!--Other Linked Identity strings-->
   <string name="linked_select_2">Пожалуйста, выберите тип:</string>
   <string name="section_linked_identities">Связанные идентификаторы</string>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index 697de0984..63a9e844e 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -84,7 +84,7 @@
   <string name="label_file_ascii_armor">Omogoči ASCII ovoj</string>
   <string name="label_write_version_header">Daj drugim vedeti, da uporabljate OpenKeychain</string>
   <string name="label_write_version_header_summary">Zapiše \'OpenKeychain v2.7\' v OpenPGP podpis, šifrirano besedilo in izvožene ključe</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Uporabi numerično tipkovnico za YubiKey PIN kodo</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Uporabi numerično tipkovnico za YubiKey PIN kodo</string>
   <string name="label_to">Šifriraj za:</string>
   <string name="label_delete_after_encryption">Po dešifriranju izbriši datoteke</string>
   <string name="label_delete_after_decryption">Izbriši po dešifriranju</string>
@@ -157,7 +157,7 @@
   <!--sentences-->
   <string name="no_filemanager_installed">Nimate nameščenega združljivega upravljalnika datotek.</string>
   <string name="pin_for">Vnesite PIN kodo za \'%s\'</string>
-  <string name="yubikey_pin_for">Vnesite PIN kodo za dostop YubiKey za \'%s\'</string>
+  <string name="security_token_pin_for">Vnesite PIN kodo za dostop YubiKey za \'%s\'</string>
   <string name="file_delete_confirmation_title">Izbrišem izvirne datoteke?</string>
   <string name="file_delete_confirmation">Izbrisane bodo naslednje datoteke:%s</string>
   <string name="file_delete_successful">Izbrisanih je bilo %1$d od %2$d datotek.%3$s</string>
diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml
index 8ff26f896..75eb8b0f3 100644
--- a/OpenKeychain/src/main/res/values-sr/strings.xml
+++ b/OpenKeychain/src/main/res/values-sr/strings.xml
@@ -36,7 +36,7 @@
   <string name="title_manage_my_keys">Управљање мојим кључевима</string>
   <!--section-->
   <string name="section_user_ids">Идентитети</string>
-  <string name="section_yubikey">Јубикључ</string>
+  <string name="section_security_token">Јубикључ</string>
   <string name="section_linked_system_contact">Повезани контакт</string>
   <string name="section_keybase_proofs">Keybase.io докази</string>
   <string name="section_should_you_trust">Смете ли да се поуздате у овај кључ?</string>
@@ -130,7 +130,7 @@
   <string name="label_file_ascii_armor">Омогући Аски оклоп</string>
   <string name="label_write_version_header">Упиши да користим Отворени кључарник</string>
   <string name="label_write_version_header_summary">Уписује „OpenKeychain v3.0“ у ОпенПГП потписе, шифровани текст и извезене кључеве</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Користи бројчану тастатуру за Јубикључ ПИН</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Користи бројчану тастатуру за Јубикључ ПИН</string>
   <string name="label_asymmetric_from">Потпиши помоћу:</string>
   <string name="label_to">Шифруј за:</string>
   <string name="label_delete_after_encryption">Обриши фајлове након шифровања</string>
@@ -266,10 +266,10 @@
   <string name="passphrase_for_backup">Унесите кôд за резерву</string>
   <string name="passphrase_for">Унесите лозинку за „%s“</string>
   <string name="pin_for">Унесите ПИН за „%s“</string>
-  <string name="yubikey_pin_for">Унесите ПИН за приступ Јубикључу за „%s“</string>
-  <string name="nfc_text">Држите Јубикључ на НФЦ ознаци на полеђини вашег уређаја.</string>
-  <string name="nfc_wait">Држите Јубикључ на полеђини!</string>
-  <string name="nfc_finished">Склоните сада Јубикључ.</string>
+  <string name="security_token_pin_for">Унесите ПИН за приступ Јубикључу за „%s“</string>
+  <string name="security_token_nfc_text">Држите Јубикључ на НФЦ ознаци на полеђини вашег уређаја.</string>
+  <string name="security_token_nfc_wait">Држите Јубикључ на полеђини!</string>
+  <string name="security_token_nfc_finished">Склоните сада Јубикључ.</string>
   <string name="file_delete_confirmation_title">Обрисати оригиналне фајлове?</string>
   <string name="file_delete_confirmation">Следећи фајлови ће бити обрисани:%s</string>
   <string name="file_delete_successful">%1$d од %2$d фајлова је обрисано.%3$s</string>
@@ -678,9 +678,9 @@
   <string name="edit_key_select_flag">Изаберите бар једну заставицу!</string>
   <string name="edit_key_error_add_identity">Додајте бар један идентитет!</string>
   <string name="edit_key_error_add_subkey">Додајте бар један поткључ!</string>
-  <string name="edit_key_error_bad_nfc_algo">Смарт картица не подржава овај алгоритам!</string>
-  <string name="edit_key_error_bad_nfc_size">Смарт картица не подржава ову величину кључа!</string>
-  <string name="edit_key_error_bad_nfc_stripped">Не могу да преместим кључ на смарт картицу (или је огољен или је „преусмери-на-картицу“)!</string>
+  <string name="edit_key_error_bad_security_token_algo">Смарт картица не подржава овај алгоритам!</string>
+  <string name="edit_key_error_bad_security_token_size">Смарт картица не подржава ову величину кључа!</string>
+  <string name="edit_key_error_bad_security_token_stripped">Не могу да преместим кључ на смарт картицу (или је огољен или је „преусмери-на-картицу“)!</string>
   <!--Create key-->
   <string name="create_key_upload">Синхронизуј са интернетом</string>
   <string name="create_key_empty">Ово поље је обавезно</string>
@@ -1334,10 +1334,10 @@
   <string name="first_time_text1">Преузмите вашу приватност помоћу Отвореног кључарника!</string>
   <string name="first_time_create_key">Направи ми кључ</string>
   <string name="first_time_import_key">Увези кључ из фајла</string>
-  <string name="first_time_yubikey">Користи Јубикључ НЕО</string>
+  <string name="first_time_security_token">Користи Јубикључ НЕО</string>
   <string name="first_time_skip">Прескочи поставу</string>
-  <string name="first_time_blank_yubikey">Желите ли да користите овај празни Јубикључ НЕО са Отвореним кључарником?\n\nСклоните сада Јубикључ, бићете упитани када опет буде потребан!</string>
-  <string name="first_time_blank_yubikey_yes">Користи овај Јубикључ</string>
+  <string name="first_time_blank_security_token">Желите ли да користите овај празни Јубикључ НЕО са Отвореним кључарником?\n\nСклоните сада Јубикључ, бићете упитани када опет буде потребан!</string>
+  <string name="first_time_blank_security_token_yes">Користи овај Јубикључ</string>
   <string name="backup_text">Резерве које укључују ваше сопствене кључеве никад немојте делити са другима!</string>
   <string name="backup_all">Свих кључева + сопствених</string>
   <string name="backup_public_keys">Свих кључева</string>
@@ -1406,42 +1406,42 @@
   <string name="nfc_wrong_tag">Погрешна ознака. Покушајте поново.</string>
   <string name="enable_nfc">Активирајте НФЦ у поставкама</string>
   <string name="no_nfc_support">Овај уређај не подржава НФЦ</string>
-  <string name="nfc_write_succesful">Успешно уписах на НФЦ ознаку</string>
+  <string name="nfc_write_successful">Успешно уписах на НФЦ ознаку</string>
   <string name="unlocked">Откључан</string>
   <string name="nfc_settings">Поставке</string>
-  <string name="snack_yubikey_view">Прикажи</string>
-  <string name="snack_yubikey_import">Увоз</string>
+  <string name="snack_security_token_view">Прикажи</string>
+  <string name="snack_security_token_import">Увоз</string>
   <string name="button_bind_key">Повежи кључ</string>
-  <string name="yubikey_serno">Серијски број: %s</string>
-  <string name="yubikey_key_holder">Власник кључа: </string>
-  <string name="yubikey_key_holder_not_set"><![CDATA[Држач кључа: <није постављено>]]></string>
-  <string name="yubikey_status_bound">Јубикључ одговара и повезан са кључем</string>
-  <string name="yubikey_status_unbound">Јубикључ одговара, може да се повеже са кључем</string>
-  <string name="yubikey_status_partly">Јубикључ одговара, делимично повезан са кључем</string>
-  <string name="yubikey_create">Држите Јубикључ на полеђини вашег уређаја.</string>
+  <string name="security_token_serial_no">Серијски број: %s</string>
+  <string name="security_token_key_holder">Власник кључа: </string>
+  <string name="security_token_key_holder_not_set"><![CDATA[Држач кључа: <није постављено>]]></string>
+  <string name="security_token_status_bound">Јубикључ одговара и повезан са кључем</string>
+  <string name="security_token_status_unbound">Јубикључ одговара, може да се повеже са кључем</string>
+  <string name="security_token_status_partly">Јубикључ одговара, делимично повезан са кључем</string>
+  <string name="security_token_create">Држите Јубикључ на полеђини вашег уређаја.</string>
   <string name="btn_import">Увези</string>
   <string name="btn_reset">Ресетуј</string>
-  <string name="yubikey_import_radio">Увези кључ</string>
-  <string name="yubikey_reset_radio">Ресетуј Јубикључ</string>
-  <string name="snack_yubi_other">Други кључ је смештен на Јубикључу!</string>
-  <string name="error_nfc">НФЦ грешка: %s</string>
-  <plurals name="error_pin">
+  <string name="security_token_import_radio">Увези кључ</string>
+  <string name="security_token_reset_radio">Ресетуј Јубикључ</string>
+  <string name="snack_security_token_other">Други кључ је смештен на Јубикључу!</string>
+  <string name="security_token_error">НФЦ грешка: %s</string>
+  <plurals name="security_token_error_pin">
     <item quantity="one">Нетачан ПИН!\n%d покушај преостао.</item>
     <item quantity="few">Нетачан ПИН!\n%d покушаај преостала.</item>
     <item quantity="other">Нетачан ПИН!\n%d покушаја преостало.</item>
   </plurals>
-  <string name="error_nfc_terminated">Јубикључ у завршном стању.</string>
-  <string name="error_nfc_wrong_length">Унети ПИН је прекратак. ПИНови су дуги најмање 6 бројки.</string>
-  <string name="error_nfc_conditions_not_satisfied">Услови употребе нису задовољени.</string>
-  <string name="error_nfc_security_not_satisfied">Безбедносно стање није задовољено.</string>
-  <string name="error_nfc_authentication_blocked">ПИН блокиран након превише покушаја.</string>
-  <string name="error_nfc_data_not_found">Кључ или објекат нису нађени!</string>
-  <string name="error_nfc_unknown">Непозната грешка</string>
-  <string name="error_nfc_bad_data">Јубикључ је пријавио неисправне податке.</string>
-  <string name="error_nfc_chaining_error">Јубикључ је очекивао последњу наредбу у ланцу.</string>
-  <string name="error_nfc_header">Јубикључ је пријавио неисправан %s бит.</string>
-  <string name="error_nfc_tag_lost">Јубикључ је прерано склоњен. Држите Јубикључ на полеђини уређаја док се радња не заврши.</string>
-  <string name="error_nfc_try_again">Покушај поново</string>
+  <string name="security_token_error_terminated">Јубикључ у завршном стању.</string>
+  <string name="security_token_error_wrong_length">Унети ПИН је прекратак. ПИНови су дуги најмање 6 бројки.</string>
+  <string name="security_token_error_conditions_not_satisfied">Услови употребе нису задовољени.</string>
+  <string name="security_token_error_security_not_satisfied">Безбедносно стање није задовољено.</string>
+  <string name="security_token_error_authentication_blocked">ПИН блокиран након превише покушаја.</string>
+  <string name="security_token_error_data_not_found">Кључ или објекат нису нађени!</string>
+  <string name="security_token_error_unknown">Непозната грешка</string>
+  <string name="security_token_error_bad_data">Јубикључ је пријавио неисправне податке.</string>
+  <string name="security_token_error_chaining_error">Јубикључ је очекивао последњу наредбу у ланцу.</string>
+  <string name="security_token_error_header">Јубикључ је пријавио неисправан %s бит.</string>
+  <string name="security_token_error_tag_lost">Јубикључ је прерано склоњен. Држите Јубикључ на полеђини уређаја док се радња не заврши.</string>
+  <string name="security_token_error_try_again">Покушај поново</string>
   <string name="error_pin_wrong">ПИН је погрешан!</string>
   <string name="error_temp_file">Грешка стварања привременог фајла.</string>
   <string name="btn_delete_original">Обриши оригинални фајл</string>
diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml
index f3a818ecf..56b9b1a21 100644
--- a/OpenKeychain/src/main/res/values-sv/strings.xml
+++ b/OpenKeychain/src/main/res/values-sv/strings.xml
@@ -35,7 +35,7 @@
   <string name="title_manage_my_keys">Hantera mina nycklar</string>
   <!--section-->
   <string name="section_user_ids">Identiteter</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_linked_system_contact">Länkade systemkontakten</string>
   <string name="section_keybase_proofs">Keybase.io-bevis</string>
   <string name="section_should_you_trust">Skulle du lita på denna nyckel?</string>
@@ -114,7 +114,7 @@
   <string name="label_file_ascii_armor">Aktivera ASCII-format</string>
   <string name="label_write_version_header">Låt andra se att du använder OpenKeychain</string>
   <string name="label_write_version_header_summary">Skriver \'OpenKeychain v2.7\' till OpenPGP-signaturer, chiffertext och exporterade nycklar.</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Använd numeriska tangentbordet för YubiKey PIN</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Använd numeriska tangentbordet för YubiKey PIN</string>
   <string name="label_asymmetric_from">Signera med:</string>
   <string name="label_to">Kryptera till:</string>
   <string name="label_delete_after_encryption">Radera filer efter kryptering</string>
@@ -210,7 +210,7 @@
   <string name="passphrase_must_not_be_empty">Var god ange ett lösenord.</string>
   <string name="passphrase_for">Ange lösenord för \'%s\'</string>
   <string name="pin_for">Ange PIN för \'%s\'</string>
-  <string name="yubikey_pin_for">Ange PIN för att få åtkomst till YubiKey för \'%s\'</string>
+  <string name="security_token_pin_for">Ange PIN för att få åtkomst till YubiKey för \'%s\'</string>
   <string name="file_delete_confirmation_title">Radera orginalfiler?</string>
   <string name="file_delete_confirmation">Följande filer kommer raderas:%s</string>
   <string name="file_delete_successful">%1$d av %2$d filer har raderats.%3$s</string>
@@ -530,8 +530,8 @@
   <string name="edit_key_select_flag">Välj åtminstone en flagga!</string>
   <string name="edit_key_error_add_identity">Lägg till åtminstone en identitet!</string>
   <string name="edit_key_error_add_subkey">Lägg till åtminstone en undernyckel!</string>
-  <string name="edit_key_error_bad_nfc_algo">Algoritmen stöds inte av smartcard!</string>
-  <string name="edit_key_error_bad_nfc_size">Nyckelstorleken stöds inte av smartcard!</string>
+  <string name="edit_key_error_bad_security_token_algo">Algoritmen stöds inte av smartcard!</string>
+  <string name="edit_key_error_bad_security_token_size">Nyckelstorleken stöds inte av smartcard!</string>
   <!--Create key-->
   <string name="create_key_empty">Detta fält krävs</string>
   <string name="create_key_passphrases_not_equal">Lösenorden stämmer inte överens</string>
@@ -858,7 +858,7 @@
   <string name="first_time_text1">Ta tillbaka din integritet med OpenKeychain!</string>
   <string name="first_time_create_key">Skapa min nyckel</string>
   <string name="first_time_import_key">Importera nyckel från fil</string>
-  <string name="first_time_yubikey">Använd YubiKey NEO</string>
+  <string name="first_time_security_token">Använd YubiKey NEO</string>
   <string name="first_time_skip">Hoppa över inställning</string>
   <!--unsorted-->
   <string name="section_cert">Certifikatinformation</string>
@@ -897,8 +897,8 @@
   <string name="no_nfc_support">Denna enhet stöder inte NFC</string>
   <string name="unlocked">Upplåst</string>
   <string name="nfc_settings">Inställningar</string>
-  <string name="error_nfc_unknown">Okänt fel</string>
-  <string name="error_nfc_try_again">Försök igen</string>
+  <string name="security_token_error_unknown">Okänt fel</string>
+  <string name="security_token_error_try_again">Försök igen</string>
   <string name="btn_delete_original">Radera ursprunglig fil</string>
   <string name="view_internal">Visa i OpenKeychain</string>
   <string name="error_clipboard_empty">Urklipp är tomt!</string>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index b6088a954..7bd3965b1 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -60,7 +60,7 @@
   <string name="label_file_ascii_armor">ASCII formatında çıktıları etkinleştir</string>
   <string name="label_write_version_header">Diğerlerinin OpenKeychain kullandığını bilmesine izin ver</string>
   <string name="label_write_version_header_summary">OpenPGP imzalarına, şifrelenmiş metinlere ve dışa aktarılmış anahtarlara \'OpenKeychain v2.7\' yazar</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">YubiKey PIN\'i için sayısal klavyeyi kullan</string>
+  <string name="label_use_num_keypad_for_security_token_pin">YubiKey PIN\'i için sayısal klavyeyi kullan</string>
   <string name="label_to">Şuna şifrele:</string>
   <string name="label_delete_after_decryption">Şifre çözme sonrasında sil</string>
   <string name="label_encryption_algorithm">Şifreleme algoritması</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 97f9ec391..36c34e419 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -60,7 +60,7 @@
   <string name="label_file_ascii_armor">Увімкнути ASCII Armor</string>
   <string name="label_write_version_header">Нехай інші дізнаються, що ви користуєтеся OpenKeychain</string>
   <string name="label_write_version_header_summary">Напишіть \'OpenKeychain v2.7\' для підписів, зашифрованого тексту та експортованих ключів  OpenPGP</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Вживати цифрову клавіатуру для YubiKey PIN</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Вживати цифрову клавіатуру для YubiKey PIN</string>
   <string name="label_to">Зашифрувати до:</string>
   <string name="label_delete_after_decryption">Вилучити після розшифрування</string>
   <string name="label_encryption_algorithm">Алгоритм шифрування</string>
diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
index cb4ebf002..5f99abbf7 100644
--- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
@@ -34,7 +34,7 @@
   <string name="title_manage_my_keys">管理我的金鑰</string>
   <!--section-->
   <string name="section_user_ids">身份</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_linked_system_contact">已關聯帳戶</string>
   <string name="section_should_you_trust">您信任這把金鑰嗎？</string>
   <string name="section_keys">子金鑰</string>
@@ -105,7 +105,7 @@
   <string name="label_file_ascii_armor">以ASCII輸出</string>
   <string name="label_write_version_header">讓別人知道我在使用OpenKeychain</string>
   <string name="label_write_version_header_summary">在簽名、密文與匯出的金鑰裡寫入\'OpenKeychain v2.7\'</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">輸入 YubiKey PIN 時使用數字鍵盤</string>
+  <string name="label_use_num_keypad_for_security_token_pin">輸入 YubiKey PIN 時使用數字鍵盤</string>
   <string name="label_asymmetric_from">簽名：</string>
   <string name="label_to">加密給:</string>
   <string name="label_delete_after_encryption">加密後刪除檔案</string>
@@ -210,7 +210,7 @@
   <string name="passphrase_must_not_be_empty">請輸入密碼。</string>
   <string name="passphrase_for">輸入 %s 的密碼</string>
   <string name="pin_for">輸入 \'%s\' 的 PIN</string>
-  <string name="yubikey_pin_for">輸入 PIN 來存取 \'%s\' 的 YubiKey</string>
+  <string name="security_token_pin_for">輸入 PIN 來存取 \'%s\' 的 YubiKey</string>
   <string name="file_delete_confirmation_title">刪除原始檔案？</string>
   <string name="file_delete_confirmation">下列的檔案將會被刪除：%s</string>
   <string name="file_delete_successful">%1$d 之 %2$d 的檔案已經被刪除。%3$s</string>
@@ -536,9 +536,9 @@
   <string name="edit_key_select_flag">請至少選擇一個用途！</string>
   <string name="edit_key_error_add_identity">新增至少一組身分識別！</string>
   <string name="edit_key_error_add_subkey">新增至少一組子金鑰！</string>
-  <string name="edit_key_error_bad_nfc_algo">智慧卡不支援該算法！</string>
-  <string name="edit_key_error_bad_nfc_size">智慧卡不支援該金鑰長度！</string>
-  <string name="edit_key_error_bad_nfc_stripped">無法移動金鑰至智慧卡(已移動或被卸除)！</string>
+  <string name="edit_key_error_bad_security_token_algo">智慧卡不支援該算法！</string>
+  <string name="edit_key_error_bad_security_token_size">智慧卡不支援該金鑰長度！</string>
+  <string name="edit_key_error_bad_security_token_stripped">無法移動金鑰至智慧卡(已移動或被卸除)！</string>
   <!--Create key-->
   <string name="create_key_empty">必填欄位</string>
   <string name="create_key_passphrases_not_equal">密碼不相符</string>
@@ -692,7 +692,7 @@
   <!--First Time-->
   <string name="first_time_create_key">建立金鑰</string>
   <string name="first_time_import_key">從檔案匯入金鑰</string>
-  <string name="first_time_yubikey">使用YubiKey NEO</string>
+  <string name="first_time_security_token">使用YubiKey NEO</string>
   <string name="first_time_skip">跳過設置</string>
   <!--unsorted-->
   <string name="empty_certs">這把金鑰未經過認證</string>
@@ -717,7 +717,7 @@
   <string name="nfc_wrong_tag">錯誤的標籤。請再試一次。</string>
   <string name="enable_nfc">請在您的設定中啓用 NFC</string>
   <string name="no_nfc_support">該裝置不支援 NFC</string>
-  <string name="nfc_write_succesful">成功寫入 NFC 標籤</string>
+  <string name="nfc_write_successful">成功寫入 NFC 標籤</string>
   <string name="unlocked">解鎖</string>
   <string name="nfc_settings">設定</string>
   <!--Other Linked Identity strings-->
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index 17e53794c..c4e2c7b55 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -36,7 +36,7 @@
   <string name="title_manage_my_keys">管理我的密钥</string>
   <!--section-->
   <string name="section_user_ids">用户名</string>
-  <string name="section_yubikey">YubiKey</string>
+  <string name="section_security_token">YubiKey</string>
   <string name="section_linked_system_contact">关联系统联系人</string>
   <string name="section_should_you_trust">信任此密钥?</string>
   <string name="section_proof_details">验证</string>
@@ -128,7 +128,7 @@
   <string name="label_file_ascii_armor">启用ASCII文本化</string>
   <string name="label_write_version_header">写入文件头信息</string>
   <string name="label_write_version_header_summary">在OpenPGP签名、加密文本和导出密钥中写入 \'OpenKeychain v2.7\' 标记。</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">为YubiKey PIN使用数字键盘</string>
+  <string name="label_use_num_keypad_for_security_token_pin">为YubiKey PIN使用数字键盘</string>
   <string name="label_asymmetric_from">签名为：</string>
   <string name="label_to">加密到</string>
   <string name="label_delete_after_encryption">加密文件后删除</string>
@@ -254,10 +254,10 @@
   <string name="passphrase_for_backup">输入备份码</string>
   <string name="passphrase_for">输入密码为 \'%s\'</string>
   <string name="pin_for">输入PIN码为 \'%s\'</string>
-  <string name="yubikey_pin_for">输入访问YubiKey的PIN为 \'%s\'</string>
-  <string name="nfc_text">保持YubiKey 的NFC标签靠近你的手机背部</string>
-  <string name="nfc_wait">挺住！</string>
-  <string name="nfc_finished">现在拿开YubiKey</string>
+  <string name="security_token_pin_for">输入访问YubiKey的PIN为 \'%s\'</string>
+  <string name="security_token_nfc_text">保持YubiKey 的NFC标签靠近你的手机背部</string>
+  <string name="security_token_nfc_wait">挺住！</string>
+  <string name="security_token_nfc_finished">现在拿开YubiKey</string>
   <string name="file_delete_confirmation_title">删除源文件？</string>
   <string name="file_delete_confirmation">这些文件将被删除:%s</string>
   <string name="file_delete_successful">共%2$d个文件 %1$d 个文件已删除.%3$s</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 3c77d82dd..47c53b4e2 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -43,7 +43,7 @@
 
     <!-- section -->
     <string name="section_user_ids">"Identities"</string>
-    <string name="section_yubikey">"YubiKey"</string>
+    <string name="section_security_token">"Security Token"</string>
     <string name="section_linked_system_contact">"Linked System Contact"</string>
     <string name="section_keybase_proofs">"Keybase.io Proofs"</string>
     <string name="section_should_you_trust">"Should you trust this key?"</string>
@@ -150,7 +150,7 @@
     <string name="label_file_ascii_armor">"Enable ASCII Armor"</string>
     <string name="label_write_version_header">"Let others know that you're using OpenKeychain"</string>
     <string name="label_write_version_header_summary">"Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys"</string>
-    <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for YubiKey PIN</string>
+    <string name="label_use_num_keypad_for_security_token_pin">Use number keypad for Security Token PIN</string>
     <string name="label_asymmetric_from">"Sign with:"</string>
     <string name="label_to">"Encrypt to"</string>
     <string name="label_delete_after_encryption">"Delete files after encryption"</string>
@@ -307,11 +307,11 @@
     <string name="passphrase_for_backup">"Enter backup code"</string>
     <string name="passphrase_for">"Enter password for '%s'"</string>
     <string name="pin_for">"Enter PIN for '%s'"</string>
-    <string name="yubikey_pin_for">"Enter PIN to access YubiKey for '%s'"</string>
-    <string name="nfc_text">"Hold YubiKey against the NFC marker at the back of your device."</string>
-    <string name="nfc_wait">"Keep the YubiKey at the back!"</string>
-    <string name="nfc_finished">"Take away the YubiKey now."</string>
-    <string name="nfc_try_again_text">"Take away the YubiKey now and touch TRY AGAIN."</string>
+    <string name="security_token_pin_for">"Enter PIN to access Security Token for '%s'"</string>
+    <string name="security_token_nfc_text">"Hold Security Token against the NFC marker at the back of your device."</string>
+    <string name="security_token_nfc_wait">"Keep the Security Token at the back!"</string>
+    <string name="security_token_nfc_finished">"Take away the Security Token now."</string>
+    <string name="security_token_nfc_try_again_text">"Take away the Security Token now and touch TRY AGAIN."</string>
     <string name="file_delete_confirmation_title">"Delete original files?"</string>
     <string name="file_delete_confirmation">"The following files will be deleted:%s"</string>
     <string name="file_delete_successful">"%1$d out of %2$d files have been deleted.%3$s"</string>
@@ -743,15 +743,15 @@
         <item>"Change Expiry"</item>
         <item>"Revoke Subkey"</item>
         <item>"Strip Subkey"</item>
-        <item>"Move Subkey to YubiKey / Smart Card"</item>
+        <item>"Move Subkey to Security Token"</item>
     </string-array>
     <string name="edit_key_new_subkey">"new subkey"</string>
     <string name="edit_key_select_flag">"Please select at least one flag!"</string>
     <string name="edit_key_error_add_identity">"Add at least one identity!"</string>
     <string name="edit_key_error_add_subkey">"Add at least one subkey!"</string>
-    <string name="edit_key_error_bad_nfc_algo">"Algorithm not supported by smart card!"</string>
-    <string name="edit_key_error_bad_nfc_size">"Key size not supported by smart card!"</string>
-    <string name="edit_key_error_bad_nfc_stripped">"Cannot move key to smart card (either stripped or 'divert-to-card')!"</string>
+    <string name="edit_key_error_bad_security_token_algo">"Algorithm not supported by Security Token!"</string>
+    <string name="edit_key_error_bad_security_token_size">"Key size not supported by Security Token!"</string>
+    <string name="edit_key_error_bad_security_token_stripped">"Cannot move key to Security Token (either stripped or 'divert-to-card')!"</string>
 
     <!-- Create key -->
     <string name="create_key_upload">"Synchronize with the Internet"</string>
@@ -1050,7 +1050,7 @@
 
     <!-- modifySecretKeyRing -->
     <string name="msg_mr">"Modifying keyring %s"</string>
-    <string name="msg_mf_divert">"Will divert to smart card for crypto operations"</string>
+    <string name="msg_mf_divert">"Will divert to Security Token for crypto operations"</string>
     <string name="msg_mf_error_divert_newsub">"Creation of new subkeys is not supported for 'divert-to-card' primary keys!"</string>
     <string name="msg_mf_error_divert_serial">"The serial number of a 'divert-to-card' key must be 16 bytes! This is a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_encode">"Encoding exception!"</string>
@@ -1069,9 +1069,9 @@
     <string name="msg_mf_error_sig">"Signature exception!"</string>
     <string name="msg_mf_error_sub_stripped">"Cannot modify stripped subkey %s!"</string>
     <string name="msg_mf_error_subkey_missing">"Tried to operate on missing subkey %s!"</string>
-    <string name="msg_mf_error_conflicting_nfc_commands">"Cannot move key to smart card in same operation that creates an on-card signature."</string>
+    <string name="msg_mf_error_conflicting_nfc_commands">"Cannot move key to Security Token in same operation that creates an on-card signature."</string>
     <string name="msg_mf_error_duplicate_keytocard_for_slot">"Smart card supports only one slot per key type."</string>
-    <string name="msg_mf_error_invalid_flags_for_keytocard">"Inappropriate key flags for smart card key."</string>
+    <string name="msg_mf_error_invalid_flags_for_keytocard">"Inappropriate key flags for Security Token key."</string>
     <string name="msg_mf_master">"Modifying master certifications"</string>
     <string name="msg_mf_notation_empty">"Adding empty notation packet"</string>
     <string name="msg_mf_notation_pin">"Adding PIN notation packet"</string>
@@ -1085,15 +1085,15 @@
     <string name="msg_mf_primary_new">"Generating new certificate for new primary user ID"</string>
     <string name="msg_mf_restricted_mode">"Changing to restricted operation mode"</string>
     <string name="msg_mf_subkey_change">"Modifying subkey %s"</string>
-    <string name="msg_mf_require_divert">"Diverting to smart card for crypto operations"</string>
+    <string name="msg_mf_require_divert">"Diverting to Security Token for crypto operations"</string>
     <string name="msg_mf_require_passphrase">"Password required for operations"</string>
     <string name="msg_mf_subkey_new">"Adding new subkey of type %s"</string>
     <string name="msg_mf_subkey_new_id">"New subkey ID: %s"</string>
     <string name="msg_mf_error_past_expiry">"Expiry date cannot be in the past!"</string>
     <string name="msg_mf_subkey_revoke">"Revoking subkey %s"</string>
     <string name="msg_mf_subkey_strip">"Stripping subkey %s"</string>
-    <string name="msg_mf_keytocard_start">"Moving subkey %s to smart card"</string>
-    <string name="msg_mf_keytocard_finish">"Moved %1$s to smart card %2$s"</string>
+    <string name="msg_mf_keytocard_start">"Moving subkey %s to Security Token"</string>
+    <string name="msg_mf_keytocard_finish">"Moved %1$s to Security Token %2$s"</string>
     <string name="msg_mf_success">"Keyring successfully modified"</string>
     <string name="msg_mf_uid_add">"Adding user ID %s"</string>
     <string name="msg_mf_uid_primary">"Changing primary user ID to %s"</string>
@@ -1153,7 +1153,7 @@
     <string name="msg_pr_error_key_not_found">"Key not found!"</string>
     <string name="msg_pr_fetching">"Fetching key to modify (%s)"</string>
     <string name="msg_pr_subkey_match">"Promoting subkey: %s"</string>
-    <string name="msg_pr_subkey_nomatch">"Subkey not on YubiKey: %s"</string>
+    <string name="msg_pr_subkey_nomatch">"Subkey not on Security Token: %s"</string>
     <string name="msg_pr_success">"Key successfully promoted"</string>
 
     <!-- Other messages used in OperationLogs -->
@@ -1458,10 +1458,11 @@
     <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string>
     <string name="first_time_create_key">"Create my key"</string>
     <string name="first_time_import_key">"Import key from file"</string>
-    <string name="first_time_yubikey">"Use YubiKey NEO"</string>
+    <string name="first_time_security_token">"Use Security Token"</string>
+    <string name="first_time_security_token_subtitle">"(Fidesmo, YubiKey NEO, SIGILANCE, …)"</string>
     <string name="first_time_skip">"Skip Setup"</string>
-    <string name="first_time_blank_yubikey">"Would you like to use this blank YubiKey NEO with OpenKeychain?\n\nPlease take away the YubiKey now, you will be prompted when it is needed again!"</string>
-    <string name="first_time_blank_yubikey_yes">"Use this YubiKey"</string>
+    <string name="first_time_blank_security_token">"Would you like to use this blank Security Token with OpenKeychain?\n\nPlease take away the Security Token now, you will be prompted when it is needed again!"</string>
+    <string name="first_time_blank_security_token_yes">"Use this Security Token"</string>
 
     <string name="backup_text">"Backups that include your own keys must never be shared with other people!"</string>
     <string name="backup_all">"All keys + your own keys"</string>
@@ -1485,7 +1486,7 @@
     <string name="error_key_not_found">"Key not found!"</string>
     <string name="error_key_processing">"Error processing key!"</string>
     <string name="key_stripped">"stripped"</string>
-    <string name="key_divert">"divert to smart card"</string>
+    <string name="key_divert">"divert to Security Token"</string>
     <string name="key_no_passphrase">"no password"</string>
     <string name="key_unavailable">"unavailable"</string>
     <string name="secret_cannot_multiple">"Your own keys can only be deleted individually!"</string>
@@ -1536,46 +1537,44 @@
     <string name="nfc_wrong_tag">Wrong Tag. Please try again.</string>
     <string name="enable_nfc">Please activate NFC in your settings</string>
     <string name="no_nfc_support">This device does not support NFC</string>
-    <string name="nfc_write_succesful">Successfully written on NFC tag</string>
+    <string name="nfc_write_successful">Successfully written on NFC tag</string>
     <string name="unlocked">Unlocked</string>
     <string name="nfc_settings">Settings</string>
-    <string name="snack_yubikey_view">"View"</string>
-    <string name="snack_yubikey_import">"Import"</string>
+    <string name="snack_security_token_view">"View"</string>
+    <string name="snack_security_token_import">"Import"</string>
     <string name="button_bind_key">"Bind Key"</string>
-    <string name="yubikey_serno">"Serial No: %s"</string>
-    <string name="yubikey_key_holder">"Key holder: "</string>
-    <string name="yubikey_key_holder_not_set"><![CDATA[Key holder: <not set>]]></string>
-    <string name="yubikey_status_bound">"YubiKey matches and is bound to key"</string>
-    <string name="yubikey_status_unbound">"YubiKey matches, can be bound to key"</string>
-    <string name="yubikey_status_partly">"YubiKey matches, partly bound to key"</string>
-    <string name="yubikey_create">"Hold YubiKey against the back of your device."</string>
-    <string name="yubikey_reset_or_import">"This YubiKey already contains a key. You can import the key using the cloud or reset the YubiKey."</string>
+    <string name="security_token_serial_no">"Serial No: %s"</string>
+    <string name="security_token_key_holder">"Key holder: "</string>
+    <string name="security_token_key_holder_not_set"><![CDATA[Key holder: <not set>]]></string>
+    <string name="security_token_status_bound">"Security Token matches and is bound to key"</string>
+    <string name="security_token_status_unbound">"Security Token matches, can be bound to key"</string>
+    <string name="security_token_status_partly">"Security Token matches, partly bound to key"</string>
+    <string name="security_token_create">"Hold Security Token against the back of your device."</string>
+    <string name="security_token_reset_or_import">"This Security Token already contains a key. You can import the key using the cloud or reset the Security Token."</string>
     <string name="btn_import">"Import"</string>
     <string name="btn_reset">"Reset"</string>
-    <string name="yubikey_import_radio">"Import key"</string>
-    <string name="yubikey_reset_radio">"Reset YubiKey"</string>
-    <string name="yubikey_reset_warning">"Resetting the YubiKey completely destroys the keys on it. Afterwards, you will not be able to decrypt messages/files encrypted with this key!"</string>
-    <string name="snack_yubi_other">Different key stored on YubiKey!</string>
-    <string name="error_nfc">"NFC Error: %s"</string>
-    <plurals name="error_pin">
+    <string name="security_token_import_radio">"Import key"</string>
+    <string name="security_token_reset_radio">"Reset Security Token"</string>
+    <string name="security_token_reset_warning">"Resetting the Security Token completely destroys the keys on it. Afterwards, you will not be able to decrypt messages/files encrypted with this key!"</string>
+    <string name="snack_security_token_other">Different key stored on Security Token!</string>
+    <string name="security_token_error">"Error: %s"</string>
+    <plurals name="security_token_error_pin">
         <item quantity="one">"Incorrect PIN!\n%d try remaining."</item>
         <item quantity="other">"Incorrect PIN!\n%d tries remaining."</item>
     </plurals>
-    <string name="error_nfc_terminated">"YubiKey in termination state."</string>
-    <string name="error_nfc_wrong_length">"Entered PIN is too short. PINs are at least 6 digits long."</string>
-    <string name="error_nfc_conditions_not_satisfied">"Conditions of use not satisfied."</string>
-    <string name="error_nfc_security_not_satisfied">"Security status not satisfied."</string>
-    <string name="error_nfc_authentication_blocked">"PIN blocked after too many attempts."</string>
-    <string name="error_nfc_data_not_found">"Key or object not found."</string>
-    <string name="error_nfc_unknown">"Unknown Error"</string>
-    <string name="error_nfc_bad_data">"YubiKey reported invalid data."</string>
-    <string name="error_nfc_chaining_error">"YubiKey expected last command in a chain."</string>
-    <string name="error_nfc_header">"YubiKey reported invalid %s byte."</string>
-    <string name="error_nfc_tag_lost">"YubiKey has been taken off too early. Keep the YubiKey at the back until the operation finishes."</string>
-    <string name="error_nfc_iso_dep_not_supported">"Tag does not support ISO-DEP (ISO 14443-4)"</string>
-    <string name="error_nfc_try_again">"Try again"</string>
-    <string name="error_pin_wrong">PIN is wrong!</string>
-    <string name="error_temp_file">Error creating temporary file.</string>
+    <string name="security_token_error_terminated">"Security Token in termination state."</string>
+    <string name="security_token_error_wrong_length">"Entered PIN is too short. PINs are at least 6 digits long."</string>
+    <string name="security_token_error_conditions_not_satisfied">"Conditions of use not satisfied."</string>
+    <string name="security_token_error_security_not_satisfied">"Security status not satisfied."</string>
+    <string name="security_token_error_authentication_blocked">"PIN blocked after too many attempts."</string>
+    <string name="security_token_error_data_not_found">"Key or object not found."</string>
+    <string name="security_token_error_unknown">"Unknown Error"</string>
+    <string name="security_token_error_bad_data">"Security Token reported invalid data."</string>
+    <string name="security_token_error_chaining_error">"Security Token expected last command in a chain."</string>
+    <string name="security_token_error_header">"Security Token reported invalid %s byte."</string>
+    <string name="security_token_error_tag_lost">"Security Token has been taken off too early. Keep the Security Token at the back until the operation finishes."</string>
+    <string name="security_token_error_iso_dep_not_supported">"Tag does not support ISO-DEP (ISO 14443-4)"</string>
+    <string name="security_token_error_try_again">"Try again"</string>
     <string name="btn_delete_original">Delete original file</string>
 
     <string name="snack_encrypt_filenames_on">"Filenames <b>are</b> encrypted."</string>
diff --git a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
index 25bdf3a3d..a06e6b8ba 100644
--- a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
@@ -11,5 +11,5 @@
         android:defaultValue="false"
         android:key="useNumKeypadForYubikeyPin"
         android:persistent="true"
-        android:title="@string/label_use_num_keypad_for_yubikey_pin" />
+        android:title="@string/label_use_num_keypad_for_security_token_pin" />
 </PreferenceScreen>