diff --git a/crates/matrix-sdk-crypto/src/identities/user.rs b/crates/matrix-sdk-crypto/src/identities/user.rs
index 02c080a413..bbfdf54c4e 100644
--- a/crates/matrix-sdk-crypto/src/identities/user.rs
+++ b/crates/matrix-sdk-crypto/src/identities/user.rs
@@ -1757,8 +1757,8 @@ pub(crate) mod tests {
             my_id,
             my_user_id,
             other_user_id,
-            DataSet::msk_b(),
-            DataSet::ssk_b(),
+            DataSet::master_signing_keys_b(),
+            DataSet::self_signing_keys_b(),
         );
         machine.mark_request_as_sent(&TransactionId::new(), &kq_response).await.unwrap();
 
diff --git a/crates/matrix-sdk/src/room/identity_status_changes.rs b/crates/matrix-sdk/src/room/identity_status_changes.rs
index 41d043739e..6e7a8602d3 100644
--- a/crates/matrix-sdk/src/room/identity_status_changes.rs
+++ b/crates/matrix-sdk/src/room/identity_status_changes.rs
@@ -334,8 +334,8 @@ mod tests {
         // And Bob is in verification violation
         t.verify_bob_with(
             IdentityChangeDataSet::key_query_with_identity_b(),
-            IdentityChangeDataSet::msk_b(),
-            IdentityChangeDataSet::ssk_b(),
+            IdentityChangeDataSet::master_signing_keys_b(),
+            IdentityChangeDataSet::self_signing_keys_b(),
         )
         .await;
         t.unpin_bob().await;
@@ -722,8 +722,8 @@ mod tests {
             pub(super) async fn verify_bob(&self) {
                 self.verify_bob_with(
                     IdentityChangeDataSet::key_query_with_identity_a(),
-                    IdentityChangeDataSet::msk_a(),
-                    IdentityChangeDataSet::ssk_a(),
+                    IdentityChangeDataSet::master_signing_keys_a(),
+                    IdentityChangeDataSet::self_signing_keys_a(),
                 )
                 .await;
             }
diff --git a/testing/matrix-sdk-test/src/test_json/keys_query_sets.rs b/testing/matrix-sdk-test/src/test_json/keys_query_sets.rs
index d0ac75929c..1ee8591162 100644
--- a/testing/matrix-sdk-test/src/test_json/keys_query_sets.rs
+++ b/testing/matrix-sdk-test/src/test_json/keys_query_sets.rs
@@ -472,11 +472,11 @@ impl IdentityChangeDataSet {
         KeysQueryUser::bob_c().device_id
     }
 
-    pub fn msk_a() -> Value {
+    pub fn master_signing_keys_a() -> Value {
         master_keys(&KeysQueryUser::bob_a())
     }
 
-    pub fn ssk_a() -> Value {
+    pub fn self_signing_keys_a() -> Value {
         self_signing_keys(&KeysQueryUser::bob_a())
     }
 
@@ -486,11 +486,11 @@ impl IdentityChangeDataSet {
         keys_query(&KeysQueryUser::bob_a(), &[])
     }
 
-    pub fn msk_b() -> Value {
+    pub fn master_signing_keys_b() -> Value {
         master_keys(&KeysQueryUser::bob_b())
     }
 
-    pub fn ssk_b() -> Value {
+    pub fn self_signing_keys_b() -> Value {
         self_signing_keys(&KeysQueryUser::bob_b())
     }