diff --git a/src/database/map/count.rs b/src/database/map/count.rs
index 4356b71f..dab45b7a 100644
--- a/src/database/map/count.rs
+++ b/src/database/map/count.rs
@@ -4,12 +4,10 @@ use conduit::implement;
 use futures::stream::StreamExt;
 use serde::Serialize;
 
-use crate::de::Ignore;
-
 /// Count the total number of entries in the map.
 #[implement(super::Map)]
 #[inline]
-pub fn count(&self) -> impl Future<Output = usize> + Send + '_ { self.keys::<Ignore>().count() }
+pub fn count(&self) -> impl Future<Output = usize> + Send + '_ { self.raw_keys().count() }
 
 /// Count the number of entries in the map starting from a lower-bound.
 ///
@@ -20,7 +18,7 @@ pub fn count_from<'a, P>(&'a self, from: &P) -> impl Future<Output = usize> + Se
 where
 	P: Serialize + ?Sized + Debug + 'a,
 {
-	self.keys_from::<Ignore, P>(from).count()
+	self.keys_from_raw(from).count()
 }
 
 /// Count the number of entries in the map matching a prefix.
@@ -32,5 +30,5 @@ pub fn count_prefix<'a, P>(&'a self, prefix: &P) -> impl Future<Output = usize>
 where
 	P: Serialize + ?Sized + Debug + 'a,
 {
-	self.keys_prefix::<Ignore, P>(prefix).count()
+	self.keys_prefix_raw(prefix).count()
 }
diff --git a/src/database/map/keys_from.rs b/src/database/map/keys_from.rs
index 1993750a..4eb3b12e 100644
--- a/src/database/map/keys_from.rs
+++ b/src/database/map/keys_from.rs
@@ -13,13 +13,13 @@ where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
 {
-	self.keys_raw_from(from)
+	self.keys_from_raw(from)
 		.map(keyval::result_deserialize_key::<K>)
 }
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn keys_raw_from<P>(&self, from: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
+pub fn keys_from_raw<P>(&self, from: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -29,7 +29,7 @@ where
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn keys_from_raw<'a, K, P>(&'a self, from: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+pub fn keys_raw_from<'a, K, P>(&'a self, from: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
 	K: Deserialize<'a> + Send,
diff --git a/src/database/map/keys_prefix.rs b/src/database/map/keys_prefix.rs
index d6c0927b..0ff755f3 100644
--- a/src/database/map/keys_prefix.rs
+++ b/src/database/map/keys_prefix.rs
@@ -17,13 +17,13 @@ where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
 {
-	self.keys_raw_prefix(prefix)
+	self.keys_prefix_raw(prefix)
 		.map(keyval::result_deserialize_key::<K>)
 }
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn keys_raw_prefix<P>(&self, prefix: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
+pub fn keys_prefix_raw<P>(&self, prefix: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -34,7 +34,7 @@ where
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn keys_prefix_raw<'a, K, P>(&'a self, prefix: &'a P) -> impl Stream<Item = Result<Key<'_, K>>> + Send + 'a
+pub fn keys_raw_prefix<'a, K, P>(&'a self, prefix: &'a P) -> impl Stream<Item = Result<Key<'_, K>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
 	K: Deserialize<'a> + Send + 'a,
diff --git a/src/database/map/rev_keys_from.rs b/src/database/map/rev_keys_from.rs
index e012e60a..b142718c 100644
--- a/src/database/map/rev_keys_from.rs
+++ b/src/database/map/rev_keys_from.rs
@@ -13,13 +13,13 @@ where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
 {
-	self.rev_keys_raw_from(from)
+	self.rev_keys_from_raw(from)
 		.map(keyval::result_deserialize_key::<K>)
 }
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn rev_keys_raw_from<P>(&self, from: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
+pub fn rev_keys_from_raw<P>(&self, from: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -29,7 +29,7 @@ where
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn rev_keys_from_raw<'a, K, P>(&'a self, from: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+pub fn rev_keys_raw_from<'a, K, P>(&'a self, from: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
 	K: Deserialize<'a> + Send,
diff --git a/src/database/map/rev_keys_prefix.rs b/src/database/map/rev_keys_prefix.rs
index 162c4f9b..5297cecf 100644
--- a/src/database/map/rev_keys_prefix.rs
+++ b/src/database/map/rev_keys_prefix.rs
@@ -17,13 +17,13 @@ where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
 {
-	self.rev_keys_raw_prefix(prefix)
+	self.rev_keys_prefix_raw(prefix)
 		.map(keyval::result_deserialize_key::<K>)
 }
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn rev_keys_raw_prefix<P>(&self, prefix: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
+pub fn rev_keys_prefix_raw<P>(&self, prefix: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -34,7 +34,7 @@ where
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn rev_keys_prefix_raw<'a, K, P>(&'a self, prefix: &'a P) -> impl Stream<Item = Result<Key<'_, K>>> + Send + 'a
+pub fn rev_keys_raw_prefix<'a, K, P>(&'a self, prefix: &'a P) -> impl Stream<Item = Result<Key<'_, K>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
 	K: Deserialize<'a> + Send + 'a,
diff --git a/src/database/map/rev_stream_from.rs b/src/database/map/rev_stream_from.rs
index c48f406b..78318a7f 100644
--- a/src/database/map/rev_stream_from.rs
+++ b/src/database/map/rev_stream_from.rs
@@ -18,7 +18,7 @@ where
 	K: Deserialize<'a> + Send,
 	V: Deserialize<'a> + Send,
 {
-	self.rev_stream_raw_from(from)
+	self.rev_stream_from_raw(from)
 		.map(keyval::result_deserialize::<K, V>)
 }
 
@@ -28,7 +28,7 @@ where
 /// - Result is raw
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn rev_stream_raw_from<P>(&self, from: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+pub fn rev_stream_from_raw<P>(&self, from: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -42,7 +42,7 @@ where
 /// - Result is deserialized
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn rev_stream_from_raw<'a, K, V, P>(&'a self, from: &P) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
+pub fn rev_stream_raw_from<'a, K, V, P>(&'a self, from: &P) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
 	K: Deserialize<'a> + Send,
diff --git a/src/database/map/rev_stream_prefix.rs b/src/database/map/rev_stream_prefix.rs
index 9ef89e9c..601c3298 100644
--- a/src/database/map/rev_stream_prefix.rs
+++ b/src/database/map/rev_stream_prefix.rs
@@ -22,7 +22,7 @@ where
 	K: Deserialize<'a> + Send,
 	V: Deserialize<'a> + Send,
 {
-	self.rev_stream_raw_prefix(prefix)
+	self.rev_stream_prefix_raw(prefix)
 		.map(keyval::result_deserialize::<K, V>)
 }
 
@@ -32,7 +32,7 @@ where
 /// - Result is raw
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn rev_stream_raw_prefix<P>(&self, prefix: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+pub fn rev_stream_prefix_raw<P>(&self, prefix: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -47,7 +47,7 @@ where
 /// - Result is deserialized
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn rev_stream_prefix_raw<'a, K, V, P>(
+pub fn rev_stream_raw_prefix<'a, K, V, P>(
 	&'a self, prefix: &'a P,
 ) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send + 'a
 where
diff --git a/src/database/map/stream_from.rs b/src/database/map/stream_from.rs
index db828125..0d3bb1e1 100644
--- a/src/database/map/stream_from.rs
+++ b/src/database/map/stream_from.rs
@@ -18,7 +18,7 @@ where
 	K: Deserialize<'a> + Send,
 	V: Deserialize<'a> + Send,
 {
-	self.stream_raw_from(from)
+	self.stream_from_raw(from)
 		.map(keyval::result_deserialize::<K, V>)
 }
 
@@ -28,7 +28,7 @@ where
 /// - Result is raw
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn stream_raw_from<P>(&self, from: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+pub fn stream_from_raw<P>(&self, from: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -42,7 +42,7 @@ where
 /// - Result is deserialized
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn stream_from_raw<'a, K, V, P>(&'a self, from: &P) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
+pub fn stream_raw_from<'a, K, V, P>(&'a self, from: &P) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
 	K: Deserialize<'a> + Send,
diff --git a/src/database/map/stream_prefix.rs b/src/database/map/stream_prefix.rs
index 56154a8b..cab3dd09 100644
--- a/src/database/map/stream_prefix.rs
+++ b/src/database/map/stream_prefix.rs
@@ -22,7 +22,7 @@ where
 	K: Deserialize<'a> + Send,
 	V: Deserialize<'a> + Send,
 {
-	self.stream_raw_prefix(prefix)
+	self.stream_prefix_raw(prefix)
 		.map(keyval::result_deserialize::<K, V>)
 }
 
@@ -32,7 +32,7 @@ where
 /// - Result is raw
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn stream_raw_prefix<P>(&self, prefix: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+pub fn stream_prefix_raw<P>(&self, prefix: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -47,7 +47,7 @@ where
 /// - Result is deserialized
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
-pub fn stream_prefix_raw<'a, K, V, P>(
+pub fn stream_raw_prefix<'a, K, V, P>(
 	&'a self, prefix: &'a P,
 ) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send + 'a
 where
diff --git a/src/service/key_backups/mod.rs b/src/service/key_backups/mod.rs
index 55263eeb..4c303757 100644
--- a/src/service/key_backups/mod.rs
+++ b/src/service/key_backups/mod.rs
@@ -79,7 +79,7 @@ pub async fn delete_backup(&self, user_id: &UserId, version: &str) {
 	let key = (user_id, version, Interfix);
 	self.db
 		.backupkeyid_backup
-		.keys_raw_prefix(&key)
+		.keys_prefix_raw(&key)
 		.ignore_err()
 		.ready_for_each(|outdated_key| self.db.backupkeyid_backup.remove(outdated_key))
 		.await;
@@ -181,7 +181,7 @@ pub async fn count_keys(&self, user_id: &UserId, version: &str) -> usize {
 	let prefix = (user_id, version);
 	self.db
 		.backupkeyid_backup
-		.keys_raw_prefix(&prefix)
+		.keys_prefix_raw(&prefix)
 		.count()
 		.await
 }
@@ -256,7 +256,7 @@ pub async fn delete_all_keys(&self, user_id: &UserId, version: &str) {
 	let key = (user_id, version, Interfix);
 	self.db
 		.backupkeyid_backup
-		.keys_raw_prefix(&key)
+		.keys_prefix_raw(&key)
 		.ignore_err()
 		.ready_for_each(|outdated_key| self.db.backupkeyid_backup.remove(outdated_key))
 		.await;
@@ -267,7 +267,7 @@ pub async fn delete_room_keys(&self, user_id: &UserId, version: &str, room_id: &
 	let key = (user_id, version, room_id, Interfix);
 	self.db
 		.backupkeyid_backup
-		.keys_raw_prefix(&key)
+		.keys_prefix_raw(&key)
 		.ignore_err()
 		.ready_for_each(|outdated_key| self.db.backupkeyid_backup.remove(outdated_key))
 		.await;
@@ -278,7 +278,7 @@ pub async fn delete_room_key(&self, user_id: &UserId, version: &str, room_id: &R
 	let key = (user_id, version, room_id, session_id);
 	self.db
 		.backupkeyid_backup
-		.keys_raw_prefix(&key)
+		.keys_prefix_raw(&key)
 		.ignore_err()
 		.ready_for_each(|outdated_key| self.db.backupkeyid_backup.remove(outdated_key))
 		.await;
diff --git a/src/service/rooms/alias/mod.rs b/src/service/rooms/alias/mod.rs
index 7fac6be6..3f944729 100644
--- a/src/service/rooms/alias/mod.rs
+++ b/src/service/rooms/alias/mod.rs
@@ -101,7 +101,7 @@ impl Service {
 		let prefix = (&room_id, Interfix);
 		self.db
 			.aliasid_alias
-			.keys_raw_prefix(&prefix)
+			.keys_prefix_raw(&prefix)
 			.ignore_err()
 			.ready_for_each(|key| self.db.aliasid_alias.remove(key))
 			.await;
diff --git a/src/service/rooms/lazy_loading/mod.rs b/src/service/rooms/lazy_loading/mod.rs
index e0816d3f..9493dcc4 100644
--- a/src/service/rooms/lazy_loading/mod.rs
+++ b/src/service/rooms/lazy_loading/mod.rs
@@ -99,7 +99,7 @@ pub async fn lazy_load_reset(&self, user_id: &UserId, device_id: &DeviceId, room
 	let prefix = (user_id, device_id, room_id, Interfix);
 	self.db
 		.lazyloadedids
-		.keys_raw_prefix(&prefix)
+		.keys_prefix_raw(&prefix)
 		.ignore_err()
 		.ready_for_each(|key| self.db.lazyloadedids.remove(key))
 		.await;
diff --git a/src/service/rooms/metadata/mod.rs b/src/service/rooms/metadata/mod.rs
index d8be6aab..8367eb72 100644
--- a/src/service/rooms/metadata/mod.rs
+++ b/src/service/rooms/metadata/mod.rs
@@ -50,7 +50,7 @@ pub async fn exists(&self, room_id: &RoomId) -> bool {
 	// Look for PDUs in that room.
 	self.db
 		.pduid_pdu
-		.keys_raw_prefix(&prefix)
+		.keys_prefix_raw(&prefix)
 		.ignore_err()
 		.next()
 		.await
diff --git a/src/service/rooms/read_receipt/data.rs b/src/service/rooms/read_receipt/data.rs
index a2c0fabc..74b649ef 100644
--- a/src/service/rooms/read_receipt/data.rs
+++ b/src/service/rooms/read_receipt/data.rs
@@ -84,7 +84,7 @@ impl Data {
 		let prefix2 = prefix.clone();
 
 		self.readreceiptid_readreceipt
-			.stream_raw_from(&first_possible_edu)
+			.stream_from_raw(&first_possible_edu)
 			.ignore_err()
 			.ready_take_while(move |(k, _)| k.starts_with(&prefix2))
 			.map(move |(k, v)| {
diff --git a/src/service/rooms/state/data.rs b/src/service/rooms/state/data.rs
index 3072e3c6..7265038f 100644
--- a/src/service/rooms/state/data.rs
+++ b/src/service/rooms/state/data.rs
@@ -52,7 +52,7 @@ impl Data {
 	) {
 		let prefix = (room_id, Interfix);
 		self.roomid_pduleaves
-			.keys_raw_prefix(&prefix)
+			.keys_prefix_raw(&prefix)
 			.ignore_err()
 			.ready_for_each(|key| self.roomid_pduleaves.remove(key))
 			.await;
diff --git a/src/service/rooms/state_cache/mod.rs b/src/service/rooms/state_cache/mod.rs
index 8539c940..edfae529 100644
--- a/src/service/rooms/state_cache/mod.rs
+++ b/src/service/rooms/state_cache/mod.rs
@@ -408,7 +408,7 @@ impl Service {
 	pub fn rooms_joined<'a>(&'a self, user_id: &'a UserId) -> impl Stream<Item = &RoomId> + Send + 'a {
 		self.db
 			.userroomid_joined
-			.keys_prefix_raw(user_id)
+			.keys_raw_prefix(user_id)
 			.ignore_err()
 			.map(|(_, room_id): (Ignore, &RoomId)| room_id)
 	}
@@ -469,7 +469,7 @@ impl Service {
 
 		self.db
 			.roomid_inviteviaservers
-			.stream_prefix_raw(room_id)
+			.stream_raw_prefix(room_id)
 			.ignore_err()
 			.map(|(_, servers): KeyVal<'_>| *servers.last().expect("at least one server"))
 	}
diff --git a/src/service/sending/data.rs b/src/service/sending/data.rs
index 6f4b5b97..96d4a6a9 100644
--- a/src/service/sending/data.rs
+++ b/src/service/sending/data.rs
@@ -101,7 +101,7 @@ impl Data {
 	pub fn active_requests_for(&self, destination: &Destination) -> impl Stream<Item = SendingItem> + Send + '_ {
 		let prefix = destination.get_prefix();
 		self.servercurrentevent_data
-			.stream_raw_prefix(&prefix)
+			.stream_prefix_raw(&prefix)
 			.ignore_err()
 			.map(|(key, val)| {
 				let (_, event) = parse_servercurrentevent(key, val).expect("invalid servercurrentevent");
@@ -136,7 +136,7 @@ impl Data {
 	pub fn queued_requests(&self, destination: &Destination) -> impl Stream<Item = QueueItem> + Send + '_ {
 		let prefix = destination.get_prefix();
 		self.servernameevent_data
-			.stream_raw_prefix(&prefix)
+			.stream_prefix_raw(&prefix)
 			.ignore_err()
 			.map(|(key, val)| {
 				let (_, event) = parse_servercurrentevent(key, val).expect("invalid servercurrentevent");
diff --git a/src/service/users/mod.rs b/src/service/users/mod.rs
index 71a93666..a99a7df4 100644
--- a/src/service/users/mod.rs
+++ b/src/service/users/mod.rs
@@ -311,7 +311,7 @@ impl Service {
 		let prefix = (user_id, device_id, Interfix);
 		self.db
 			.todeviceid_events
-			.keys_raw_prefix(&prefix)
+			.keys_prefix_raw(&prefix)
 			.ignore_err()
 			.ready_for_each(|key| self.db.todeviceid_events.remove(key))
 			.await;