diff --git a/src/jabber.c b/src/jabber.c
index d93feb94..19a5d462 100644
--- a/src/jabber.c
+++ b/src/jabber.c
@@ -346,7 +346,7 @@ _groupchat_message_handler(xmpp_stanza_t * const stanza)
     if (subject != NULL) {
         message = xmpp_stanza_get_text(subject);
         if (message != NULL) {
-            room = room_get_room_for_full_jid(room_jid);
+            room = room_get_room_from_full_jid(room_jid);
             prof_handle_room_subject(room, message);
         }
 
diff --git a/src/room_chat.c b/src/room_chat.c
index 61d92174..677aded1 100644
--- a/src/room_chat.c
+++ b/src/room_chat.c
@@ -98,7 +98,7 @@ room_get_nick_for_room(const char * const room)
 }
 
 char *
-room_get_room_for_full_jid(const char * const full_room_jid)
+room_get_room_from_full_jid(const char * const full_room_jid)
 {
     char **tokens = g_strsplit(full_room_jid, "/", 0);
     char *room_part;
diff --git a/src/room_chat.h b/src/room_chat.h
index e6006ff2..7c4baf9a 100644
--- a/src/room_chat.h
+++ b/src/room_chat.h
@@ -29,7 +29,7 @@ void room_join(const char * const room, const char * const nick);
 void room_leave(const char * const room);
 gboolean room_is_active(const char * const full_room_jid);
 char * room_get_nick_for_room(const char * const room);
-char * room_get_room_for_full_jid(const char * const full_room_jid);
+char * room_get_room_from_full_jid(const char * const full_room_jid);
 gboolean room_parse_room_jid(const char * const full_room_jid, char **room,
     char **nick);
 void room_add_to_roster(const char * const room, const char * const nick);