diff --git a/src/jabber.c b/src/jabber.c
index a97e695b..01002d14 100644
--- a/src/jabber.c
+++ b/src/jabber.c
@@ -234,7 +234,7 @@ jabber_subscribe(const char * const recipient)
 void
 jabber_join(const char * const room_jid, const char * const nick)
 {
-    xmpp_stanza_t *presence = stanza_create_room_presence(jabber_conn.ctx,
+    xmpp_stanza_t *presence = stanza_create_room_join_presence(jabber_conn.ctx,
         room_jid, nick);
     xmpp_send(jabber_conn.conn, presence);
     xmpp_stanza_release(presence);
@@ -247,7 +247,7 @@ jabber_leave_chat_room(const char * const room_jid)
 {
     char *nick = room_get_nick_for_room(room_jid);
 
-    xmpp_stanza_t *presence = stanza_create_room_leave(jabber_conn.ctx,
+    xmpp_stanza_t *presence = stanza_create_room_leave_presence(jabber_conn.ctx,
         room_jid, nick);
     xmpp_send(jabber_conn.conn, presence);
     xmpp_stanza_release(presence);
diff --git a/src/stanza.c b/src/stanza.c
index 23b54992..75c758c5 100644
--- a/src/stanza.c
+++ b/src/stanza.c
@@ -81,7 +81,7 @@ stanza_create_message(xmpp_ctx_t *ctx, const char * const recipient,
 }
 
 xmpp_stanza_t *
-stanza_create_room_presence(xmpp_ctx_t *ctx, const char * const room,
+stanza_create_room_join_presence(xmpp_ctx_t *ctx, const char * const room,
     const char * const nick)
 {
     GString *to = g_string_new(room);
@@ -102,7 +102,7 @@ stanza_create_room_presence(xmpp_ctx_t *ctx, const char * const room,
 }
 
 xmpp_stanza_t *
-stanza_create_room_leave(xmpp_ctx_t *ctx, const char * const room,
+stanza_create_room_leave_presence(xmpp_ctx_t *ctx, const char * const room,
     const char * const nick)
 {
     GString *full_jid = g_string_new(room);
diff --git a/src/stanza.h b/src/stanza.h
index 18332364..b279b52a 100644
--- a/src/stanza.h
+++ b/src/stanza.h
@@ -75,14 +75,13 @@ xmpp_stanza_t* stanza_create_message(xmpp_ctx_t *ctx,
     const char * const recipient, const char * const type,
     const char * const message, const char * const state);
 
-xmpp_stanza_t* stanza_create_room_presence(xmpp_ctx_t *ctx,
+xmpp_stanza_t* stanza_create_room_join_presence(xmpp_ctx_t *ctx,
     const char * const room, const char * const nick);
 
-xmpp_stanza_t* stanza_create_room_leave(xmpp_ctx_t *ctx,
+xmpp_stanza_t* stanza_create_room_leave_presence(xmpp_ctx_t *ctx,
     const char * const room, const char * const nick);
 
-xmpp_stanza_t *
-stanza_create_presence(xmpp_ctx_t *ctx, const char * const show,
+xmpp_stanza_t * stanza_create_presence(xmpp_ctx_t *ctx, const char * const show,
     const char * const status);
 
 #endif