diff --git a/src/twc-profile.c b/src/twc-profile.c
index a718c33..0164bf5 100644
--- a/src/twc-profile.c
+++ b/src/twc-profile.c
@@ -446,9 +446,12 @@ twc_profile_load(struct t_twc_profile *profile)
     tox_callback_friend_request(profile->tox, twc_friend_request_callback);
     tox_callback_conference_invite(profile->tox, twc_group_invite_callback);
     tox_callback_conference_message(profile->tox, twc_group_message_callback);
-    tox_callback_conference_namelist_change(profile->tox,
-                                            twc_group_namelist_change_callback);
+    tox_callback_conference_peer_list_changed(profile->tox,
+                                              twc_group_peer_list_changed_callback);
+    tox_callback_conference_peer_name(profile->tox,
+                                      twc_group_peer_name_callback);
     tox_callback_conference_title(profile->tox, twc_group_title_callback);
+
     return TWC_RC_OK;
 }
 
diff --git a/src/twc-tox-callbacks.c b/src/twc-tox-callbacks.c
index 34f7bae..e9cba74 100644
--- a/src/twc-tox-callbacks.c
+++ b/src/twc-tox-callbacks.c
@@ -400,10 +400,8 @@ twc_group_message_callback(Tox *tox, uint32_t group_number,
 }
 
 void
-twc_group_namelist_change_callback(Tox *tox, uint32_t group_number,
-                                   uint32_t peer_number,
-                                   TOX_CONFERENCE_STATE_CHANGE change_type,
-                                   void *data)
+twc_group_peer_list_changed_callback(Tox *tox, uint32_t group_number,
+                                     void *data)
 {
     struct t_twc_profile *profile = data;
     struct t_twc_chat *chat =
@@ -424,7 +422,7 @@ twc_group_namelist_change_callback(Tox *tox, uint32_t group_number,
         for (i = 0; i < npeers; i++)
         {
             char *name = twc_get_peer_name_nt(profile->tox, group_number, i);
-            weechat_list_add(new_nicks, name, WEECHAT_LIST_POS_SORT, NULL);
+            weechat_list_add(new_nicks, name, WEECHAT_LIST_POS_END, NULL);
             free(name);
         }
     }
@@ -469,6 +467,51 @@ twc_group_namelist_change_callback(Tox *tox, uint32_t group_number,
     chat->nicks = new_nicks;
 }
 
+void
+twc_group_peer_name_callback(Tox *tox, uint32_t group_number,
+                                       uint32_t peer_number,
+                                       const uint8_t *pname,
+                                       size_t pname_len,
+                                       void *data)
+{
+    struct t_twc_profile *profile = data;
+    struct t_twc_chat *chat =
+        twc_chat_search_group(profile, group_number, true);
+
+    struct t_gui_nick *nick = NULL;
+    const char *prev_name;
+    char *name;
+
+    struct t_weelist_item *n;
+
+    n = weechat_list_get(chat->nicks, peer_number);
+    if (!n)
+    {
+        // We missed some events, fallback to full list update
+        twc_group_peer_list_changed_callback(tox, group_number, data);
+        return;
+    }
+
+    prev_name = weechat_list_string(n);
+    name = twc_null_terminate(pname, pname_len);
+
+    nick = weechat_nicklist_search_nick(chat->buffer,
+                                        chat->nicklist_group, prev_name);
+
+    weechat_nicklist_remove_nick(chat->buffer, nick);
+
+    weechat_printf(chat->buffer, "%s%s is now known as %s",
+                   weechat_prefix("network"), prev_name, name);
+
+    weechat_list_set(n, name);
+
+    weechat_nicklist_add_nick(chat->buffer, chat->nicklist_group, name,
+                              NULL, NULL, NULL, 1);
+
+    free(name);
+}
+
+
 void
 twc_group_title_callback(Tox *tox, uint32_t group_number, uint32_t peer_number,
                          const uint8_t *title, size_t length, void *data)
diff --git a/src/twc-tox-callbacks.h b/src/twc-tox-callbacks.h
index 740db92..640299c 100644
--- a/src/twc-tox-callbacks.h
+++ b/src/twc-tox-callbacks.h
@@ -61,10 +61,16 @@ twc_group_message_callback(Tox *tox, uint32_t group_number,
                            const uint8_t *message, size_t length, void *data);
 
 void
-twc_group_namelist_change_callback(Tox *tox, uint32_t group_number,
-                                   uint32_t peer_number,
-                                   TOX_CONFERENCE_STATE_CHANGE change_type,
-                                   void *data);
+twc_group_peer_list_changed_callback(Tox *tox, uint32_t group_number,
+                                     void *data);
+
+void
+twc_group_peer_name_callback(Tox *tox, uint32_t group_number,
+                             uint32_t peer_number,
+                             const uint8_t *nick,
+                             size_t nick_len,
+                             void *data);
+
 
 void
 twc_group_title_callback(Tox *tox, uint32_t group_number, uint32_t peer_number,