diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/CommandAPDUFactory.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCommandApduFactory.java
similarity index 99%
rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/CommandAPDUFactory.java
rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCommandApduFactory.java
index 583cf4376..2b57dd3f4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/CommandAPDUFactory.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCommandApduFactory.java
@@ -11,7 +11,7 @@ import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.encoders.Hex;
 
 
-class CommandAPDUFactory {
+class OpenPgpCommandApduFactory {
     private static final int MAX_APDU_NC = 255;
     private static final int MAX_APDU_NC_EXT = 65535;
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SCP11bSecureMessaging.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SCP11bSecureMessaging.java
index 15a76616b..c021ad662 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SCP11bSecureMessaging.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SCP11bSecureMessaging.java
@@ -274,7 +274,7 @@ class SCP11bSecureMessaging implements SecureMessaging {
     }
 
 
-    public static void establish(final SecurityTokenConnection t, final Context ctx, CommandAPDUFactory commandFactory)
+    public static void establish(final SecurityTokenConnection t, final Context ctx, OpenPgpCommandApduFactory commandFactory)
             throws SecureMessagingException, IOException {
 
         CommandAPDU cmd;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
index 6e2aadc86..7a0ccbb77 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
@@ -89,7 +89,7 @@ public class SecurityTokenConnection {
     private final Transport mTransport;
     @NonNull
     private final Passphrase mPin;
-    private final CommandAPDUFactory commandFactory;
+    private final OpenPgpCommandApduFactory commandFactory;
 
     private CardCapabilities mCardCapabilities;
     private OpenPgpCapabilities mOpenPgpCapabilities;
@@ -111,7 +111,7 @@ public class SecurityTokenConnection {
         this.mTransport = transport;
         this.mPin = pin;
 
-        commandFactory = new CommandAPDUFactory();
+        commandFactory = new OpenPgpCommandApduFactory();
     }
 
     private String getHolderName(byte[] name) {