diff --git a/src/event/server_events.c b/src/event/server_events.c
index 5b99bdc1..e6f749be 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -162,7 +162,7 @@ void
 sv_ev_room_message(const char *const room_jid, const char *const nick,
     const char *const message)
 {
-    ui_room_message(room_jid, nick, message);
+    mucwin_message(room_jid, nick, message);
 
     if (prefs_get_boolean(PREF_GRLOG)) {
         Jid *jid = jid_create(jabber_get_fulljid());
diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c
index 51d7e922..62f8f48f 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -362,7 +362,7 @@ mucwin_history(const char *const roomjid, const char *const nick,
 }
 
 void
-ui_room_message(const char *const roomjid, const char *const nick,
+mucwin_message(const char *const roomjid, const char *const nick,
     const char *const message)
 {
     ProfMucWin *mucwin = wins_get_muc(roomjid);
diff --git a/src/ui/ui.h b/src/ui/ui.h
index c870ea8b..b00df993 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -107,7 +107,7 @@ void mucwin_occupant_role_and_affiliation_change(const char *const roomjid, cons
 void mucwin_roster(const char *const roomjid, GList *occupants, const char *const presence);
 void mucwin_history(const char *const roomjid, const char *const nick, GDateTime *timestamp,
     const char *const message);
-void ui_room_message(const char *const roomjid, const char *const nick, const char *const message);
+void mucwin_message(const char *const roomjid, const char *const nick, const char *const message);
 void ui_room_subject(const char *const roomjid, const char *const nick, const char *const subject);
 void ui_room_requires_config(const char *const roomjid);
 void ui_room_destroy(const char *const roomjid);
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index 7ba6028a..56b74780 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -206,7 +206,7 @@ void mucwin_occupant_role_and_affiliation_change(const char * const roomjid, con
 void mucwin_roster(const char * const roomjid, GList *occupants, const char * const presence) {}
 void mucwin_history(const char * const roomjid, const char * const nick,
     GDateTime *timestamp, const char * const message) {}
-void ui_room_message(const char * const roomjid, const char * const nick,
+void mucwin_message(const char * const roomjid, const char * const nick,
     const char * const message) {}
 void ui_room_subject(const char * const roomjid, const char * const nick, const char * const subject) {}
 void ui_room_requires_config(const char * const roomjid) {}