diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Curve25519KeyParser.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/AgreementKeyParser.java
similarity index 91%
rename from bramble-core/src/main/java/org/briarproject/bramble/crypto/Curve25519KeyParser.java
rename to bramble-core/src/main/java/org/briarproject/bramble/crypto/AgreementKeyParser.java
index dbd658fef..7b966aa2f 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Curve25519KeyParser.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/AgreementKeyParser.java
@@ -9,8 +9,11 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.security.GeneralSecurityException;
 
+import javax.annotation.concurrent.Immutable;
+
+@Immutable
 @NotNullByDefault
-class Curve25519KeyParser implements KeyParser {
+class AgreementKeyParser implements KeyParser {
 
 	@Override
 	public PublicKey parsePublicKey(byte[] encodedKey)
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java
index c01e607a4..d1cad3869 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java
@@ -86,8 +86,8 @@ class CryptoComponentImpl implements CryptoComponent {
 		signatureKeyPairGenerator = new KeyPairGenerator();
 		signatureKeyPairGenerator.initialize(SIGNATURE_KEY_PAIR_BITS,
 				secureRandom);
-		agreementKeyParser = new Curve25519KeyParser();
-		signatureKeyParser = new EdKeyParser();
+		agreementKeyParser = new AgreementKeyParser();
+		signatureKeyParser = new SignatureKeyParser();
 		messageEncrypter = new MessageEncrypter(secureRandom);
 	}
 
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdKeyParser.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/SignatureKeyParser.java
similarity index 89%
rename from bramble-core/src/main/java/org/briarproject/bramble/crypto/EdKeyParser.java
rename to bramble-core/src/main/java/org/briarproject/bramble/crypto/SignatureKeyParser.java
index ef0578d65..4e7b38c5b 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdKeyParser.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/SignatureKeyParser.java
@@ -9,8 +9,11 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.security.GeneralSecurityException;
 
+import javax.annotation.concurrent.Immutable;
+
+@Immutable
 @NotNullByDefault
-class EdKeyParser implements KeyParser {
+class SignatureKeyParser implements KeyParser {
 
 	@Override
 	public PublicKey parsePublicKey(byte[] encodedKey)
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyAgreementTest.java b/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyAgreementTest.java
index 121901ca1..92bb9fc38 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyAgreementTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyAgreementTest.java
@@ -68,9 +68,9 @@ public class KeyAgreementTest extends BrambleTestCase {
 	public void testRfc7748TestVector() {
 		// Private keys need to be clamped because curve25519-java does the
 		// clamping at key generation time, not multiplication time
-		byte[] aPriv = Curve25519KeyParser.clamp(fromHexString(ALICE_PRIVATE));
+		byte[] aPriv = AgreementKeyParser.clamp(fromHexString(ALICE_PRIVATE));
 		byte[] aPub = fromHexString(ALICE_PUBLIC);
-		byte[] bPriv = Curve25519KeyParser.clamp(fromHexString(BOB_PRIVATE));
+		byte[] bPriv = AgreementKeyParser.clamp(fromHexString(BOB_PRIVATE));
 		byte[] bPub = fromHexString(BOB_PUBLIC);
 		byte[] sharedSecret = fromHexString(SHARED_SECRET);
 		Curve25519 curve25519 = Curve25519.getInstance("java");