diff --git a/src/command/command.c b/src/command/command.c
index cdcf8264..84b7999a 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -2001,7 +2001,7 @@ _cmd_roster(gchar **args, struct cmd_help_t help)
         return TRUE;
     } else {
         char *jid = args[1];
-        char *handle = args[2];
+        char *name = args[2];
         jabber_conn_status_t conn_status = jabber_get_connection_status();
 
         if (conn_status != JABBER_CONNECTED) {
@@ -2016,12 +2016,12 @@ _cmd_roster(gchar **args, struct cmd_help_t help)
             return TRUE;
         }
 
-        roster_change_handle(jid, handle);
+        roster_change_name(jid, name);
 
-        if (handle == NULL) {
+        if (name == NULL) {
             cons_show("Nickname for %s removed.", jid);
         } else {
-            cons_show("Nickname for %s set to: %s.", jid, handle);
+            cons_show("Nickname for %s set to: %s.", jid, name);
         }
         return TRUE;
     }
diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c
index 85d7a2db..5df8fd4c 100644
--- a/src/xmpp/roster.c
+++ b/src/xmpp/roster.c
@@ -271,43 +271,43 @@ roster_contact_offline(const char * const barejid,
 }
 
 void
-roster_change_handle(const char * const barejid, const char * const new_handle)
+roster_change_name(const char * const barejid, const char * const new_name)
 {
     PContact contact = g_hash_table_lookup(contacts, barejid);
-    const char * current_handle = NULL;
+    const char * current_name = NULL;
     if (p_contact_name(contact) != NULL) {
-        current_handle = strdup(p_contact_name(contact));
+        current_name = strdup(p_contact_name(contact));
     }
 
     if (contact != NULL) {
-        p_contact_set_name(contact, new_handle);
+        p_contact_set_name(contact, new_name);
 
-        // current handle exists already
-        if (current_handle != NULL) {
-            autocomplete_remove(name_ac, current_handle);
-            g_hash_table_remove(name_to_barejid, current_handle);
+        // current name exists already
+        if (current_name != NULL) {
+            autocomplete_remove(name_ac, current_name);
+            g_hash_table_remove(name_to_barejid, current_name);
 
-            if (new_handle != NULL) {
-                autocomplete_add(name_ac, strdup(new_handle));
-                g_hash_table_insert(name_to_barejid, strdup(new_handle), strdup(barejid));
+            if (new_name != NULL) {
+                autocomplete_add(name_ac, strdup(new_name));
+                g_hash_table_insert(name_to_barejid, strdup(new_name), strdup(barejid));
             } else {
                 autocomplete_add(name_ac, strdup(barejid));
                 g_hash_table_insert(name_to_barejid, strdup(barejid), strdup(barejid));
             }
-        // no current handle
+        // no current name
         } else {
-            if (new_handle != NULL) {
+            if (new_name != NULL) {
                 autocomplete_remove(name_ac, barejid);
                 g_hash_table_remove(name_to_barejid, barejid);
 
-                autocomplete_add(name_ac, strdup(new_handle));
-                g_hash_table_insert(name_to_barejid, strdup(new_handle), strdup(barejid));
+                autocomplete_add(name_ac, strdup(new_name));
+                g_hash_table_insert(name_to_barejid, strdup(new_name), strdup(barejid));
             }
         }
 
         xmpp_conn_t * const conn = connection_get_conn();
         xmpp_ctx_t * const ctx = connection_get_ctx();
-        xmpp_stanza_t *iq = stanza_create_roster_set(ctx, barejid, new_handle);
+        xmpp_stanza_t *iq = stanza_create_roster_set(ctx, barejid, new_name);
         xmpp_send(conn, iq);
         xmpp_stanza_release(iq);
     }
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index 7a05df0f..ae0328b1 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -141,7 +141,7 @@ char * roster_find_resource(char *search_str);
 gboolean roster_add(const char * const barejid, const char * const name,
     const char * const subscription, const char * const offline_message,
     gboolean pending_out);
-void roster_change_handle(const char * const barejid, const char * const handle);
+void roster_change_name(const char * const barejid, const char * const new_name);
 char * roster_barejid_from_name(const char * const name);
 
 #endif