diff --git a/roomserver/internal/api.go b/roomserver/internal/api.go
index 3ec9298cc..d59b8be7a 100644
--- a/roomserver/internal/api.go
+++ b/roomserver/internal/api.go
@@ -51,7 +51,7 @@ type RoomserverInternalAPI struct {
 	JetStream              nats.JetStreamContext
 	Durable                string
 	InputRoomEventTopic    string // JetStream topic for new input room events
-	OutputProducer         *producers.RoomEvent
+	OutputProducer         *producers.RoomEventProducer
 	PerspectiveServerNames []gomatrixserverlib.ServerName
 }
 
@@ -61,7 +61,7 @@ func NewRoomserverAPI(
 	caches caching.RoomServerCaches, perspectiveServerNames []gomatrixserverlib.ServerName,
 ) *RoomserverInternalAPI {
 	serverACLs := acls.NewServerACLs(roomserverDB)
-	producer := &producers.RoomEvent{
+	producer := &producers.RoomEventProducer{
 		Topic:     string(cfg.Matrix.JetStream.Prefixed(jetstream.OutputRoomEvent)),
 		JetStream: js,
 		ACLs:      serverACLs,
diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go
index d3cbcffb2..fa07c1d2b 100644
--- a/roomserver/internal/input/input.go
+++ b/roomserver/internal/input/input.go
@@ -79,7 +79,7 @@ type Inputer struct {
 	KeyRing             gomatrixserverlib.JSONVerifier
 	ACLs                *acls.ServerACLs
 	InputRoomEventTopic string
-	OutputProducer      *producers.RoomEvent
+	OutputProducer      *producers.RoomEventProducer
 	workers             sync.Map // room ID -> *worker
 
 	Queryer *query.Queryer
diff --git a/roomserver/producers/roomevent.go b/roomserver/producers/roomevent.go
index a7288db16..987e6c942 100644
--- a/roomserver/producers/roomevent.go
+++ b/roomserver/producers/roomevent.go
@@ -31,13 +31,13 @@ var keyContentFields = map[string]string{
 	"m.room.member":             "membership",
 }
 
-type RoomEvent struct {
+type RoomEventProducer struct {
 	Topic     string
 	ACLs      *acls.ServerACLs
 	JetStream nats.JetStreamContext
 }
 
-func (r *RoomEvent) ProduceRoomEvents(roomID string, updates []api.OutputEvent) error {
+func (r *RoomEventProducer) ProduceRoomEvents(roomID string, updates []api.OutputEvent) error {
 	var err error
 	for _, update := range updates {
 		msg := &nats.Msg{