diff --git a/modules/client/keys/device_signing/upload.cc b/modules/client/keys/device_signing/upload.cc
index 359dc7bfb..98affb414 100644
--- a/modules/client/keys/device_signing/upload.cc
+++ b/modules/client/keys/device_signing/upload.cc
@@ -85,7 +85,7 @@ ircd::m::post_keys_device_signing_upload(client &client,
 	const auto master_id
 	{
 		msk?
-			send(room, request.user_id, "ircd.device.signing.master", "", msk):
+			send(room, request.user_id, "ircd.cross_signing.master", "", msk):
 			event::id::buf{}
 	};
 
@@ -97,7 +97,7 @@ ircd::m::post_keys_device_signing_upload(client &client,
 	const auto self_signing_id
 	{
 		ssk?
-			send(room, request.user_id, "ircd.device.signing.self", "", ssk):
+			send(room, request.user_id, "ircd.cross_signing.self", "", ssk):
 			event::id::buf{}
 	};
 
@@ -109,7 +109,7 @@ ircd::m::post_keys_device_signing_upload(client &client,
 	const auto user_signing_id
 	{
 		usk?
-			send(room, request.user_id, "ircd.device.signing.user", "", usk):
+			send(room, request.user_id, "ircd.cross_signing.user", "", usk):
 			event::id::buf{}
 	};
 
diff --git a/modules/federation/user_devices.cc b/modules/federation/user_devices.cc
index a2b706b9b..f65a4d122 100644
--- a/modules/federation/user_devices.cc
+++ b/modules/federation/user_devices.cc
@@ -84,7 +84,7 @@ get__user_devices(client &client,
 
 	const auto master_event_idx
 	{
-		user_room.get(std::nothrow, "ircd.device.signing.master", "")
+		user_room.get(std::nothrow, "ircd.cross_signing.master", "")
 	};
 
 	m::get(std::nothrow, master_event_idx, "content", [&response]
@@ -98,7 +98,7 @@ get__user_devices(client &client,
 
 	const auto self_event_idx
 	{
-		user_room.get(std::nothrow, "ircd.device.signing.self", "")
+		user_room.get(std::nothrow, "ircd.cross_signing.self", "")
 	};
 
 	m::get(std::nothrow, self_event_idx, "content", [&response]
@@ -114,7 +114,7 @@ get__user_devices(client &client,
 	{
 		const auto user_event_idx
 		{
-			user_room.get(std::nothrow, "ircd.device.signing.user", "")
+			user_room.get(std::nothrow, "ircd.cross_signing.user", "")
 		};
 
 		m::get(std::nothrow, user_event_idx, "content", [&response]
diff --git a/modules/federation/user_keys_query.cc b/modules/federation/user_keys_query.cc
index 2169e57fa..956815a58 100644
--- a/modules/federation/user_keys_query.cc
+++ b/modules/federation/user_keys_query.cc
@@ -162,7 +162,7 @@ _query_master_keys(client &client,
 
 		const auto event_idx
 		{
-			room.get(std::nothrow, "ircd.device.signing.master", "")
+			room.get(std::nothrow, "ircd.cross_signing.master", "")
 		};
 
 		m::get(std::nothrow, event_idx, "content", [&response_keys, &user_id]
@@ -205,7 +205,7 @@ _query_self_keys(client &client,
 
 		const auto event_idx
 		{
-			room.get(std::nothrow, "ircd.device.signing.self", "")
+			room.get(std::nothrow, "ircd.cross_signing.self", "")
 		};
 
 		m::get(std::nothrow, event_idx, "content", [&response_keys, &user_id]
@@ -248,7 +248,7 @@ _query_user_keys(client &client,
 
 		const auto event_idx
 		{
-			room.get(std::nothrow, "ircd.device.signing.user", "")
+			room.get(std::nothrow, "ircd.cross_signing.user", "")
 		};
 
 		m::get(std::nothrow, event_idx, "content", [&response_keys, &user_id]
diff --git a/modules/m_signing_key_update.cc b/modules/m_signing_key_update.cc
index d4bf078ac..8d0ea325d 100644
--- a/modules/m_signing_key_update.cc
+++ b/modules/m_signing_key_update.cc
@@ -80,7 +80,7 @@ try
 	const auto master_id
 	{
 		msk?
-			send(room, user_id, "ircd.device.signing.master", "", msk):
+			send(room, user_id, "ircd.cross_signing.master", "", msk):
 			m::event::id::buf{}
 	};
 
@@ -92,7 +92,7 @@ try
 	const auto self_id
 	{
 		ssk?
-			send(room, user_id, "ircd.device.signing.self", "", ssk):
+			send(room, user_id, "ircd.cross_signing.self", "", ssk):
 			m::event::id::buf{}
 	};