3 files changed, 9 insertions, 9 deletions
diff --git a/src/ui/console.c b/src/ui/console.c
index 47ae9843..631c9ec2 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -266,7 +266,7 @@ cons_show_wins(void)
                 {
                     case WIN_CHAT:
                         wprintw(console->win, "%d: Chat %s", i + 1, window->from);
-                        PContact contact = contact_list_get_contact(window->from);
+                        PContact contact = roster_get_contact(window->from);
 
                         if (contact != NULL) {
                             if (p_contact_name(contact) != NULL) {
@@ -588,8 +588,8 @@ cons_show_received_subs(void)
 void
 cons_show_sent_subs(void)
 {
-   if (contact_list_has_pending_subscriptions()) {
-        GSList *contacts = get_contact_list();
+   if (roster_has_pending_subscriptions()) {
+        GSList *contacts = roster_get_contacts();
         PContact contact = NULL;
         cons_show("Awaiting subscription responses from:");
         while (contacts != NULL) {
@@ -697,7 +697,7 @@ cons_show_disco_items(GSList *items, const char * const jid)
 void
 cons_show_status(const char * const contact)
 {
-    PContact pcontact = contact_list_get_contact(contact);
+    PContact pcontact = roster_get_contact(contact);
 
     if (pcontact != NULL) {
         win_show_contact(console, pcontact);
diff --git a/src/ui/core.c b/src/ui/core.c
index 2d16e46e..b1057b92 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -378,7 +378,7 @@ ui_incoming_msg(const char * const from, const char * const message,
             } else {
                 // if show users status first, when receiving message via delayed delivery
                 if (win_created) {
-                    PContact pcontact = contact_list_get_contact(from);
+                    PContact pcontact = roster_get_contact(from);
                     win_show_contact(window, pcontact);
                 }
                 GDateTime *time = g_date_time_new_from_timeval_utc(tv_stamp);
@@ -688,7 +688,7 @@ void
 ui_new_chat_win(const char * const to)
 {
     // if the contact is offline, show a message
-    PContact contact = contact_list_get_contact(to);
+    PContact contact = roster_get_contact(to);
     int win_index = _find_prof_win_index(to);
     ProfWin *window = NULL;
 
@@ -798,7 +798,7 @@ ui_outgoing_msg(const char * const from, const char * const to,
     const char * const message)
 {
     // if the contact is offline, show a message
-    PContact contact = contact_list_get_contact(to);
+    PContact contact = roster_get_contact(to);
     int win_index = _find_prof_win_index(to);
     ProfWin *window = NULL;
 
@@ -1126,7 +1126,7 @@ void
 ui_status(void)
 {
     char *recipient = ui_current_recipient();
-    PContact pcontact = contact_list_get_contact(recipient);
+    PContact pcontact = roster_get_contact(recipient);
 
     if (pcontact != NULL) {
         win_show_contact(current, pcontact);
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index dfac289f..60768a83 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -372,7 +372,7 @@ _handle_edit(int result, const wint_t ch, char *input, int *size)
 
         case 127:
         case KEY_BACKSPACE:
-            contact_list_reset_search_attempts();
+            roster_reset_search_attempts();
             if (display_size > 0) {
 
                 // if at end, delete last char