diff --git a/roomserver/internal/authevents.go b/roomserver/internal/input_authevents.go
similarity index 100%
rename from roomserver/internal/authevents.go
rename to roomserver/internal/input_authevents.go
diff --git a/roomserver/internal/authevents_test.go b/roomserver/internal/input_authevents_test.go
similarity index 100%
rename from roomserver/internal/authevents_test.go
rename to roomserver/internal/input_authevents_test.go
diff --git a/roomserver/internal/events.go b/roomserver/internal/input_events.go
similarity index 100%
rename from roomserver/internal/events.go
rename to roomserver/internal/input_events.go
diff --git a/roomserver/internal/latest_events.go b/roomserver/internal/input_latest_events.go
similarity index 100%
rename from roomserver/internal/latest_events.go
rename to roomserver/internal/input_latest_events.go
diff --git a/roomserver/internal/membership.go b/roomserver/internal/input_membership.go
similarity index 100%
rename from roomserver/internal/membership.go
rename to roomserver/internal/input_membership.go
diff --git a/roomserver/internal/backfill.go b/roomserver/internal/query_backfill.go
similarity index 100%
rename from roomserver/internal/backfill.go
rename to roomserver/internal/query_backfill.go