diff --git a/ChangeLog.d/psa-rc4.txt b/ChangeLog.d/psa-rc4.txt
index 852dd3ecc..c25541336 100644
--- a/ChangeLog.d/psa-rc4.txt
+++ b/ChangeLog.d/psa-rc4.txt
@@ -1,3 +1,3 @@
 Bugfix
-   * Fix PSA cipher multipart operations using RC4. Previously, an IV was
+   * Fix PSA cipher multipart operations using ARC4. Previously, an IV was
      required but discarded. Now, an IV is rejected, as it should be.
diff --git a/include/psa/crypto_values.h b/include/psa/crypto_values.h
index fafe93cf9..05f2ff435 100644
--- a/include/psa/crypto_values.h
+++ b/include/psa/crypto_values.h
@@ -440,9 +440,9 @@
  * Camellia block cipher. */
 #define PSA_KEY_TYPE_CAMELLIA                       ((psa_key_type_t)0x2403)
 
-/** Key for the RC4 stream cipher.
+/** Key for the ARC4 stream cipher (also known as RC4 or ARCFOUR).
  *
- * Note that RC4 is weak and deprecated and should only be used in
+ * Note that ARC4 is weak and deprecated and should only be used in
  * legacy protocols. */
 #define PSA_KEY_TYPE_ARC4                           ((psa_key_type_t)0x2002)
 
diff --git a/tests/suites/test_suite_psa_crypto.data b/tests/suites/test_suite_psa_crypto.data
index 9b7350d92..5636ed4aa 100644
--- a/tests/suites/test_suite_psa_crypto.data
+++ b/tests/suites/test_suite_psa_crypto.data
@@ -1559,7 +1559,7 @@ PSA symmetric encrypt: 3-key 3DES-ECB, 8 bytes, good
 depends_on:PSA_WANT_ALG_ECB_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 cipher_alg_without_iv:PSA_ALG_ECB_NO_PADDING:PSA_KEY_TYPE_DES:"01020407080b0d0ec1c2c4c7c8cbcdce31323437383b3d3e":"c78e2b38139610e3":"817ca7d69b80d86a"
 
-PSA symmetric encrypt: 128-bit RC4, 16 bytes, good
+PSA symmetric encrypt: 128-bit ARC4, 16 bytes, good
 depends_on:PSA_WANT_ALG_STREAM_CIPHER:PSA_WANT_KEY_TYPE_ARC4
 cipher_alg_without_iv:PSA_ALG_STREAM_CIPHER:PSA_KEY_TYPE_ARC4:"0102030405060708090a0b0c0d0e0f10":"00000000000000000000000000000000":"9ac7cc9a609d1ef7b2932899cde41b97"
 
diff --git a/tests/suites/test_suite_psa_crypto_op_fail.misc.data b/tests/suites/test_suite_psa_crypto_op_fail.misc.data
index e82763912..a8ab74896 100644
--- a/tests/suites/test_suite_psa_crypto_op_fail.misc.data
+++ b/tests/suites/test_suite_psa_crypto_op_fail.misc.data
@@ -7,8 +7,8 @@
 PSA hash: invalid algorithm
 hash_fail:PSA_ALG_ECDSA_ANY:PSA_ERROR_INVALID_ARGUMENT
 
-# For RC4, Mbed TLS only supports 128-bit keys. PSA allows 40 to 2048 bits.
-# The RC4 construction allows any whole number of bytes from 1 to 256 bytes
+# For ARC4, Mbed TLS only supports 128-bit keys. PSA allows 40 to 2048 bits.
+# The ARC4 construction allows any whole number of bytes from 1 to 256 bytes
 # (8 to 2048 bits).
 PSA cipher STREAM_CIPHER: 8-bit ARC4 never supported
 depends_on:PSA_WANT_KEY_TYPE_ARC4