diff --git a/modules/Makefile.am b/modules/Makefile.am
index da045ba34..376afa0b8 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -63,13 +63,11 @@ s_moduledir = @moduledir@
 s_conf_la_SOURCES = s_conf.cc
 s_control_la_SOURCES = s_control.cc
 s_node_la_SOURCES = s_node.cc
-s_state_la_SOURCES = s_state.cc
 
 s_module_LTLIBRARIES = \
 	s_conf.la \
 	s_control.la \
 	s_node.la \
-	s_state.la \
 	###
 
 ###############################################################################
@@ -83,6 +81,7 @@ m_noop_la_SOURCES = m_noop.cc
 m_typing_la_SOURCES = m_typing.cc
 m_receipt_la_SOURCES = m_receipt.cc
 m_presence_la_SOURCES = m_presence.cc
+m_room_la_SOURCES = m_room.cc
 m_room_create_la_SOURCES = m_room_create.cc
 m_room_member_la_SOURCES = m_room_member.cc
 m_room_join_rules_la_SOURCES = m_room_join_rules.cc
@@ -92,6 +91,7 @@ m_module_LTLIBRARIES = \
 	m_typing.la \
 	m_receipt.la \
 	m_presence.la \
+	m_room.la \
 	m_room_create.la \
 	m_room_member.la \
 	m_room_join_rules.la \
diff --git a/modules/console.cc b/modules/console.cc
index 9047c2d72..1a41cb4dc 100644
--- a/modules/console.cc
+++ b/modules/console.cc
@@ -3183,7 +3183,7 @@ console_cmd__room__state__rebuild__present(opt &out, const string_view &line)
 	using prototype = size_t (const m::room &);
 	static m::import<prototype> state__rebuild_present
 	{
-		"s_state", "state__rebuild_present"
+		"m_room", "state__rebuild_present"
 	};
 
 	const size_t count
@@ -3216,7 +3216,7 @@ console_cmd__room__state__rebuild__history(opt &out, const string_view &line)
 	using prototype = size_t (const m::room &);
 	static m::import<prototype> state__rebuild_history
 	{
-		"s_state", "state__rebuild_history"
+		"m_room", "state__rebuild_history"
 	};
 
 	const size_t count
diff --git a/modules/s_state.cc b/modules/m_room.cc
similarity index 100%
rename from modules/s_state.cc
rename to modules/m_room.cc