diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c
index a70436e7..68e34e63 100644
--- a/src/xmpp/roster.c
+++ b/src/xmpp/roster.c
@@ -47,9 +47,9 @@ typedef struct _group_data {
 } GroupData;
 
 // event handlers
-static int _roster_handle_push(xmpp_conn_t * const conn,
+static int _roster_set_handler(xmpp_conn_t * const conn,
     xmpp_stanza_t * const stanza, void * const userdata);
-static int _roster_handle_result(xmpp_conn_t * const conn,
+static int _roster_result_handler(xmpp_conn_t * const conn,
     xmpp_stanza_t * const stanza, void * const userdata);
 
 // id handlers
@@ -68,8 +68,8 @@ roster_add_handlers(void)
 {
     xmpp_conn_t * const conn = connection_get_conn();
     xmpp_ctx_t * const ctx = connection_get_ctx();
-    HANDLE(STANZA_TYPE_SET,    _roster_handle_push);
-    HANDLE(STANZA_TYPE_RESULT, _roster_handle_result);
+    HANDLE(STANZA_TYPE_SET,    _roster_set_handler);
+    HANDLE(STANZA_TYPE_RESULT, _roster_result_handler);
 }
 
 void
@@ -206,7 +206,7 @@ _group_remove_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
 }
 
 static int
-_roster_handle_push(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
+_roster_set_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
     void * const userdata)
 {
     xmpp_stanza_t *query =
@@ -270,7 +270,7 @@ _roster_handle_push(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
 }
 
 static int
-_roster_handle_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
+_roster_result_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
     void * const userdata)
 {
     const char *id = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_ID);