diff --git a/crates/ruma-identifiers/src/opaque_ids.rs b/crates/ruma-identifiers/src/device_id.rs
similarity index 73%
rename from crates/ruma-identifiers/src/opaque_ids.rs
rename to crates/ruma-identifiers/src/device_id.rs
index 20d0449c..80b673fa 100644
--- a/crates/ruma-identifiers/src/opaque_ids.rs
+++ b/crates/ruma-identifiers/src/device_id.rs
@@ -1,5 +1,3 @@
-//! Matrix device identifiers.
-
 #[cfg(feature = "rand")]
 use crate::generate_localpart;
 
@@ -20,14 +18,6 @@ impl DeviceId {
     }
 }
 
-opaque_identifier! {
-    /// A Matrix key identifier.
-    ///
-    /// Key identifiers in Matrix are opaque character sequences of `[a-zA-Z_]`. This type is
-    /// provided simply for its semantic value.
-    pub type KeyName;
-}
-
 #[cfg(all(test, feature = "rand"))]
 mod tests {
     use super::DeviceId;
diff --git a/crates/ruma-identifiers/src/key_name.rs b/crates/ruma-identifiers/src/key_name.rs
new file mode 100644
index 00000000..e45d3a68
--- /dev/null
+++ b/crates/ruma-identifiers/src/key_name.rs
@@ -0,0 +1,7 @@
+opaque_identifier! {
+    /// A Matrix key identifier.
+    ///
+    /// Key identifiers in Matrix are opaque character sequences of `[a-zA-Z_]`. This type is
+    /// provided simply for its semantic value.
+    pub type KeyName;
+}
diff --git a/crates/ruma-identifiers/src/lib.rs b/crates/ruma-identifiers/src/lib.rs
index 3f12d099..2431e28b 100644
--- a/crates/ruma-identifiers/src/lib.rs
+++ b/crates/ruma-identifiers/src/lib.rs
@@ -23,11 +23,12 @@ use serde::de::{self, Deserializer, Unexpected};
 pub use crate::{
     client_secret::{ClientSecret, ClientSecretBox},
     crypto_algorithms::{DeviceKeyAlgorithm, EventEncryptionAlgorithm, SigningKeyAlgorithm},
+    device_id::{DeviceId, DeviceIdBox},
     device_key_id::DeviceKeyId,
     event_id::EventId,
     key_id::{DeviceSigningKeyId, KeyId, ServerSigningKeyId, SigningKeyId},
+    key_name::{KeyName, KeyNameBox},
     mxc_uri::MxcUri,
-    opaque_ids::{DeviceId, DeviceIdBox, KeyName, KeyNameBox},
     room_alias_id::RoomAliasId,
     room_id::RoomId,
     room_id_or_room_alias_id::RoomIdOrAliasId,
@@ -48,11 +49,12 @@ pub mod user_id;
 
 mod client_secret;
 mod crypto_algorithms;
+mod device_id;
 mod device_key_id;
 mod event_id;
 mod key_id;
+mod key_name;
 mod mxc_uri;
-mod opaque_ids;
 mod room_alias_id;
 mod room_id;
 mod room_id_or_room_alias_id;