Renamed PurpleBListNode back to PurpleBlistNode

76 files changed, 810 insertions, 810 deletions

diff --git a/finch/gntblist.c b/finch/gntblist.c
index 58c1b15ec3..8d68a55f0c 100644
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -72,11 +72,11 @@ typedef struct
 	GntWidget *tree;
 
 	GntWidget *tooltip;
-	PurpleBListNode *tnode;  /* Who is the tooltip being displayed for? */
+	PurpleBlistNode *tnode;  /* Who is the tooltip being displayed for? */
 	GList *tagged;           /* A list of tagged blistnodes             */
 
 	GntWidget *context;
-	PurpleBListNode *cnode;
+	PurpleBlistNode *cnode;
 
 	/* XXX: I am KISSing */
 	GntWidget *status;      /* Dropdown with the statuses  */
@@ -96,14 +96,14 @@ typedef struct
 	GList *new_group;
 	guint new_group_timeout;
 
-	FinchBListManager *manager;
-} FinchBList;
+	FinchBlistManager *manager;
+} FinchBlist;
 
 typedef struct
 {
 	gpointer row;        /* the row in the GntTree             */
 	guint signed_timer;  /* used when 'recently' signed on/off */
-} FinchBListNode;
+} FinchBlistNode;
 
 typedef enum
 {
@@ -123,36 +123,36 @@ typedef struct
 	} u;
 } StatusBoxItem;
 
-static FinchBList *ggblist;
+static FinchBlist *ggblist;
 
-static void add_buddy(PurpleBuddy *buddy, FinchBList *ggblist);
-static void add_contact(PurpleContact *contact, FinchBList *ggblist);
-static void add_group(PurpleGroup *group, FinchBList *ggblist);
-static void add_chat(PurpleChat *chat, FinchBList *ggblist);
-static void add_node(PurpleBListNode *node, FinchBList *ggblist);
-static void node_update(PurpleBuddyList *list, PurpleBListNode *node);
+static void add_buddy(PurpleBuddy *buddy, FinchBlist *ggblist);
+static void add_contact(PurpleContact *contact, FinchBlist *ggblist);
+static void add_group(PurpleGroup *group, FinchBlist *ggblist);
+static void add_chat(PurpleChat *chat, FinchBlist *ggblist);
+static void add_node(PurpleBlistNode *node, FinchBlist *ggblist);
+static void node_update(PurpleBuddyList *list, PurpleBlistNode *node);
 #if 0
 static gboolean is_contact_online(PurpleContact *contact);
 static gboolean is_group_online(PurpleGroup *group);
 #endif
-static void draw_tooltip(FinchBList *ggblist);
+static void draw_tooltip(FinchBlist *ggblist);
 static void tooltip_for_buddy(PurpleBuddy *buddy, GString *str, gboolean full);
 static gboolean remove_typing_cb(gpointer null);
-static void remove_peripherals(FinchBList *ggblist);
-static const char * get_display_name(PurpleBListNode *node);
+static void remove_peripherals(FinchBlist *ggblist);
+static const char * get_display_name(PurpleBlistNode *node);
 static void savedstatus_changed(PurpleSavedStatus *now, PurpleSavedStatus *old);
 static void blist_show(PurpleBuddyList *list);
-static void update_node_display(PurpleBListNode *buddy, FinchBList *ggblist);
-static void update_buddy_display(PurpleBuddy *buddy, FinchBList *ggblist);
+static void update_node_display(PurpleBlistNode *buddy, FinchBlist *ggblist);
+static void update_buddy_display(PurpleBuddy *buddy, FinchBlist *ggblist);
 static gboolean account_autojoin_cb(PurpleConnection *pc, gpointer null);
 static void finch_request_add_buddy(PurpleAccount *account, const char *username, const char *grp, const char *alias);
 static void menu_group_set_cb(GntMenuItem *item, gpointer null);
 
 /* Sort functions */
-static int blist_node_compare_position(PurpleBListNode *n1, PurpleBListNode *n2);
-static int blist_node_compare_text(PurpleBListNode *n1, PurpleBListNode *n2);
-static int blist_node_compare_status(PurpleBListNode *n1, PurpleBListNode *n2);
-static int blist_node_compare_log(PurpleBListNode *n1, PurpleBListNode *n2);
+static int blist_node_compare_position(PurpleBlistNode *n1, PurpleBlistNode *n2);
+static int blist_node_compare_text(PurpleBlistNode *n1, PurpleBlistNode *n2);
+static int blist_node_compare_status(PurpleBlistNode *n1, PurpleBlistNode *n2);
+static int blist_node_compare_log(PurpleBlistNode *n1, PurpleBlistNode *n2);
 
 static int color_available;
 static int color_away;
@@ -163,13 +163,13 @@ static int color_idle;
  * Buddy List Manager functions.
  */
 
-static gboolean default_can_add_node(PurpleBListNode *node)
+static gboolean default_can_add_node(PurpleBlistNode *node)
 {
 	gboolean offline = purple_prefs_get_bool(PREF_ROOT "/showoffline");
 
 	if (PURPLE_IS_BUDDY(node)) {
 		PurpleBuddy *buddy = (PurpleBuddy*)node;
-		FinchBListNode *fnode = purple_blist_node_get_ui_data(node);
+		FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
 		if (!purple_buddy_get_contact(buddy))
 			return FALSE; /* When a new buddy is added and show-offline is set */
 		if (PURPLE_BUDDY_IS_ONLINE(buddy))
@@ -183,7 +183,7 @@ static gboolean default_can_add_node(PurpleBListNode *node)
 		if (purple_blist_node_get_bool(node, "show_offline"))
 			return TRUE;
 	} else if (PURPLE_IS_CONTACT(node)) {
-		PurpleBListNode *nd;
+		PurpleBlistNode *nd;
 		for (nd = purple_blist_node_get_first_child(node);
 				nd; nd = purple_blist_node_get_sibling_next(nd)) {
 			if (default_can_add_node(nd))
@@ -194,7 +194,7 @@ static gboolean default_can_add_node(PurpleBListNode *node)
 		if (purple_account_is_connected(purple_chat_get_account(chat)))
 			return TRUE;  /* Show whenever the account is online */
 	} else if (PURPLE_IS_GROUP(node)) {
-		PurpleBListNode *nd;
+		PurpleBlistNode *nd;
 		gboolean empty = purple_prefs_get_bool(PREF_ROOT "/emptygroups");
 		if (empty)
 			return TRUE;  /* If we want to see empty groups, we can show any group */
@@ -212,7 +212,7 @@ static gboolean default_can_add_node(PurpleBListNode *node)
 	return FALSE;
 }
 
-static gpointer default_find_parent(PurpleBListNode *node)
+static gpointer default_find_parent(PurpleBlistNode *node)
 {
 	gpointer ret = NULL;
 
@@ -228,7 +228,7 @@ static gpointer default_find_parent(PurpleBListNode *node)
 static gboolean default_create_tooltip(gpointer selected_row, GString **body, char **tool_title)
 {
 	GString *str;
-	PurpleBListNode *node = selected_row;
+	PurpleBlistNode *node = selected_row;
 	int lastseen = 0;
 	char *title;
 
@@ -253,7 +253,7 @@ static gboolean default_create_tooltip(gpointer selected_row, GString **body, ch
 				if (value > lastseen)
 					lastseen = value;
 			}
-			if (node == (PurpleBListNode*)pr)
+			if (node == (PurpleBlistNode*)pr)
 				continue;
 			if (!purple_account_is_connected(purple_buddy_get_account(buddy)))
 				continue;
@@ -309,7 +309,7 @@ static gboolean default_create_tooltip(gpointer selected_row, GString **body, ch
 	return TRUE;
 }
 
-static FinchBListManager default_manager =
+static FinchBlistManager default_manager =
 {
 	"default",
 	N_("Default"),
@@ -322,12 +322,12 @@ static FinchBListManager default_manager =
 };
 static GList *managers;
 
-static FinchBListNode *
-create_finch_blist_node(PurpleBListNode *node, gpointer row)
+static FinchBlistNode *
+create_finch_blist_node(PurpleBlistNode *node, gpointer row)
 {
-	FinchBListNode *fnode = purple_blist_node_get_ui_data(node);
+	FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
 	if (!fnode) {
-		fnode = g_new0(FinchBListNode, 1);
+		fnode = g_new0(FinchBlistNode, 1);
 		fnode->signed_timer = 0;
 		purple_blist_node_set_ui_data(node, fnode);
 	}
@@ -336,9 +336,9 @@ create_finch_blist_node(PurpleBListNode *node, gpointer row)
 }
 
 static void
-reset_blist_node_ui_data(PurpleBListNode *node)
+reset_blist_node_ui_data(PurpleBlistNode *node)
 {
-	FinchBListNode *fnode = purple_blist_node_get_ui_data(node);
+	FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
 	if (fnode == NULL)
 		return;
 	if (fnode->signed_timer)
@@ -348,7 +348,7 @@ reset_blist_node_ui_data(PurpleBListNode *node)
 }
 
 static int
-get_display_color(PurpleBListNode  *node)
+get_display_color(PurpleBlistNode  *node)
 {
 	PurpleBuddy *buddy;
 	int color = 0;
@@ -374,10 +374,10 @@ get_display_color(PurpleBListNode  *node)
 }
 
 static GntTextFormatFlags
-get_blist_node_flag(PurpleBListNode *node)
+get_blist_node_flag(PurpleBlistNode *node)
 {
 	GntTextFormatFlags flag = 0;
-	FinchBListNode *fnode = purple_blist_node_get_ui_data(node);
+	FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
 
 	if (ggblist->tagged && g_list_find(ggblist->tagged, node))
 		flag |= GNT_TEXT_FLAG_BOLD;
@@ -400,7 +400,7 @@ get_blist_node_flag(PurpleBListNode *node)
 		if (!gnt_tree_get_expanded(GNT_TREE(ggblist->tree), node)) {
 			for (node = purple_blist_node_get_first_child(node); node;
 					node = purple_blist_node_get_sibling_next(node)) {
-				PurpleBListNode *pnode;
+				PurpleBlistNode *pnode;
 				pnode = purple_contact_get_priority_buddy((PurpleContact*)node);
 				fnode = purple_blist_node_get_ui_data(node);
 				if (fnode && fnode->signed_timer) {
@@ -416,7 +416,7 @@ get_blist_node_flag(PurpleBListNode *node)
 }
 
 static void
-blist_update_row_flags(PurpleBListNode *node)
+blist_update_row_flags(PurpleBlistNode *node)
 {
 	gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), node, get_blist_node_flag(node));
 	gnt_tree_set_row_color(GNT_TREE(ggblist->tree), node, get_display_color(node));
@@ -426,10 +426,10 @@ blist_update_row_flags(PurpleBListNode *node)
 static gboolean
 is_contact_online(PurpleContact *contact)
 {
-	PurpleBListNode *node;
-	for (node = purple_blist_node_get_first_child(((PurpleBListNode*)contact)); node;
+	PurpleBlistNode *node;
+	for (node = purple_blist_node_get_first_child(((PurpleBlistNode*)contact)); node;
 			node = purple_blist_node_get_sibling_next(node)) {
-		FinchBListNode *fnode = purple_blist_node_get_ui_data(node);
+		FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
 		if (PURPLE_BUDDY_IS_ONLINE((PurpleBuddy*)node) ||
 				(fnode && fnode->signed_timer))
 			return TRUE;
@@ -440,8 +440,8 @@ is_contact_online(PurpleContact *contact)
 static gboolean
 is_group_online(PurpleGroup *group)
 {
-	PurpleBListNode *node;
-	for (node = purple_blist_node_get_first_child(((PurpleBListNode*)group)); node;
+	PurpleBlistNode *node;
+	for (node = purple_blist_node_get_first_child(((PurpleBlistNode*)group)); node;
 			node = purple_blist_node_get_sibling_next(node)) {
 		if (PURPLE_IS_CHAT(node) &&
 				purple_account_is_connected(((PurpleChat *)node)->account))
@@ -454,12 +454,12 @@ is_group_online(PurpleGroup *group)
 #endif
 
 static void
-new_node(PurpleBListNode *node)
+new_node(PurpleBlistNode *node)
 {
 }
 
 static void
-add_node(PurpleBListNode *node, FinchBList *ggblist)
+add_node(PurpleBlistNode *node, FinchBlist *ggblist)
 {
 	if (purple_blist_node_get_ui_data(node))
 		return;
@@ -479,13 +479,13 @@ add_node(PurpleBListNode *node, FinchBList *ggblist)
 	draw_tooltip(ggblist);
 }
 
-void finch_blist_manager_add_node(PurpleBListNode *node)
+void finch_blist_manager_add_node(PurpleBlistNode *node)
 {
 	add_node(node, ggblist);
 }
 
 static void
-remove_tooltip(FinchBList *ggblist)
+remove_tooltip(FinchBlist *ggblist)
 {
 	gnt_widget_destroy(ggblist->tooltip);
 	ggblist->tooltip = NULL;
@@ -493,10 +493,10 @@ remove_tooltip(FinchBList *ggblist)
 }
 
 static void
-node_remove(PurpleBuddyList *list, PurpleBListNode *node)
+node_remove(PurpleBuddyList *list, PurpleBlistNode *node)
 {
-	FinchBList *ggblist = FINCH_GET_DATA(list);
-	PurpleBListNode *parent;
+	FinchBlist *ggblist = FINCH_GET_DATA(list);
+	PurpleBlistNode *parent;
 
 	if (ggblist == NULL || purple_blist_node_get_ui_data(node) == NULL)
 		return;
@@ -526,7 +526,7 @@ node_remove(PurpleBuddyList *list, PurpleBListNode *node)
 }
 
 static void
-node_update(PurpleBuddyList *list, PurpleBListNode *node)
+node_update(PurpleBuddyList *list, PurpleBlistNode *node)
 {
 	/* It really looks like this should never happen ... but it does.
            This will at least emit a warning to the log when it
@@ -551,7 +551,7 @@ node_update(PurpleBuddyList *list, PurpleBListNode *node)
 
 	if (PURPLE_IS_BUDDY(node)) {
 		PurpleBuddy *buddy = (PurpleBuddy*)node;
-		add_node((PurpleBListNode*)buddy, FINCH_GET_DATA(list));
+		add_node((PurpleBlistNode*)buddy, FINCH_GET_DATA(list));
 		node_update(list, purple_blist_node_get_parent(node));
 	} else if (PURPLE_IS_CHAT(node)) {
 		add_node(node, FINCH_GET_DATA(list));
@@ -578,7 +578,7 @@ new_list(PurpleBuddyList *list)
 	if (ggblist)
 		return;
 
-	ggblist = g_new0(FinchBList, 1);
+	ggblist = g_new0(FinchBlist, 1);
 	FINCH_SET_DATA(list, ggblist);
 	ggblist->manager = finch_blist_manager_find(purple_prefs_get_string(PREF_ROOT "/grouping"));
 	if (!ggblist->manager)
@@ -608,7 +608,7 @@ remove_new_empty_group(gpointer data)
 
 	ggblist->new_group_timeout = 0;
 	while (ggblist->new_group) {
-		PurpleBListNode *group = ggblist->new_group->data;
+		PurpleBlistNode *group = ggblist->new_group->data;
 		ggblist->new_group = g_list_delete_link(ggblist->new_group, ggblist->new_group);
 		node_update(list, group);
 	}
@@ -754,7 +754,7 @@ add_chat_cb(void *data, PurpleRequestFields *allfields)
 		}
 		purple_blist_add_chat(chat, grp, NULL);
 		purple_chat_set_alias(chat, alias);
-		purple_blist_node_set_bool((PurpleBListNode*)chat, "gnt-autojoin", autojoin);
+		purple_blist_node_set_bool((PurpleBlistNode*)chat, "gnt-autojoin", autojoin);
 		if (autojoin) {
 			join_chat(chat);
 		}
@@ -827,9 +827,9 @@ add_group_cb(gpointer null, const char *group)
 
 	/* Select the group */
 	if (ggblist->tree) {
-		FinchBListNode *fnode = purple_blist_node_get_ui_data((PurpleBListNode*)grp);
+		FinchBlistNode *fnode = purple_blist_node_get_ui_data((PurpleBlistNode*)grp);
 		if (!fnode)
-			add_node((PurpleBListNode*)grp, ggblist);
+			add_node((PurpleBlistNode*)grp, ggblist);
 		gnt_tree_set_selected(GNT_TREE(ggblist->tree), grp);
 	}
 }
@@ -844,7 +844,7 @@ finch_request_add_group(void)
 			NULL);
 }
 
-static PurpleBListUiOps blist_ui_ops =
+static PurpleBlistUiOps blist_ui_ops =
 {
 	new_list,
 	new_node,
@@ -871,13 +871,13 @@ finch_blist_get_handle(void)
 }
 
 static void
-add_group(PurpleGroup *group, FinchBList *ggblist)
+add_group(PurpleGroup *group, FinchBlist *ggblist)
 {
 	gpointer parent;
-	PurpleBListNode *node = (PurpleBListNode *)group;
+	PurpleBlistNode *node = (PurpleBlistNode *)group;
 	if (purple_blist_node_get_ui_data(node))
 		return;
-	parent = ggblist->manager->find_parent((PurpleBListNode*)group);
+	parent = ggblist->manager->find_parent((PurpleBlistNode*)group);
 	create_finch_blist_node(node, gnt_tree_add_row_after(GNT_TREE(ggblist->tree), group,
 			gnt_tree_create_row(GNT_TREE(ggblist->tree), get_display_name(node)),
 			parent, NULL));
@@ -886,7 +886,7 @@ add_group(PurpleGroup *group, FinchBList *ggblist)
 }
 
 static const char *
-get_display_name(PurpleBListNode *node)
+get_display_name(PurpleBlistNode *node)
 {
 	static char text[2096];
 	char status[8] = " ";
@@ -944,16 +944,16 @@ get_display_name(PurpleBListNode *node)
 }
 
 static void
-add_chat(PurpleChat *chat, FinchBList *ggblist)
+add_chat(PurpleChat *chat, FinchBlist *ggblist)
 {
 	gpointer parent;
-	PurpleBListNode *node = (PurpleBListNode *)chat;
+	PurpleBlistNode *node = (PurpleBlistNode *)chat;
 	if (purple_blist_node_get_ui_data(node))
 		return;
 	if (!purple_account_is_connected(purple_chat_get_account(chat)))
 		return;
 
-	parent = ggblist->manager->find_parent((PurpleBListNode*)chat);
+	parent = ggblist->manager->find_parent((PurpleBlistNode*)chat);
 
 	create_finch_blist_node(node, gnt_tree_add_row_after(GNT_TREE(ggblist->tree), chat,
 				gnt_tree_create_row(GNT_TREE(ggblist->tree), get_display_name(node)),
@@ -961,10 +961,10 @@ add_chat(PurpleChat *chat, FinchBList *ggblist)
 }
 
 static void
-add_contact(PurpleContact *contact, FinchBList *ggblist)
+add_contact(PurpleContact *contact, FinchBlist *ggblist)
 {
 	gpointer parent;
-	PurpleBListNode *node = (PurpleBListNode*)contact;
+	PurpleBlistNode *node = (PurpleBlistNode*)contact;
 	const char *name;
 
 	if (purple_blist_node_get_ui_data(node))
@@ -974,7 +974,7 @@ add_contact(PurpleContact *contact, FinchBList *ggblist)
 	if (name == NULL)
 		return;
 
-	parent = ggblist->manager->find_parent((PurpleBListNode*)contact);
+	parent = ggblist->manager->find_parent((PurpleBlistNode*)contact);
 
 	create_finch_blist_node(node, gnt_tree_add_row_after(GNT_TREE(ggblist->tree), contact,
 				gnt_tree_create_row(GNT_TREE(ggblist->tree), name),
@@ -984,51 +984,51 @@ add_contact(PurpleContact *contact, FinchBList *ggblist)
 }
 
 static void
-add_buddy(PurpleBuddy *buddy, FinchBList *ggblist)
+add_buddy(PurpleBuddy *buddy, FinchBlist *ggblist)
 {
 	gpointer parent;
-	PurpleBListNode *node = (PurpleBListNode *)buddy;
+	PurpleBlistNode *node = (PurpleBlistNode *)buddy;
 	PurpleContact *contact;
 
 	if (purple_blist_node_get_ui_data(node))
 		return;
 
 	contact = purple_buddy_get_contact(buddy);
-	parent = ggblist->manager->find_parent((PurpleBListNode*)buddy);
+	parent = ggblist->manager->find_parent((PurpleBlistNode*)buddy);
 
 	create_finch_blist_node(node, gnt_tree_add_row_after(GNT_TREE(ggblist->tree), buddy,
 				gnt_tree_create_row(GNT_TREE(ggblist->tree), get_display_name(node)),
 				parent, NULL));
 
-	blist_update_row_flags((PurpleBListNode*)buddy);
+	blist_update_row_flags((PurpleBlistNode*)buddy);
 	if (buddy == purple_contact_get_priority_buddy(contact))
-		blist_update_row_flags((PurpleBListNode*)contact);
+		blist_update_row_flags((PurpleBlistNode*)contact);
 }
 
 #if 0
 static void
-buddy_signed_on(PurpleBuddy *buddy, FinchBList *ggblist)
+buddy_signed_on(PurpleBuddy *buddy, FinchBlist *ggblist)
 {
-	add_node((PurpleBListNode*)buddy, ggblist);
+	add_node((PurpleBlistNode*)buddy, ggblist);
 }
 
 static void
-buddy_signed_off(PurpleBuddy *buddy, FinchBList *ggblist)
+buddy_signed_off(PurpleBuddy *buddy, FinchBlist *ggblist)
 {
-	node_remove(purple_blist_get_buddy_list(), (PurpleBListNode*)buddy);
+	node_remove(purple_blist_get_buddy_list(), (PurpleBlistNode*)buddy);
 }
 #endif
 
-PurpleBListUiOps *finch_blist_get_ui_ops()
+PurpleBlistUiOps *finch_blist_get_ui_ops()
 {
 	return &blist_ui_ops;
 }
 
 static void
-selection_activate(GntWidget *widget, FinchBList *ggblist)
+selection_activate(GntWidget *widget, FinchBlist *ggblist)
 {
 	GntTree *tree = GNT_TREE(ggblist->tree);
-	PurpleBListNode *node = gnt_tree_get_selection_data(tree);
+	PurpleBlistNode *node = gnt_tree_get_selection_data(tree);
 
 	if (!node)
 		return;
@@ -1058,7 +1058,7 @@ selection_activate(GntWidget *widget, FinchBList *ggblist)
 }
 
 static void
-append_proto_menu(GntMenu *menu, PurpleConnection *gc, PurpleBListNode *node)
+append_proto_menu(GntMenu *menu, PurpleConnection *gc, PurpleBlistNode *node)
 {
 	GList *list;
 	PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc));
@@ -1113,7 +1113,7 @@ chat_components_edit_ok(PurpleChat *chat, PurpleRequestFields *allfields)
 }
 
 static void
-chat_components_edit(PurpleBListNode *selected, PurpleChat *chat)
+chat_components_edit(PurpleBlistNode *selected, PurpleChat *chat)
 {
 	PurpleRequestFields *fields = purple_request_fields_new();
 	PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
@@ -1172,7 +1172,7 @@ create_chat_menu(GntMenu *menu, PurpleChat *chat)
 	GntMenuItem *check = gnt_menuitem_check_new(
 			purple_menu_action_get_label(action));
 	gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(check),
-				purple_blist_node_get_bool((PurpleBListNode*)chat, "gnt-autojoin"));
+				purple_blist_node_get_bool((PurpleBlistNode*)chat, "gnt-autojoin"));
 	gnt_menu_add_item(menu, check);
 	gnt_menuitem_set_callback(check, autojoin_toggled, action);
 	g_signal_connect_swapped(G_OBJECT(menu), "destroy",
@@ -1182,19 +1182,19 @@ create_chat_menu(GntMenu *menu, PurpleChat *chat)
 }
 
 static void
-finch_add_buddy(PurpleBListNode *selected, PurpleGroup *grp)
+finch_add_buddy(PurpleBlistNode *selected, PurpleGroup *grp)
 {
 	purple_blist_request_add_buddy(NULL, NULL, grp ? purple_group_get_name(grp) : NULL, NULL);
 }
 
 static void
-finch_add_group(PurpleBListNode *selected, PurpleGroup *grp)
+finch_add_group(PurpleBlistNode *selected, PurpleGroup *grp)
 {
 	purple_blist_request_add_group();
 }
 
 static void
-finch_add_chat(PurpleBListNode *selected, PurpleGroup *grp)
+finch_add_chat(PurpleBlistNode *selected, PurpleGroup *grp)
 {
 	purple_blist_request_add_chat(NULL, grp, NULL, NULL);
 }
@@ -1223,19 +1223,19 @@ gpointer finch_retrieve_user_info(PurpleConnection *conn, const char *name)
 }
 
 static void
-finch_blist_get_buddy_info_cb(PurpleBListNode *selected, PurpleBuddy *buddy)
+finch_blist_get_buddy_info_cb(PurpleBlistNode *selected, PurpleBuddy *buddy)
 {
 	finch_retrieve_user_info(purple_account_get_connection(purple_buddy_get_account(buddy)), purple_buddy_get_name(buddy));
 }
 
 static void
-finch_blist_menu_send_file_cb(PurpleBListNode *selected, PurpleBuddy *buddy)
+finch_blist_menu_send_file_cb(PurpleBlistNode *selected, PurpleBuddy *buddy)
 {
 	serv_send_file(purple_account_get_connection(purple_buddy_get_account(buddy)), purple_buddy_get_name(buddy), NULL);
 }
 
 static void
-finch_blist_pounce_node_cb(PurpleBListNode *selected, PurpleBListNode *node)
+finch_blist_pounce_node_cb(PurpleBlistNode *selected, PurpleBlistNode *node)
 {
 	PurpleBuddy *b;
 	if (PURPLE_IS_CONTACT(node))
@@ -1303,18 +1303,18 @@ create_buddy_menu(GntMenu *menu, PurpleBuddy *buddy)
 	gnt_menu_add_item(menu, item);
 
 	item = gnt_menuitem_check_new(_("Show when offline"));
-	gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item), purple_blist_node_get_bool((PurpleBListNode*)buddy, "show_offline"));
+	gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item), purple_blist_node_get_bool((PurpleBlistNode*)buddy, "show_offline"));
 	gnt_menuitem_set_callback(item, toggle_show_offline, buddy);
 	gnt_menu_add_item(menu, item);
 
 	/* Protocol actions */
 	append_proto_menu(menu,
 			purple_account_get_connection(purple_buddy_get_account(buddy)),
-			(PurpleBListNode*)buddy);
+			(PurpleBlistNode*)buddy);
 }
 
 static void
-append_extended_menu(GntMenu *menu, PurpleBListNode *node)
+append_extended_menu(GntMenu *menu, PurpleBlistNode *node)
 {
 	GList *iter;
 
@@ -1329,10 +1329,10 @@ append_extended_menu(GntMenu *menu, PurpleBListNode *node)
 static void
 remove_contact(PurpleContact *contact)
 {
-	PurpleBListNode *bnode, *cnode;
+	PurpleBlistNode *bnode, *cnode;
 	PurpleGroup *group;
 
-	cnode = (PurpleBListNode *)contact;
+	cnode = (PurpleBlistNode *)contact;
 	group = (PurpleGroup*)purple_blist_node_get_parent(cnode);
 	for (bnode = purple_blist_node_get_first_child(cnode); bnode; bnode = purple_blist_node_get_sibling_next(bnode)) {
 		PurpleBuddy *buddy = (PurpleBuddy*)bnode;
@@ -1344,7 +1344,7 @@ remove_contact(PurpleContact *contact)
 }
 
 static void
-rename_blist_node(PurpleBListNode *node, const char *newname)
+rename_blist_node(PurpleBlistNode *node, const char *newname)
 {
 	const char *name = newname;
 	if (name && !*name)
@@ -1368,7 +1368,7 @@ rename_blist_node(PurpleBListNode *node, const char *newname)
 }
 
 static void
-finch_blist_rename_node_cb(PurpleBListNode *selected, PurpleBListNode *node)
+finch_blist_rename_node_cb(PurpleBlistNode *selected, PurpleBlistNode *node)
 {
 	const char *name = NULL;
 	char *prompt;
@@ -1398,7 +1398,7 @@ finch_blist_rename_node_cb(PurpleBListNode *selected, PurpleBListNode *node)
 }
 
 
-static void showlog_cb(PurpleBListNode *sel, PurpleBListNode *node)
+static void showlog_cb(PurpleBlistNode *sel, PurpleBlistNode *node)
 {
 	PurpleLogType type;
 	PurpleAccount *account;
@@ -1438,9 +1438,9 @@ static void showlog_cb(PurpleBListNode *sel, PurpleBListNode *node)
 static void
 remove_group(PurpleGroup *group)
 {
-	PurpleBListNode *cnode, *bnode;
+	PurpleBlistNode *cnode, *bnode;
 
-	cnode = purple_blist_node_get_first_child(((PurpleBListNode*)group));
+	cnode = purple_blist_node_get_first_child(((PurpleBlistNode*)group));
 
 	while (cnode) {
 		if (PURPLE_IS_CONTACT(cnode)) {
@@ -1475,7 +1475,7 @@ remove_group(PurpleGroup *group)
 }
 
 static void
-finch_blist_remove_node(PurpleBListNode *node)
+finch_blist_remove_node(PurpleBlistNode *node)
 {
 	if (PURPLE_IS_CONTACT(node)) {
 		remove_contact((PurpleContact*)node);
@@ -1492,7 +1492,7 @@ finch_blist_remove_node(PurpleBListNode *node)
 }
 
 static void
-finch_blist_remove_node_cb(PurpleBListNode *selected, PurpleBListNode *node)
+finch_blist_remove_node_cb(PurpleBlistNode *selected, PurpleBlistNode *node)
 {
 	PurpleAccount *account = NULL;
 	char *primary;
@@ -1529,7 +1529,7 @@ finch_blist_remove_node_cb(PurpleBListNode *selected, PurpleBListNode *node)
 }
 
 static void
-finch_blist_toggle_tag_buddy(PurpleBListNode *node)
+finch_blist_toggle_tag_buddy(PurpleBlistNode *node)
 {
 	GList *iter;
 	if (node == NULL)
@@ -1548,7 +1548,7 @@ finch_blist_toggle_tag_buddy(PurpleBListNode *node)
 }
 
 static void
-finch_blist_place_tagged(PurpleBListNode *target)
+finch_blist_place_tagged(PurpleBlistNode *target)
 {
 	PurpleGroup *tg = NULL;
 	PurpleContact *tc = NULL;
@@ -1561,7 +1561,7 @@ finch_blist_place_tagged(PurpleBListNode *target)
 		tg = (PurpleGroup*)target;
 	else if (PURPLE_IS_BUDDY(target)) {
 		tc = (PurpleContact*)purple_blist_node_get_parent(target);
-		tg = (PurpleGroup*)purple_blist_node_get_parent((PurpleBListNode*)tc);
+		tg = (PurpleGroup*)purple_blist_node_get_parent((PurpleBlistNode*)tc);
 	} else {
 		if (PURPLE_IS_CONTACT(target))
 			tc = (PurpleContact*)target;
@@ -1572,13 +1572,13 @@ finch_blist_place_tagged(PurpleBListNode *target)
 		GList *list = ggblist->tagged;
 		ggblist->tagged = NULL;
 		while (list) {
-			PurpleBListNode *node = list->data;
+			PurpleBlistNode *node = list->data;
 			list = g_list_delete_link(list, list);
 
 			if (PURPLE_IS_GROUP(node)) {
 				update_node_display(node, ggblist);
 				/* Add the group after the current group */
-				purple_blist_add_group((PurpleGroup*)node, (PurpleBListNode*)tg);
+				purple_blist_add_group((PurpleGroup*)node, (PurpleBlistNode*)tg);
 			} else if (PURPLE_IS_CONTACT(node)) {
 				update_buddy_display(purple_contact_get_priority_buddy((PurpleContact*)node), ggblist);
 				if (PURPLE_BLIST_NODE(tg) == target) {
@@ -1586,7 +1586,7 @@ finch_blist_place_tagged(PurpleBListNode *target)
 					purple_blist_add_contact((PurpleContact*)node, tg, NULL);
 				} else if (tc) {
 					/* The target is either a buddy, or a contact. Merge with that contact. */
-					purple_contact_merge((PurpleContact*)node, (PurpleBListNode*)tc);
+					purple_contact_merge((PurpleContact*)node, (PurpleBlistNode*)tc);
 				} else {
 					/* The target is a chat. Add the contact to the group after this chat. */
 					purple_blist_add_contact((PurpleContact*)node, NULL, target);
@@ -1618,15 +1618,15 @@ finch_blist_place_tagged(PurpleBListNode *target)
 }
 
 static void
-context_menu_destroyed(GntWidget *widget, FinchBList *ggblist)
+context_menu_destroyed(GntWidget *widget, FinchBlist *ggblist)
 {
 	ggblist->context = NULL;
 }
 
 static void
-draw_context_menu(FinchBList *ggblist)
+draw_context_menu(FinchBlist *ggblist)
 {
-	PurpleBListNode *node = NULL;
+	PurpleBlistNode *node = NULL;
 	GntWidget *context = NULL;
 	GntTree *tree = NULL;
 	int x, y, top, width;
@@ -1781,9 +1781,9 @@ make_sure_text_fits(GString *string)
 }
 
 static gboolean
-draw_tooltip_real(FinchBList *ggblist)
+draw_tooltip_real(FinchBlist *ggblist)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	int x, y, top, width, w, h;
 	GString *str = NULL;
 	GntTree *tree;
@@ -1851,7 +1851,7 @@ draw_tooltip_real(FinchBList *ggblist)
 }
 
 static void
-draw_tooltip(FinchBList *ggblist)
+draw_tooltip(FinchBlist *ggblist)
 {
 	/* When an account has signed off, it removes one buddy at a time.
 	 * Drawing the tooltip after removing each buddy is expensive. On
@@ -1864,21 +1864,21 @@ draw_tooltip(FinchBList *ggblist)
 }
 
 static void
-selection_changed(GntWidget *widget, gpointer old, gpointer current, FinchBList *ggblist)
+selection_changed(GntWidget *widget, gpointer old, gpointer current, FinchBlist *ggblist)
 {
 	remove_peripherals(ggblist);
 	draw_tooltip(ggblist);
 }
 
 static gboolean
-context_menu(GntWidget *widget, FinchBList *ggblist)
+context_menu(GntWidget *widget, FinchBlist *ggblist)
 {
 	draw_context_menu(ggblist);
 	return TRUE;
 }
 
 static gboolean
-key_pressed(GntWidget *widget, const char *text, FinchBList *ggblist)
+key_pressed(GntWidget *widget, const char *text, FinchBlist *ggblist)
 {
 	if (text[0] == 27 && text[1] == 0) {
 		/* Escape was pressed */
@@ -1886,7 +1886,7 @@ key_pressed(GntWidget *widget, const char *text, FinchBList *ggblist)
 			gnt_bindable_perform_action_named(GNT_BINDABLE(ggblist->tree), "end-search", NULL);
 		remove_peripherals(ggblist);
 	} else if (strcmp(text, GNT_KEY_INS) == 0) {
-		PurpleBListNode *node = gnt_tree_get_selection_data(GNT_TREE(ggblist->tree));
+		PurpleBlistNode *node = gnt_tree_get_selection_data(GNT_TREE(ggblist->tree));
 		purple_blist_request_add_buddy(NULL, NULL,
 				node && PURPLE_IS_GROUP(node) ? purple_group_get_name(PURPLE_GROUP(node)) : NULL,
 				NULL);
@@ -1905,44 +1905,44 @@ key_pressed(GntWidget *widget, const char *text, FinchBList *ggblist)
 }
 
 static void
-update_node_display(PurpleBListNode *node, FinchBList *ggblist)
+update_node_display(PurpleBlistNode *node, FinchBlist *ggblist)
 {
 	GntTextFormatFlags flag = get_blist_node_flag(node);
 	gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), node, flag);
 }
 
 static void
-update_buddy_display(PurpleBuddy *buddy, FinchBList *ggblist)
+update_buddy_display(PurpleBuddy *buddy, FinchBlist *ggblist)
 {
 	PurpleContact *contact;
 
 	contact = purple_buddy_get_contact(buddy);
 
-	gnt_tree_change_text(GNT_TREE(ggblist->tree), buddy, 0, get_display_name((PurpleBListNode*)buddy));
-	gnt_tree_change_text(GNT_TREE(ggblist->tree), contact, 0, get_display_name((PurpleBListNode*)contact));
+	gnt_tree_change_text(GNT_TREE(ggblist->tree), buddy, 0, get_display_name((PurpleBlistNode*)buddy));
+	gnt_tree_change_text(GNT_TREE(ggblist->tree), contact, 0, get_display_name((PurpleBlistNode*)contact));
 
-	blist_update_row_flags((PurpleBListNode *)buddy);
+	blist_update_row_flags((PurpleBlistNode *)buddy);
 	if (buddy == purple_contact_get_priority_buddy(contact))
-		blist_update_row_flags((PurpleBListNode *)contact);
+		blist_update_row_flags((PurpleBlistNode *)contact);
 
-	if (ggblist->tnode == (PurpleBListNode*)buddy)
+	if (ggblist->tnode == (PurpleBlistNode*)buddy)
 		draw_tooltip(ggblist);
 }
 
 static void
-buddy_status_changed(PurpleBuddy *buddy, PurpleStatus *old, PurpleStatus *now, FinchBList *ggblist)
+buddy_status_changed(PurpleBuddy *buddy, PurpleStatus *old, PurpleStatus *now, FinchBlist *ggblist)
 {
 	update_buddy_display(buddy, ggblist);
 }
 
 static void
-buddy_idle_changed(PurpleBuddy *buddy, int old, int new, FinchBList *ggblist)
+buddy_idle_changed(PurpleBuddy *buddy, int old, int new, FinchBlist *ggblist)
 {
 	update_buddy_display(buddy, ggblist);
 }
 
 static void
-remove_peripherals(FinchBList *ggblist)
+remove_peripherals(FinchBlist *ggblist)
 {
 	if (ggblist->tooltip)
 		remove_tooltip(ggblist);
@@ -1969,7 +1969,7 @@ save_position_cb(GntWidget *w, int x, int y)
 static void
 reset_blist_window(GntWidget *window, gpointer null)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	purple_signals_disconnect_by_handle(finch_blist_get_handle());
 	FINCH_SET_DATA(purple_blist_get_buddy_list(), NULL);
 
@@ -1997,7 +1997,7 @@ reset_blist_window(GntWidget *window, gpointer null)
 static void
 populate_buddylist(void)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	PurpleBuddyList *list;
 
 	if (ggblist->manager->init)
@@ -2089,8 +2089,8 @@ populate_status_dropdown(void)
 static void
 redraw_blist(const char *name, PurplePrefType type, gconstpointer val, gpointer data)
 {
-	PurpleBListNode *node, *sel;
-	FinchBListManager *manager;
+	PurpleBlistNode *node, *sel;
+	FinchBlistManager *manager;
 
 	if (ggblist == NULL)
 		return;
@@ -2330,7 +2330,7 @@ savedstatus_changed(PurpleSavedStatus *now, PurpleSavedStatus *old)
 }
 
 static int
-blist_node_compare_position(PurpleBListNode *n1, PurpleBListNode *n2)
+blist_node_compare_position(PurpleBlistNode *n1, PurpleBlistNode *n2)
 {
 	while ((n1 = purple_blist_node_get_sibling_prev(n1)) != NULL)
 		if (n1 == n2)
@@ -2339,7 +2339,7 @@ blist_node_compare_position(PurpleBListNode *n1, PurpleBListNode *n2)
 }
 
 static int
-blist_node_compare_text(PurpleBListNode *n1, PurpleBListNode *n2)
+blist_node_compare_text(PurpleBlistNode *n1, PurpleBlistNode *n2)
 {
 	const char *s1, *s2;
 	char *us1, *us2;
@@ -2372,7 +2372,7 @@ blist_node_compare_text(PurpleBListNode *n1, PurpleBListNode *n2)
 }
 
 static int
-blist_node_compare_status(PurpleBListNode *n1, PurpleBListNode *n2)
+blist_node_compare_status(PurpleBlistNode *n1, PurpleBlistNode *n2)
 {
 	int ret;
 
@@ -2401,10 +2401,10 @@ blist_node_compare_status(PurpleBListNode *n1, PurpleBListNode *n2)
 }
 
 static int
-get_contact_log_size(PurpleBListNode *c)
+get_contact_log_size(PurpleBlistNode *c)
 {
 	int log = 0;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 
 	for (node = purple_blist_node_get_first_child(c); node; node = purple_blist_node_get_sibling_next(node)) {
 		PurpleBuddy *b = (PurpleBuddy*)node;
@@ -2416,7 +2416,7 @@ get_contact_log_size(PurpleBListNode *c)
 }
 
 static int
-blist_node_compare_log(PurpleBListNode *n1, PurpleBListNode *n2)
+blist_node_compare_log(PurpleBlistNode *n1, PurpleBlistNode *n2)
 {
 	int ret;
 	PurpleBuddy *b1, *b2;
@@ -2478,8 +2478,8 @@ build_plugin_actions(GntMenuItem *item, PurplePlugin *plugin, gpointer context)
 static gboolean
 buddy_recent_signed_on_off(gpointer data)
 {
-	PurpleBListNode *node = data;
-	FinchBListNode *fnode = purple_blist_node_get_ui_data(node);
+	PurpleBlistNode *node = data;
+	FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
 
 	purple_timeout_remove(fnode->signed_timer);
 	fnode->signed_timer = 0;
@@ -2499,8 +2499,8 @@ buddy_recent_signed_on_off(gpointer data)
 static gboolean
 buddy_signed_on_off_cb(gpointer data)
 {
-	PurpleBListNode *node = data;
-	FinchBListNode *fnode = purple_blist_node_get_ui_data(node);
+	PurpleBlistNode *node = data;
+	FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
 	if (!ggblist || !fnode)
 		return FALSE;
 
@@ -2602,7 +2602,7 @@ reconstruct_grouping_menu(void)
 
 	for (iter = managers; iter; iter = iter->next) {
 		char menuid[128];
-		FinchBListManager *manager = iter->data;
+		FinchBlistManager *manager = iter->data;
 		GntMenuItem *item = gnt_menuitem_new(_(manager->name));
 		g_snprintf(menuid, sizeof(menuid), "grouping-%s", manager->id);
 		gnt_menuitem_set_id(GNT_MENU_ITEM(item), menuid);
@@ -2615,7 +2615,7 @@ reconstruct_grouping_menu(void)
 static gboolean
 auto_join_chats(gpointer data)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	PurpleConnection *pc = data;
 	PurpleAccount *account = purple_connection_get_account(pc);
 
@@ -3043,7 +3043,7 @@ void finch_blist_show()
 }
 
 static void
-group_collapsed(GntWidget *widget, PurpleBListNode *node, gboolean collapsed, gpointer null)
+group_collapsed(GntWidget *widget, PurpleBlistNode *node, gboolean collapsed, gpointer null)
 {
 	if (PURPLE_IS_GROUP(node))
 		purple_blist_node_set_bool(node, "collapsed", collapsed);
@@ -3174,7 +3174,7 @@ void finch_blist_set_size(int width, int height)
 	gnt_widget_set_size(ggblist->window, width, height);
 }
 
-void finch_blist_install_manager(const FinchBListManager *manager)
+void finch_blist_install_manager(const FinchBlistManager *manager)
 {
 	if (!g_list_find(managers, manager)) {
 		managers = g_list_append(managers, (gpointer)manager);
@@ -3184,7 +3184,7 @@ void finch_blist_install_manager(const FinchBListManager *manager)
 	}
 }
 
-void finch_blist_uninstall_manager(const FinchBListManager *manager)
+void finch_blist_uninstall_manager(const FinchBlistManager *manager)
 {
 	if (g_list_find(managers, manager)) {
 		managers = g_list_remove(managers, manager);
@@ -3194,14 +3194,14 @@ void finch_blist_uninstall_manager(const FinchBListManager *manager)
 	}
 }
 
-FinchBListManager * finch_blist_manager_find(const char *id)
+FinchBlistManager * finch_blist_manager_find(const char *id)
 {
 	GList *iter = managers;
 	if (!id)
 		return NULL;
 
 	for (; iter; iter = iter->next) {
-		FinchBListManager *m = iter->data;
+		FinchBlistManager *m = iter->data;
 		if (strcmp(id, m->id) == 0)
 			return m;
 	}
diff --git a/finch/gntblist.h b/finch/gntblist.h
index 85c343daf0..5c3dadfcc3 100644
--- a/finch/gntblist.h
+++ b/finch/gntblist.h
@@ -44,18 +44,18 @@ typedef struct
 	const char *name;                                  /**< Displayable name for the manager. */
 	gboolean (*init)(void);                            /**< Called right before it's being used. */
 	gboolean (*uninit)(void);                          /**< Called right after it's not being used any more. */
-	gboolean (*can_add_node)(PurpleBListNode *node);   /**< Whether a node should be added to the view. */
-	gpointer (*find_parent)(PurpleBListNode *node);    /**< Find the parent row for a node. */
+	gboolean (*can_add_node)(PurpleBlistNode *node);   /**< Whether a node should be added to the view. */
+	gpointer (*find_parent)(PurpleBlistNode *node);    /**< Find the parent row for a node. */
 	gboolean (*create_tooltip)(gpointer selected_row, GString **body, char **title);  /**< Create tooltip for a selected row. */
 	gpointer reserved[4];
-} FinchBListManager;
+} FinchBlistManager;
 
 /**
  * Get the ui-functions.
  *
- * @return The PurpleBListUiOps structure populated with the appropriate functions.
+ * @return The PurpleBlistUiOps structure populated with the appropriate functions.
  */
-PurpleBListUiOps * finch_blist_get_ui_ops(void);
+PurpleBlistUiOps * finch_blist_get_ui_ops(void);
 
 /**
  * Perform necessary initializations.
@@ -129,14 +129,14 @@ GntTree * finch_blist_get_tree(void);
  *
  * @param manager   The alternate buddylist manager.
  */
-void finch_blist_install_manager(const FinchBListManager *manager);
+void finch_blist_install_manager(const FinchBlistManager *manager);
 
 /**
  * Remove an alternate buddy list manager.
  *
  * @param manager   The buddy list manager to remove.
  */
-void finch_blist_uninstall_manager(const FinchBListManager *manager);
+void finch_blist_uninstall_manager(const FinchBlistManager *manager);
 
 /**
  * Find a buddy list manager.
@@ -145,14 +145,14 @@ void finch_blist_uninstall_manager(const FinchBListManager *manager);
  *
  * @return  The manager with the requested identifier, if available. @c NULL otherwise.
  */
-FinchBListManager * finch_blist_manager_find(const char *id);
+FinchBlistManager * finch_blist_manager_find(const char *id);
 
 /**
  * Request the active buddy list manager to add a node.
  *
  * @param node  The node to add
  */
-void finch_blist_manager_add_node(PurpleBListNode *node);
+void finch_blist_manager_add_node(PurpleBlistNode *node);
 
 /*@}*/
 
diff --git a/finch/gntconv.c b/finch/gntconv.c
index c684f3f200..1f189387e6 100644
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -89,16 +89,16 @@ find_chat_for_conversation(PurpleConversation *conv)
 			purple_conversation_get_name(conv));
 }
 
-static PurpleBListNode *
+static PurpleBlistNode *
 get_conversation_blist_node(PurpleConversation *conv)
 {
-	PurpleBListNode *node = NULL;
+	PurpleBlistNode *node = NULL;
 
 	if (PURPLE_IS_IM_CONVERSATION(conv)) {
-		node = (PurpleBListNode*)find_buddy_for_conversation(conv);
+		node = (PurpleBlistNode*)find_buddy_for_conversation(conv);
 		node = node ? purple_blist_node_get_parent(node) : NULL;
 	} else {
-		node = (PurpleBListNode*)find_chat_for_conversation(conv);
+		node = (PurpleBlistNode*)find_chat_for_conversation(conv);
 	}
 
 	return node;
@@ -229,16 +229,16 @@ save_position_cb(GntWidget *w, int x, int y)
 static PurpleIMConversation *
 find_im_with_contact(PurpleAccount *account, const char *name)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	PurpleBuddy *buddy = purple_blist_find_buddy(account, name);
 	PurpleIMConversation *im = NULL;
 
 	if (!buddy)
 		return NULL;
 
-	for (node = purple_blist_node_get_first_child(purple_blist_node_get_parent((PurpleBListNode*)buddy));
+	for (node = purple_blist_node_get_first_child(purple_blist_node_get_parent((PurpleBlistNode*)buddy));
 				node; node = purple_blist_node_get_sibling_next(node)) {
-		if (node == (PurpleBListNode*)buddy)
+		if (node == (PurpleBlistNode*)buddy)
 			continue;
 		if ((im = purple_conversations_find_im_with_account(
 				purple_buddy_get_name((PurpleBuddy*)node), purple_buddy_get_account((PurpleBuddy*)node))) != NULL)
@@ -492,7 +492,7 @@ static void
 toggle_sound_cb(GntMenuItem *item, gpointer ggconv)
 {
 	FinchConv *fc = ggconv;
-	PurpleBListNode *node = get_conversation_blist_node(fc->active_conv);
+	PurpleBlistNode *node = get_conversation_blist_node(fc->active_conv);
 	fc->flags ^= FINCH_CONV_NO_SOUND;
 	if (node)
 		purple_blist_node_set_bool(node, "gnt-mute-sound", !!(fc->flags & FINCH_CONV_NO_SOUND));
@@ -531,7 +531,7 @@ view_log_cb(GntMenuItem *n, gpointer ggc)
 
 	buddies = purple_blist_find_buddies(account, name);
 	for (cur = buddies; cur != NULL; cur = cur->next) {
-		PurpleBListNode *node = cur->data;
+		PurpleBlistNode *node = cur->data;
 		if ((node != NULL) &&
 				(purple_blist_node_get_sibling_prev(node) || purple_blist_node_get_sibling_next(node))) {
 			finch_log_show_contact((PurpleContact *)purple_blist_node_get_parent(node));
@@ -566,7 +566,7 @@ generate_send_to_menu(FinchConv *ggc)
 	gnt_menuitem_set_submenu(item, GNT_MENU(sub));
 
 	for (; buds; buds = g_slist_delete_link(buds, buds)) {
-		PurpleBListNode *node = PURPLE_BLIST_NODE(purple_buddy_get_contact(PURPLE_BUDDY(buds->data)));
+		PurpleBlistNode *node = PURPLE_BLIST_NODE(purple_buddy_get_contact(PURPLE_BUDDY(buds->data)));
 		for (node = purple_blist_node_get_first_child(node); node != NULL;
 				node = purple_blist_node_get_sibling_next(node)) {
 			PurpleBuddy *buddy = (PurpleBuddy *)node;
@@ -774,7 +774,7 @@ finch_create_conversation(PurpleConversation *conv)
 	char *title;
 	PurpleConversation *cc;
 	PurpleAccount *account;
-	PurpleBListNode *convnode = NULL;
+	PurpleBlistNode *convnode = NULL;
 
 	if (ggc) {
 		gnt_window_present(ggc->window);
diff --git a/finch/gntlog.c b/finch/gntlog.c
index e4a28a5b54..6d5a924299 100644
--- a/finch/gntlog.c
+++ b/finch/gntlog.c
@@ -436,7 +436,7 @@ void finch_log_show(PurpleLogType type, const char *username, PurpleAccount *acc
 void finch_log_show_contact(PurpleContact *contact)
 {
 	struct log_viewer_hash_t *ht;
-	PurpleBListNode *child;
+	PurpleBlistNode *child;
 	FinchLogViewer *lv = NULL;
 	GList *logs = NULL;
 	const char *name = NULL;
@@ -457,7 +457,7 @@ void finch_log_show_contact(PurpleContact *contact)
 		return;
 	}
 
-	for (child = purple_blist_node_get_first_child((PurpleBListNode*)contact); child;
+	for (child = purple_blist_node_get_first_child((PurpleBlistNode*)contact); child;
 			child = purple_blist_node_get_sibling_next(child)) {
 		const char *name;
 		PurpleAccount *account;
@@ -480,7 +480,7 @@ void finch_log_show_contact(PurpleContact *contact)
 	 * and none of the contact's buddies are online.
 	 * There is probably a better way to deal with this. */
 	if (name == NULL) {
-		child = purple_blist_node_get_first_child((PurpleBListNode*)contact);
+		child = purple_blist_node_get_first_child((PurpleBlistNode*)contact);
 		if (child != NULL && PURPLE_IS_BUDDY(child))
 			name = purple_buddy_get_contact_alias((PurpleBuddy *)child);
 		if (name == NULL)
diff --git a/finch/gntpounce.c b/finch/gntpounce.c
index efaa8dc3bb..66c5adb6ef 100644
--- a/finch/gntpounce.c
+++ b/finch/gntpounce.c
@@ -171,7 +171,7 @@ signed_on_off_cb(PurpleConnection *gc, gpointer user_data)
 static void
 setup_buddy_list_suggestion(GntEntry *entry, gboolean offline)
 {
-	PurpleBListNode *node = purple_blist_get_root();
+	PurpleBlistNode *node = purple_blist_get_root();
 	for (; node; node = purple_blist_node_next(node, offline)) {
 		if (!PURPLE_IS_BUDDY(node))
 			continue;
diff --git a/finch/gntrequest.c b/finch/gntrequest.c
index a6eafb9abc..838c339b3e 100644
--- a/finch/gntrequest.c
+++ b/finch/gntrequest.c
@@ -440,7 +440,7 @@ create_string_field(PurpleRequestField *field, GntWidget **username)
 	gnt_entry_set_masked(GNT_ENTRY(entry),
 			purple_request_field_string_is_masked(field));
 	if (hint && purple_str_has_prefix(hint, "screenname")) {
-		PurpleBListNode *node = purple_blist_get_root();
+		PurpleBlistNode *node = purple_blist_get_root();
 		gboolean offline = purple_str_has_suffix(hint, "all");
 		for (; node; node = purple_blist_node_next(node, offline)) {
 			if (!PURPLE_IS_BUDDY(node))
@@ -451,7 +451,7 @@ create_string_field(PurpleRequestField *field, GntWidget **username)
 		if (username)
 			*username = entry;
 	} else if (hint && !strcmp(hint, "group")) {
-		PurpleBListNode *node;
+		PurpleBlistNode *node;
 		for (node = purple_blist_get_root(); node;
 				node = purple_blist_node_get_sibling_next(node)) {
 			if (PURPLE_IS_GROUP(node))
diff --git a/finch/plugins/gnthistory.c b/finch/plugins/gnthistory.c
index 2065cde5ca..9706bd7197 100644
--- a/finch/plugins/gnthistory.c
+++ b/finch/plugins/gnthistory.c
@@ -70,11 +70,11 @@ static void historize(PurpleConversation *c)
 			alias = purple_buddy_get_contact_alias(PURPLE_BUDDY(buddies->data));
 
 		for (cur = buddies; cur != NULL; cur = cur->next) {
-			PurpleBListNode *node = cur->data;
+			PurpleBlistNode *node = cur->data;
 			if ((node != NULL) &&
 					((purple_blist_node_get_sibling_prev(node) != NULL) ||
 						(purple_blist_node_get_sibling_next(node) != NULL))) {
-				PurpleBListNode *node2;
+				PurpleBlistNode *node2;
 
 				alias = purple_buddy_get_contact_alias(PURPLE_BUDDY(node));
 
diff --git a/finch/plugins/grouping.c b/finch/plugins/grouping.c
index 81e2b46f0e..b54584eea4 100644
--- a/finch/plugins/grouping.c
+++ b/finch/plugins/grouping.c
@@ -33,14 +33,14 @@
 #define FINCH_IS_GROUPING_NODE(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), FINCH_TYPE_GROUPING_NODE))
 
 typedef struct {
-	PurpleBListNode node;
+	PurpleBlistNode node;
 } FinchGroupingNode;
 
 typedef struct {
-	PurpleBListNodeClass node_class;
+	PurpleBlistNodeClass node_class;
 } FinchGroupingNodeClass;
 
-static FinchBListManager *default_manager;
+static FinchBlistManager *default_manager;
 
 /**
  * GObject code
@@ -89,7 +89,7 @@ static gboolean on_offline_init()
 	return TRUE;
 }
 
-static gboolean on_offline_can_add_node(PurpleBListNode *node)
+static gboolean on_offline_can_add_node(PurpleBlistNode *node)
 {
 	if (PURPLE_IS_CONTACT(node)) {
 		PurpleContact *contact = PURPLE_CONTACT(node);
@@ -112,7 +112,7 @@ static gboolean on_offline_can_add_node(PurpleBListNode *node)
 	return FALSE;
 }
 
-static gpointer on_offline_find_parent(PurpleBListNode *node)
+static gpointer on_offline_find_parent(PurpleBlistNode *node)
 {
 	gpointer ret = NULL;
 
@@ -131,7 +131,7 @@ static gpointer on_offline_find_parent(PurpleBListNode *node)
 
 static gboolean on_offline_create_tooltip(gpointer selected_row, GString **body, char **tool_title)
 {
-	PurpleBListNode *node = selected_row;
+	PurpleBlistNode *node = selected_row;
 
 	if (FINCH_IS_GROUPING_NODE(node)) {
 		/* There should be some easy way of getting the total online count,
@@ -146,7 +146,7 @@ static gboolean on_offline_create_tooltip(gpointer selected_row, GString **body,
 	}
 }
 
-static FinchBListManager on_offline =
+static FinchBlistManager on_offline =
 {
 	"on-offline",
 	N_("Online/Offline"),
@@ -172,7 +172,7 @@ static gboolean meebo_init()
 	return TRUE;
 }
 
-static gpointer meebo_find_parent(PurpleBListNode *node)
+static gpointer meebo_find_parent(PurpleBlistNode *node)
 {
 	if (PURPLE_IS_CONTACT(node)) {
 		PurpleBuddy *buddy = purple_contact_get_priority_buddy(PURPLE_CONTACT(node));
@@ -183,7 +183,7 @@ static gpointer meebo_find_parent(PurpleBListNode *node)
 	return default_manager->find_parent(node);
 }
 
-static FinchBListManager meebo_group =
+static FinchBlistManager meebo_group =
 {
 	"meebo",
 	N_("Meebo"),
@@ -212,12 +212,12 @@ static gboolean no_group_uninit()
 	return TRUE;
 }
 
-static gboolean no_group_can_add_node(PurpleBListNode *node)
+static gboolean no_group_can_add_node(PurpleBlistNode *node)
 {
 	return on_offline_can_add_node(node);   /* These happen to be the same */
 }
 
-static gpointer no_group_find_parent(PurpleBListNode *node)
+static gpointer no_group_find_parent(PurpleBlistNode *node)
 {
 	gpointer ret = NULL;
 
@@ -229,7 +229,7 @@ static gpointer no_group_find_parent(PurpleBListNode *node)
 	return ret;
 }
 
-static FinchBListManager no_group =
+static FinchBlistManager no_group =
 {
 	"no-group",
 	N_("No Grouping"),
@@ -263,12 +263,12 @@ nested_group_uninit(void)
 }
 
 static gpointer
-nested_group_find_parent(PurpleBListNode *node)
+nested_group_find_parent(PurpleBlistNode *node)
 {
 	char *name;
 	PurpleGroup *group;
 	char *sep;
-	PurpleBListNode *ret, *parent;
+	PurpleBlistNode *ret, *parent;
 	GntTree *tree;
 
 	if (!PURPLE_IS_GROUP(node))
@@ -307,7 +307,7 @@ nested_group_find_parent(PurpleBListNode *node)
 static gboolean
 nested_group_create_tooltip(gpointer selected_row, GString **body, char **title)
 {
-	PurpleBListNode *node = selected_row;
+	PurpleBlistNode *node = selected_row;
 	if (!node || !FINCH_IS_GROUPING_NODE(node))
 		return default_manager->create_tooltip(selected_row, body, title);
 	if (body)
@@ -316,9 +316,9 @@ nested_group_create_tooltip(gpointer selected_row, GString **body, char **title)
 }
 
 static gboolean
-nested_group_can_add_node(PurpleBListNode *node)
+nested_group_can_add_node(PurpleBlistNode *node)
 {
-	PurpleBListNode *group;
+	PurpleBlistNode *group;
 	int len;
 
 	if (!PURPLE_IS_GROUP(node))
@@ -340,7 +340,7 @@ nested_group_can_add_node(PurpleBListNode *node)
 	return FALSE;
 }
 
-static FinchBListManager nested_group =
+static FinchBlistManager nested_group =
 {
 	"nested",
 	N_("Nested Grouping (experimental)"),
diff --git a/libpurple/account.c b/libpurple/account.c
index 314ec8b9f5..2e2d537c20 100644
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -712,7 +712,7 @@ purple_account_request_change_user_info(PurpleAccount *account)
 void
 purple_account_set_username(PurpleAccount *account, const char *username)
 {
-	PurpleBListUiOps *blist_ops;
+	PurpleBlistUiOps *blist_ops;
 	PurpleAccountPrivate *priv;
 
 	g_return_if_fail(account != NULL);
@@ -1542,7 +1542,7 @@ purple_account_privacy_permit_add(PurpleAccount *account, const char *who,
 	GSList *l;
 	char *name;
 	PurpleBuddy *buddy;
-	PurpleBListUiOps *blist_ops;
+	PurpleBlistUiOps *blist_ops;
 	PurpleAccountPrivate *priv;
 	PurpleAccountUiOps *ui_ops = purple_accounts_get_ui_ops();
 
@@ -1594,7 +1594,7 @@ purple_account_privacy_permit_remove(PurpleAccount *account, const char *who,
 	const char *name;
 	PurpleBuddy *buddy;
 	char *del;
-	PurpleBListUiOps *blist_ops;
+	PurpleBlistUiOps *blist_ops;
 	PurpleAccountPrivate *priv;
 	PurpleAccountUiOps *ui_ops = purple_accounts_get_ui_ops();
 
@@ -1646,7 +1646,7 @@ purple_account_privacy_deny_add(PurpleAccount *account, const char *who,
 	GSList *l;
 	char *name;
 	PurpleBuddy *buddy;
-	PurpleBListUiOps *blist_ops;
+	PurpleBlistUiOps *blist_ops;
 	PurpleAccountPrivate *priv;
 	PurpleAccountUiOps *ui_ops = purple_accounts_get_ui_ops();
 
@@ -1697,7 +1697,7 @@ purple_account_privacy_deny_remove(PurpleAccount *account, const char *who,
 	const char *normalized;
 	char *name;
 	PurpleBuddy *buddy;
-	PurpleBListUiOps *blist_ops;
+	PurpleBlistUiOps *blist_ops;
 	PurpleAccountPrivate *priv;
 	PurpleAccountUiOps *ui_ops = purple_accounts_get_ui_ops();
 
diff --git a/libpurple/account.h b/libpurple/account.h
index faf55aefe7..fbca367fee 100644
--- a/libpurple/account.h
+++ b/libpurple/account.h
@@ -1076,7 +1076,7 @@ void purple_account_add_buddy(PurpleAccount *account, PurpleBuddy *buddy, const
  * Adds a list of buddies to the server-side buddy list.
  *
  * @param account The account.
- * @param buddies The list of PurpleBListNodes representing the buddies to add.
+ * @param buddies The list of PurpleBlistNodes representing the buddies to add.
  * @param message The invite message.  This may be ignored by a prpl.
  */
 void purple_account_add_buddies(PurpleAccount *account, GList *buddies, const char *message);
diff --git a/libpurple/accounts.c b/libpurple/accounts.c
index b13cb293f5..496459f005 100644
--- a/libpurple/accounts.c
+++ b/libpurple/accounts.c
@@ -647,7 +647,7 @@ purple_accounts_delete_set(PurpleAccount *account, GError *error, gpointer data)
 void
 purple_accounts_delete(PurpleAccount *account)
 {
-	PurpleBListNode *gnode, *cnode, *bnode;
+	PurpleBlistNode *gnode, *cnode, *bnode;
 	GList *iter;
 
 	g_return_if_fail(account != NULL);
@@ -675,12 +675,12 @@ purple_accounts_delete(PurpleAccount *account)
 
 		cnode = purple_blist_node_get_first_child(gnode);
 		while (cnode) {
-			PurpleBListNode *cnode_next = purple_blist_node_get_sibling_next(cnode);
+			PurpleBlistNode *cnode_next = purple_blist_node_get_sibling_next(cnode);
 
 			if(PURPLE_IS_CONTACT(cnode)) {
 				bnode = purple_blist_node_get_first_child(cnode);
 				while (bnode) {
-					PurpleBListNode *bnode_next = purple_blist_node_get_sibling_next(bnode);
+					PurpleBlistNode *bnode_next = purple_blist_node_get_sibling_next(bnode);
 
 					if (PURPLE_IS_BUDDY(bnode)) {
 						PurpleBuddy *b = (PurpleBuddy *)bnode;
diff --git a/libpurple/blistnode.c b/libpurple/blistnode.c
index f622b79ea1..334bf23bbe 100644
--- a/libpurple/blistnode.c
+++ b/libpurple/blistnode.c
@@ -24,10 +24,10 @@
 #include "internal.h"
 
 #define PURPLE_BLIST_NODE_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_BLIST_NODE, PurpleBListNodePrivate))
+	(G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_BLIST_NODE, PurpleBlistNodePrivate))
 
-/** @copydoc _PurpleBListNodePrivate */
-typedef struct _PurpleBListNodePrivate  PurpleBListNodePrivate;
+/** @copydoc _PurpleBlistNodePrivate */
+typedef struct _PurpleBlistNodePrivate  PurpleBlistNodePrivate;
 
 #define PURPLE_COUNTING_NODE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_COUNTING_NODE, PurpleCountingNodePrivate))
@@ -36,12 +36,12 @@ typedef struct _PurpleBListNodePrivate  PurpleBListNodePrivate;
 typedef struct _PurpleCountingNodePrivate  PurpleCountingNodePrivate;
 
 /** Private data of a buddy list node */
-struct _PurpleBListNodePrivate {
+struct _PurpleBlistNodePrivate {
 	GHashTable *settings;  /**< per-node settings                            */
 	gboolean dont_save;    /**< node should not be saved with the buddy list */
 };
 
-/* BList node property enums */
+/* Blist node property enums */
 enum
 {
 	BLNODE_PROP_0,
@@ -74,7 +74,7 @@ static GObjectClass *parent_class;
 /* Buddy list node API                                                    */
 /**************************************************************************/
 
-static PurpleBListNode *get_next_node(PurpleBListNode *node, gboolean godeep)
+static PurpleBlistNode *get_next_node(PurpleBlistNode *node, gboolean godeep)
 {
 	if (node == NULL)
 		return NULL;
@@ -88,9 +88,9 @@ static PurpleBListNode *get_next_node(PurpleBListNode *node, gboolean godeep)
 	return get_next_node(node->parent, FALSE);
 }
 
-PurpleBListNode *purple_blist_node_next(PurpleBListNode *node, gboolean offline)
+PurpleBlistNode *purple_blist_node_next(PurpleBlistNode *node, gboolean offline)
 {
-	PurpleBListNode *ret = node;
+	PurpleBlistNode *ret = node;
 
 	if (offline)
 		return get_next_node(ret, TRUE);
@@ -103,28 +103,28 @@ PurpleBListNode *purple_blist_node_next(PurpleBListNode *node, gboolean offline)
 	return ret;
 }
 
-PurpleBListNode *purple_blist_node_get_parent(PurpleBListNode *node)
+PurpleBlistNode *purple_blist_node_get_parent(PurpleBlistNode *node)
 {
 	return node ? node->parent : NULL;
 }
 
-PurpleBListNode *purple_blist_node_get_first_child(PurpleBListNode *node)
+PurpleBlistNode *purple_blist_node_get_first_child(PurpleBlistNode *node)
 {
 	return node ? node->child : NULL;
 }
 
-PurpleBListNode *purple_blist_node_get_sibling_next(PurpleBListNode *node)
+PurpleBlistNode *purple_blist_node_get_sibling_next(PurpleBlistNode *node)
 {
 	return node? node->next : NULL;
 }
 
-PurpleBListNode *purple_blist_node_get_sibling_prev(PurpleBListNode *node)
+PurpleBlistNode *purple_blist_node_get_sibling_prev(PurpleBlistNode *node)
 {
 	return node? node->prev : NULL;
 }
 
 void *
-purple_blist_node_get_ui_data(const PurpleBListNode *node)
+purple_blist_node_get_ui_data(const PurpleBlistNode *node)
 {
 	g_return_val_if_fail(node, NULL);
 
@@ -132,16 +132,16 @@ purple_blist_node_get_ui_data(const PurpleBListNode *node)
 }
 
 void
-purple_blist_node_set_ui_data(PurpleBListNode *node, void *ui_data) {
+purple_blist_node_set_ui_data(PurpleBlistNode *node, void *ui_data) {
 	g_return_if_fail(node);
 
 	node->ui_data = ui_data;
 }
 
-void purple_blist_node_remove_setting(PurpleBListNode *node, const char *key)
+void purple_blist_node_remove_setting(PurpleBlistNode *node, const char *key)
 {
-	PurpleBListUiOps *ops;
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
+	PurpleBlistUiOps *ops;
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
 
 	g_return_if_fail(priv != NULL);
 	g_return_if_fail(priv->settings != NULL);
@@ -155,9 +155,9 @@ void purple_blist_node_remove_setting(PurpleBListNode *node, const char *key)
 }
 
 void
-purple_blist_node_set_dont_save(PurpleBListNode *node, gboolean dont_save)
+purple_blist_node_set_dont_save(PurpleBlistNode *node, gboolean dont_save)
 {
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
 
 	g_return_if_fail(priv != NULL);
 
@@ -165,9 +165,9 @@ purple_blist_node_set_dont_save(PurpleBListNode *node, gboolean dont_save)
 }
 
 gboolean
-purple_blist_node_get_dont_save(PurpleBListNode *node)
+purple_blist_node_get_dont_save(PurpleBlistNode *node)
 {
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
 
 	g_return_val_if_fail(priv != NULL, 0);
 
@@ -175,9 +175,9 @@ purple_blist_node_get_dont_save(PurpleBListNode *node)
 }
 
 GHashTable *
-purple_blist_node_get_settings(PurpleBListNode *node)
+purple_blist_node_get_settings(PurpleBlistNode *node)
 {
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
 
 	g_return_val_if_fail(priv != NULL, NULL);
 
@@ -185,9 +185,9 @@ purple_blist_node_get_settings(PurpleBListNode *node)
 }
 
 gboolean
-purple_blist_node_has_setting(PurpleBListNode* node, const char *key)
+purple_blist_node_has_setting(PurpleBlistNode* node, const char *key)
 {
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
 
 	g_return_val_if_fail(priv != NULL, FALSE);
 	g_return_val_if_fail(priv->settings != NULL, FALSE);
@@ -198,11 +198,11 @@ purple_blist_node_has_setting(PurpleBListNode* node, const char *key)
 }
 
 void
-purple_blist_node_set_bool(PurpleBListNode* node, const char *key, gboolean data)
+purple_blist_node_set_bool(PurpleBlistNode* node, const char *key, gboolean data)
 {
 	GValue *value;
-	PurpleBListUiOps *ops;
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
+	PurpleBlistUiOps *ops;
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
 
 	g_return_if_fail(priv != NULL);
 	g_return_if_fail(priv->settings != NULL);
@@ -219,10 +219,10 @@ purple_blist_node_set_bool(PurpleBListNode* node, const char *key, gboolean data
 }
 
 gboolean
-purple_blist_node_get_bool(PurpleBListNode* node, const char *key)
+purple_blist_node_get_bool(PurpleBlistNode* node, const char *key)
 {
 	GValue *value;
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
 
 	g_return_val_if_fail(priv != NULL, FALSE);
 	g_return_val_if_fail(priv->settings != NULL, FALSE);
@@ -239,11 +239,11 @@ purple_blist_node_get_bool(PurpleBListNode* node, const char *key)
 }
 
 void
-purple_blist_node_set_int(PurpleBListNode* node, const char *key, int data)
+purple_blist_node_set_int(PurpleBlistNode* node, const char *key, int data)
 {
 	GValue *value;
-	PurpleBListUiOps *ops;
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
+	PurpleBlistUiOps *ops;
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
 
 	g_return_if_fail(priv != NULL);
 	g_return_if_fail(priv->settings != NULL);
@@ -260,10 +260,10 @@ purple_blist_node_set_int(PurpleBListNode* node, const char *key, int data)
 }
 
 int
-purple_blist_node_get_int(PurpleBListNode* node, const char *key)
+purple_blist_node_get_int(PurpleBlistNode* node, const char *key)
 {
 	GValue *value;
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
 
 	g_return_val_if_fail(priv != NULL, 0);
 	g_return_val_if_fail(priv->settings != NULL, 0);
@@ -280,11 +280,11 @@ purple_blist_node_get_int(PurpleBListNode* node, const char *key)
 }
 
 void
-purple_blist_node_set_string(PurpleBListNode* node, const char *key, const char *data)
+purple_blist_node_set_string(PurpleBlistNode* node, const char *key, const char *data)
 {
 	GValue *value;
-	PurpleBListUiOps *ops;
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
+	PurpleBlistUiOps *ops;
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
 
 	g_return_if_fail(priv != NULL);
 	g_return_if_fail(priv->settings != NULL);
@@ -301,10 +301,10 @@ purple_blist_node_set_string(PurpleBListNode* node, const char *key, const char
 }
 
 const char *
-purple_blist_node_get_string(PurpleBListNode* node, const char *key)
+purple_blist_node_get_string(PurpleBlistNode* node, const char *key)
 {
 	GValue *value;
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
 
 	g_return_val_if_fail(priv != NULL, NULL);
 	g_return_val_if_fail(priv->settings != NULL, NULL);
@@ -321,7 +321,7 @@ purple_blist_node_get_string(PurpleBListNode* node, const char *key)
 }
 
 GList *
-purple_blist_node_get_extended_menu(PurpleBListNode *n)
+purple_blist_node_get_extended_menu(PurpleBlistNode *n)
 {
 	GList *menu = NULL;
 
@@ -333,7 +333,7 @@ purple_blist_node_get_extended_menu(PurpleBListNode *n)
 }
 
 /**************************************************************************
- * GObject code for PurpleBListNode
+ * GObject code for PurpleBlistNode
  **************************************************************************/
 
 /* GObject Property names */
@@ -344,7 +344,7 @@ static void
 purple_blist_node_set_property(GObject *obj, guint param_id, const GValue *value,
 		GParamSpec *pspec)
 {
-	PurpleBListNode *node = PURPLE_BLIST_NODE(obj);
+	PurpleBlistNode *node = PURPLE_BLIST_NODE(obj);
 
 	switch (param_id) {
 		case BLNODE_PROP_DONT_SAVE:
@@ -361,7 +361,7 @@ static void
 purple_blist_node_get_property(GObject *obj, guint param_id, GValue *value,
 		GParamSpec *pspec)
 {
-	PurpleBListNode *node = PURPLE_BLIST_NODE(obj);
+	PurpleBlistNode *node = PURPLE_BLIST_NODE(obj);
 
 	switch (param_id) {
 		case BLNODE_PROP_DONT_SAVE:
@@ -377,7 +377,7 @@ purple_blist_node_get_property(GObject *obj, guint param_id, GValue *value,
 static void
 purple_blist_node_init(GTypeInstance *instance, gpointer klass)
 {
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(instance);
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(instance);
 
 	priv->settings = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
 			(GDestroyNotify)purple_g_value_free);
@@ -387,7 +387,7 @@ purple_blist_node_init(GTypeInstance *instance, gpointer klass)
 static void
 purple_blist_node_finalize(GObject *object)
 {
-	PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(object);
+	PurpleBlistNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(object);
 
 	g_hash_table_destroy(priv->settings);
 
@@ -396,7 +396,7 @@ purple_blist_node_finalize(GObject *object)
 
 /* Class initializer function */
 static void
-purple_blist_node_class_init(PurpleBListNodeClass *klass)
+purple_blist_node_class_init(PurpleBlistNodeClass *klass)
 {
 	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
 
@@ -414,7 +414,7 @@ purple_blist_node_class_init(PurpleBListNodeClass *klass)
 				FALSE, G_PARAM_READWRITE)
 			);
 
-	g_type_class_add_private(klass, sizeof(PurpleBListNodePrivate));
+	g_type_class_add_private(klass, sizeof(PurpleBlistNodePrivate));
 }
 
 GType
@@ -424,19 +424,19 @@ purple_blist_node_get_type(void)
 
 	if(type == 0) {
 		static const GTypeInfo info = {
-			sizeof(PurpleBListNodeClass),
+			sizeof(PurpleBlistNodeClass),
 			NULL,
 			NULL,
 			(GClassInitFunc)purple_blist_node_class_init,
 			NULL,
 			NULL,
-			sizeof(PurpleBListNode),
+			sizeof(PurpleBlistNode),
 			0,
 			(GInstanceInitFunc)purple_blist_node_init,
 			NULL,
 		};
 
-		type = g_type_register_static(G_TYPE_OBJECT, "PurpleBListNode",
+		type = g_type_register_static(G_TYPE_OBJECT, "PurpleBlistNode",
 				&info, G_TYPE_FLAG_ABSTRACT);
 	}
 
diff --git a/libpurple/blistnode.h b/libpurple/blistnode.h
index af650d11f4..116aa920ce 100644
--- a/libpurple/blistnode.h
+++ b/libpurple/blistnode.h
@@ -29,16 +29,16 @@
 #include <glib-object.h>
 
 #define PURPLE_TYPE_BLIST_NODE             (purple_blist_node_get_type())
-#define PURPLE_BLIST_NODE(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_BLIST_NODE, PurpleBListNode))
-#define PURPLE_BLIST_NODE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_BLIST_NODE, PurpleBListNodeClass))
+#define PURPLE_BLIST_NODE(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_BLIST_NODE, PurpleBlistNode))
+#define PURPLE_BLIST_NODE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_BLIST_NODE, PurpleBlistNodeClass))
 #define PURPLE_IS_BLIST_NODE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_BLIST_NODE))
 #define PURPLE_IS_BLIST_NODE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_BLIST_NODE))
-#define PURPLE_BLIST_NODE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_BLIST_NODE, PurpleBListNodeClass))
+#define PURPLE_BLIST_NODE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_BLIST_NODE, PurpleBlistNodeClass))
 
-/** @copydoc _PurpleBListNode */
-typedef struct _PurpleBListNode PurpleBListNode;
-/** @copydoc _PurpleBListNodeClass */
-typedef struct _PurpleBListNodeClass PurpleBListNodeClass;
+/** @copydoc _PurpleBlistNode */
+typedef struct _PurpleBlistNode PurpleBlistNode;
+/** @copydoc _PurpleBlistNodeClass */
+typedef struct _PurpleBlistNodeClass PurpleBlistNodeClass;
 
 #define PURPLE_TYPE_COUNTING_NODE             (purple_counting_node_get_type())
 #define PURPLE_COUNTING_NODE(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_COUNTING_NODE, PurpleCountingNode))
@@ -60,7 +60,7 @@ typedef struct _PurpleCountingNodeClass PurpleCountingNodeClass;
  * A Buddy list node.  This can represent a group, a buddy, or anything else.
  * This is a base class for PurpleBuddy, PurpleContact, PurpleGroup, and for
  * anything else that wants to put itself in the buddy list. */
-struct _PurpleBListNode {
+struct _PurpleBlistNode {
 	/*< private >*/
 	GObject gparent;
 
@@ -69,14 +69,14 @@ struct _PurpleBListNode {
 	 */
 	gpointer ui_data;
 
-	PurpleBListNode *prev;    /**< The sibling before this buddy. */
-	PurpleBListNode *next;    /**< The sibling after this buddy.  */
-	PurpleBListNode *parent;  /**< The parent of this node        */
-	PurpleBListNode *child;   /**< The child of this node         */
+	PurpleBlistNode *prev;    /**< The sibling before this buddy. */
+	PurpleBlistNode *next;    /**< The sibling after this buddy.  */
+	PurpleBlistNode *parent;  /**< The parent of this node        */
+	PurpleBlistNode *child;   /**< The child of this node         */
 };
 
-/** The base class for all #PurpleBListNode's. */
-struct _PurpleBListNodeClass {
+/** The base class for all #PurpleBlistNode's. */
+struct _PurpleBlistNodeClass {
 	/*< private >*/
 	GObjectClass gparent_class;
 
@@ -100,13 +100,13 @@ struct _PurpleBListNodeClass {
  */
 struct _PurpleCountingNode {
 	/** The blist node that this counting node inherits from */
-	PurpleBListNode node;
+	PurpleBlistNode node;
 };
 
 /** The base class for all #PurpleCountingNode's. */
 struct _PurpleCountingNodeClass {
 	/*< private >*/
-	PurpleBListNodeClass node_class;
+	PurpleBlistNodeClass node_class;
 
 	void (*_purple_reserved1)(void);
 	void (*_purple_reserved2)(void);
@@ -122,7 +122,7 @@ G_BEGIN_DECLS
 /*@{*/
 
 /**
- * Returns the GType for the PurpleBListNode object.
+ * Returns the GType for the PurpleBlistNode object.
  */
 GType purple_blist_node_get_type(void);
 
@@ -138,7 +138,7 @@ GType purple_blist_node_get_type(void);
  * @see purple_blist_node_get_sibling_next
  * @see purple_blist_node_get_sibling_prev
  */
-PurpleBListNode *purple_blist_node_next(PurpleBListNode *node, gboolean offline);
+PurpleBlistNode *purple_blist_node_next(PurpleBlistNode *node, gboolean offline);
 
 /**
  * Returns the parent node of a given node.
@@ -151,7 +151,7 @@ PurpleBListNode *purple_blist_node_next(PurpleBListNode *node, gboolean offline)
  * @see purple_blist_node_get_sibling_prev
  * @see purple_blist_node_next
  */
-PurpleBListNode *purple_blist_node_get_parent(PurpleBListNode *node);
+PurpleBlistNode *purple_blist_node_get_parent(PurpleBlistNode *node);
 
 /**
  * Returns the the first child node of a given node.
@@ -164,7 +164,7 @@ PurpleBListNode *purple_blist_node_get_parent(PurpleBListNode *node);
  * @see purple_blist_node_get_sibling_prev
  * @see purple_blist_node_next
  */
-PurpleBListNode *purple_blist_node_get_first_child(PurpleBListNode *node);
+PurpleBlistNode *purple_blist_node_get_first_child(PurpleBlistNode *node);
 
 /**
  * Returns the sibling node of a given node.
@@ -177,7 +177,7 @@ PurpleBListNode *purple_blist_node_get_first_child(PurpleBListNode *node);
  * @see purple_blist_node_get_sibling_prev
  * @see purple_blist_node_next
  */
-PurpleBListNode *purple_blist_node_get_sibling_next(PurpleBListNode *node);
+PurpleBlistNode *purple_blist_node_get_sibling_next(PurpleBlistNode *node);
 
 /**
  * Returns the previous sibling node of a given node.
@@ -190,7 +190,7 @@ PurpleBListNode *purple_blist_node_get_sibling_next(PurpleBListNode *node);
  * @see purple_blist_node_get_sibling_next
  * @see purple_blist_node_next
  */
-PurpleBListNode *purple_blist_node_get_sibling_prev(PurpleBListNode *node);
+PurpleBlistNode *purple_blist_node_get_sibling_prev(PurpleBlistNode *node);
 
 /**
  * Returns the UI data of a given node.
@@ -198,7 +198,7 @@ PurpleBListNode *purple_blist_node_get_sibling_prev(PurpleBListNode *node);
  * @param node The node.
  * @return The UI data.
  */
-gpointer purple_blist_node_get_ui_data(const PurpleBListNode *node);
+gpointer purple_blist_node_get_ui_data(const PurpleBlistNode *node);
 
 /**
  * Sets the UI data of a given node.
@@ -206,7 +206,7 @@ gpointer purple_blist_node_get_ui_data(const PurpleBListNode *node);
  * @param node The node.
  * @param ui_data The UI data.
  */
-void purple_blist_node_set_ui_data(PurpleBListNode *node, gpointer ui_data);
+void purple_blist_node_set_ui_data(PurpleBlistNode *node, gpointer ui_data);
 
 /**
  * Returns a node's settings
@@ -215,7 +215,7 @@ void purple_blist_node_set_ui_data(PurpleBListNode *node, gpointer ui_data);
  *
  * @return The hash table with the node's settings
  */
-GHashTable *purple_blist_node_get_settings(PurpleBListNode *node);
+GHashTable *purple_blist_node_get_settings(PurpleBlistNode *node);
 
 /**
  * Checks whether a named setting exists for a node in the buddy list
@@ -225,7 +225,7 @@ GHashTable *purple_blist_node_get_settings(PurpleBListNode *node);
  *
  * @return TRUE if a value exists, or FALSE if there is no setting
  */
-gboolean purple_blist_node_has_setting(PurpleBListNode *node, const char *key);
+gboolean purple_blist_node_has_setting(PurpleBlistNode *node, const char *key);
 
 /**
  * Associates a boolean with a node in the buddy list
@@ -234,7 +234,7 @@ gboolean purple_blist_node_has_setting(PurpleBListNode *node, const char *key);
  * @param key   The identifier for the data
  * @param value The value to set
  */
-void purple_blist_node_set_bool(PurpleBListNode *node, const char *key, gboolean value);
+void purple_blist_node_set_bool(PurpleBlistNode *node, const char *key, gboolean value);
 
 /**
  * Retrieves a named boolean setting from a node in the buddy list
@@ -244,7 +244,7 @@ void purple_blist_node_set_bool(PurpleBListNode *node, const char *key, gboolean
  *
  * @return The value, or FALSE if there is no setting
  */
-gboolean purple_blist_node_get_bool(PurpleBListNode *node, const char *key);
+gboolean purple_blist_node_get_bool(PurpleBlistNode *node, const char *key);
 
 /**
  * Associates an integer with a node in the buddy list
@@ -253,7 +253,7 @@ gboolean purple_blist_node_get_bool(PurpleBListNode *node, const char *key);
  * @param key   The identifier for the data
  * @param value The value to set
  */
-void purple_blist_node_set_int(PurpleBListNode *node, const char *key, int value);
+void purple_blist_node_set_int(PurpleBlistNode *node, const char *key, int value);
 
 /**
  * Retrieves a named integer setting from a node in the buddy list
@@ -263,7 +263,7 @@ void purple_blist_node_set_int(PurpleBListNode *node, const char *key, int value
  *
  * @return The value, or 0 if there is no setting
  */
-int purple_blist_node_get_int(PurpleBListNode *node, const char *key);
+int purple_blist_node_get_int(PurpleBlistNode *node, const char *key);
 
 /**
  * Associates a string with a node in the buddy list
@@ -272,7 +272,7 @@ int purple_blist_node_get_int(PurpleBListNode *node, const char *key);
  * @param key   The identifier for the data
  * @param value The value to set
  */
-void purple_blist_node_set_string(PurpleBListNode *node, const char *key,
+void purple_blist_node_set_string(PurpleBlistNode *node, const char *key,
 		const char *value);
 
 /**
@@ -283,7 +283,7 @@ void purple_blist_node_set_string(PurpleBListNode *node, const char *key,
  *
  * @return The value, or NULL if there is no setting
  */
-const char *purple_blist_node_get_string(PurpleBListNode *node, const char *key);
+const char *purple_blist_node_get_string(PurpleBlistNode *node, const char *key);
 
 /**
  * Removes a named setting from a blist node
@@ -291,7 +291,7 @@ const char *purple_blist_node_get_string(PurpleBListNode *node, const char *key)
  * @param node  The node from which to remove the setting
  * @param key   The name of the setting
  */
-void purple_blist_node_remove_setting(PurpleBListNode *node, const char *key);
+void purple_blist_node_remove_setting(PurpleBlistNode *node, const char *key);
 
 /**
  * Sets whether the node should be saved with the buddy list or not
@@ -300,7 +300,7 @@ void purple_blist_node_remove_setting(PurpleBListNode *node, const char *key);
  * @param dont_save TRUE if the node should NOT be saved, FALSE if node should
  *                  be saved
  */
-void purple_blist_node_set_dont_save(PurpleBListNode *node, gboolean dont_save);
+void purple_blist_node_set_dont_save(PurpleBlistNode *node, gboolean dont_save);
 
 /**
  * Gets whether the node should be saved with the buddy list or not
@@ -309,7 +309,7 @@ void purple_blist_node_set_dont_save(PurpleBListNode *node, gboolean dont_save);
  *
  * @return TRUE if the node should NOT be saved, FALSE if node should be saved
  */
-gboolean purple_blist_node_get_dont_save(PurpleBListNode *node);
+gboolean purple_blist_node_get_dont_save(PurpleBlistNode *node);
 
 /*@}*/
 
@@ -319,7 +319,7 @@ gboolean purple_blist_node_get_dont_save(PurpleBListNode *node);
  * @return  A list of PurpleMenuAction items, as harvested by the
  *          blist-node-extended-menu signal.
  */
-GList *purple_blist_node_get_extended_menu(PurpleBListNode *n);
+GList *purple_blist_node_get_extended_menu(PurpleBlistNode *n);
 
 /*@}*/
 
diff --git a/libpurple/blistnodetypes.c b/libpurple/blistnodetypes.c
index b6aec1c25a..190ab04df0 100644
--- a/libpurple/blistnodetypes.c
+++ b/libpurple/blistnodetypes.c
@@ -129,7 +129,7 @@ enum
 	CHAT_PROP_LAST
 };
 
-static PurpleBListNode     *blistnode_parent_class;
+static PurpleBlistNode     *blistnode_parent_class;
 static PurpleCountingNode  *counting_parent_class;
 
 static gboolean
@@ -139,7 +139,7 @@ purple_strings_are_different(const char *one, const char *two)
 			((one == NULL || *one == '\0') && (two == NULL || *two == '\0')));
 }
 
-PurpleBListNode *_purple_blist_get_last_child(PurpleBListNode *node);
+PurpleBlistNode *_purple_blist_get_last_child(PurpleBlistNode *node);
 
 /**************************************************************************/
 /* Buddy API                                                              */
@@ -148,7 +148,7 @@ PurpleBListNode *_purple_blist_get_last_child(PurpleBListNode *node);
 void
 purple_buddy_set_icon(PurpleBuddy *buddy, PurpleBuddyIcon *icon)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleBuddyPrivate *priv = PURPLE_BUDDY_GET_PRIVATE(buddy);
 
 	g_return_if_fail(priv != NULL);
@@ -189,7 +189,7 @@ void
 purple_buddy_set_name(PurpleBuddy *buddy, const char *name)
 {
 	PurpleBuddyPrivate *priv = PURPLE_BUDDY_GET_PRIVATE(buddy);
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 
 	g_return_if_fail(priv != NULL);
 
@@ -300,7 +300,7 @@ const char *purple_buddy_get_alias(PurpleBuddy *buddy)
 void
 purple_buddy_set_local_alias(PurpleBuddy *buddy, const char *alias)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleIMConversation *im;
 	char *old_alias;
 	char *new_alias = NULL;
@@ -353,7 +353,7 @@ const char *purple_buddy_get_local_alias(PurpleBuddy *buddy)
 void
 purple_buddy_set_server_alias(PurpleBuddy *buddy, const char *alias)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleIMConversation *im;
 	char *old_alias;
 	char *new_alias = NULL;
@@ -427,10 +427,10 @@ void
 purple_buddy_update_status(PurpleBuddy *buddy, PurpleStatus *old_status)
 {
 	PurpleStatus *status;
-	PurpleBListNode *cnode;
+	PurpleBlistNode *cnode;
 	PurpleContact *contact;
 	PurpleCountingNode *contact_counter, *group_counter;
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleBuddyPrivate *priv = PURPLE_BUDDY_GET_PRIVATE(buddy);
 
 	g_return_if_fail(priv != NULL);
@@ -611,7 +611,7 @@ purple_buddy_constructed(GObject *object)
 {
 	PurpleBuddy *buddy = PURPLE_BUDDY(object);
 	PurpleBuddyPrivate *priv = PURPLE_BUDDY_GET_PRIVATE(buddy);
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 
 	G_OBJECT_CLASS(blistnode_parent_class)->constructed(object);
 
@@ -619,7 +619,7 @@ purple_buddy_constructed(GObject *object)
 	purple_presence_set_status_active(priv->presence, "offline", TRUE);
 
 	if (ops && ops->new_node)
-		ops->new_node((PurpleBListNode *)buddy);
+		ops->new_node((PurpleBlistNode *)buddy);
 }
 
 /* GObject dispose function */
@@ -772,7 +772,7 @@ purple_buddy_new(PurpleAccount *account, const char *name, const char *alias)
 static void
 purple_contact_compute_priority_buddy(PurpleContact *contact)
 {
-	PurpleBListNode *bnode;
+	PurpleBlistNode *bnode;
 	PurpleBuddy *new_priority = NULL;
 	PurpleContactPrivate *priv = PURPLE_CONTACT_GET_PRIVATE(contact);
 
@@ -826,9 +826,9 @@ purple_contact_get_group(const PurpleContact *contact)
 void
 purple_contact_set_alias(PurpleContact *contact, const char *alias)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleIMConversation *im;
-	PurpleBListNode *bnode;
+	PurpleBlistNode *bnode;
 	char *old_alias;
 	char *new_alias = NULL;
 	PurpleContactPrivate *priv = PURPLE_CONTACT_GET_PRIVATE(contact);
@@ -888,7 +888,7 @@ const char *purple_contact_get_alias(PurpleContact* contact)
 
 gboolean purple_contact_on_account(PurpleContact *c, PurpleAccount *account)
 {
-	PurpleBListNode *bnode, *cnode = (PurpleBListNode *) c;
+	PurpleBlistNode *bnode, *cnode = (PurpleBlistNode *) c;
 
 	g_return_val_if_fail(c != NULL, FALSE);
 	g_return_val_if_fail(account != NULL, FALSE);
@@ -927,10 +927,10 @@ PurpleBuddy *purple_contact_get_priority_buddy(PurpleContact *contact)
 	return priv->priority_buddy;
 }
 
-void purple_contact_merge(PurpleContact *source, PurpleBListNode *node)
+void purple_contact_merge(PurpleContact *source, PurpleBlistNode *node)
 {
-	PurpleBListNode *sourcenode = (PurpleBListNode*)source;
-	PurpleBListNode *prev, *cur, *next;
+	PurpleBlistNode *sourcenode = (PurpleBlistNode*)source;
+	PurpleBlistNode *prev, *cur, *next;
 	PurpleContact *target;
 
 	g_return_if_fail(source != NULL);
@@ -1012,7 +1012,7 @@ static void
 purple_contact_init(GTypeInstance *instance, gpointer klass)
 {
 	PurpleContact *contact = PURPLE_CONTACT(instance);
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 
 	if (ops && ops->new_node)
 		ops->new_node(PURPLE_BLIST_NODE(contact));
@@ -1143,7 +1143,7 @@ const char *purple_chat_get_name_only(PurpleChat *chat)
 void
 purple_chat_set_alias(PurpleChat *chat, const char *alias)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	char *old_alias;
 	char *new_alias = NULL;
 	PurpleChatPrivate *priv = PURPLE_CHAT_GET_PRIVATE(chat);
@@ -1276,7 +1276,7 @@ static void
 purple_chat_constructed(GObject *object)
 {
 	PurpleChat *chat = PURPLE_CHAT(object);
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 
 	G_OBJECT_CLASS(blistnode_parent_class)->constructed(object);
 
@@ -1388,9 +1388,9 @@ purple_chat_new(PurpleAccount *account, const char *alias, GHashTable *component
 GSList *purple_group_get_accounts(PurpleGroup *group)
 {
 	GSList *l = NULL;
-	PurpleBListNode *gnode, *cnode, *bnode;
+	PurpleBlistNode *gnode, *cnode, *bnode;
 
-	gnode = (PurpleBListNode *)group;
+	gnode = (PurpleBlistNode *)group;
 
 	for (cnode = gnode->child;  cnode; cnode = cnode->next) {
 		if (PURPLE_IS_CHAT(cnode)) {
@@ -1411,8 +1411,8 @@ GSList *purple_group_get_accounts(PurpleGroup *group)
 
 gboolean purple_group_on_account(PurpleGroup *g, PurpleAccount *account)
 {
-	PurpleBListNode *cnode;
-	for (cnode = ((PurpleBListNode *)g)->child; cnode; cnode = cnode->next) {
+	PurpleBlistNode *cnode;
+	for (cnode = ((PurpleBlistNode *)g)->child; cnode; cnode = cnode->next) {
 		if (PURPLE_IS_CONTACT(cnode)) {
 			if(purple_contact_on_account((PurpleContact *) cnode, account))
 				return TRUE;
@@ -1431,7 +1431,7 @@ gboolean purple_group_on_account(PurpleGroup *g, PurpleAccount *account)
  */
 void purple_group_set_name(PurpleGroup *source, const char *name)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleGroup *dest;
 	gchar *old_name;
 	gchar *new_name;
@@ -1453,9 +1453,9 @@ void purple_group_set_name(PurpleGroup *source, const char *name)
 	if (dest != NULL && purple_utf8_strcasecmp(priv->name,
 				PURPLE_GROUP_GET_PRIVATE(dest)->name) != 0) {
 		/* We're merging two groups */
-		PurpleBListNode *prev, *child, *next;
+		PurpleBlistNode *prev, *child, *next;
 
-		prev = _purple_blist_get_last_child((PurpleBListNode*)dest);
+		prev = _purple_blist_get_last_child((PurpleBlistNode*)dest);
 		child = PURPLE_BLIST_NODE(source)->child;
 
 		/*
@@ -1468,7 +1468,7 @@ void purple_group_set_name(PurpleGroup *source, const char *name)
 		{
 			next = child->next;
 			if (PURPLE_IS_CONTACT(child)) {
-				PurpleBListNode *bnode;
+				PurpleBlistNode *bnode;
 				purple_blist_add_contact((PurpleContact *)child, dest, prev);
 				for (bnode = child->child; bnode != NULL; bnode = bnode->next) {
 					purple_blist_add_buddy((PurpleBuddy *)bnode, (PurpleContact *)child,
@@ -1493,7 +1493,7 @@ void purple_group_set_name(PurpleGroup *source, const char *name)
 		g_free(new_name);
 	} else {
 		/* A simple rename */
-		PurpleBListNode *cnode, *bnode;
+		PurpleBlistNode *cnode, *bnode;
 
 		/* Build a GList of all buddies in this group */
 		for (cnode = PURPLE_BLIST_NODE(source)->child; cnode != NULL; cnode = cnode->next) {
@@ -1541,7 +1541,7 @@ void purple_group_set_name(PurpleGroup *source, const char *name)
 				PurpleBuddy *buddy = PURPLE_BUDDY(l->data);
 
 				if(buddy && purple_buddy_get_account(buddy) == account)
-					buddies = g_list_append(buddies, (PurpleBListNode *)buddy);
+					buddies = g_list_append(buddies, (PurpleBlistNode *)buddy);
 			}
 
 			if(prpl_info->rename_group) {
@@ -1551,7 +1551,7 @@ void purple_group_set_name(PurpleGroup *source, const char *name)
 
 				/* Make a list of what the groups each buddy is in */
 				for(cur = buddies; cur; cur = cur->next) {
-					PurpleBListNode *node = (PurpleBListNode *)cur->data;
+					PurpleBlistNode *node = (PurpleBlistNode *)cur->data;
 					groups = g_list_prepend(groups, node->parent->parent);
 				}
 
@@ -1629,7 +1629,7 @@ static void
 purple_group_constructed(GObject *object)
 {
 	PurpleGroup *group = PURPLE_GROUP(object);
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 
 	G_OBJECT_CLASS(counting_parent_class)->constructed(object);
 
diff --git a/libpurple/blistnodetypes.h b/libpurple/blistnodetypes.h
index ef1ec27f91..578955bc7f 100644
--- a/libpurple/blistnodetypes.h
+++ b/libpurple/blistnodetypes.h
@@ -98,13 +98,13 @@ typedef struct _PurpleChatClass PurpleChatClass;
  */
 struct _PurpleBuddy {
 	/** The node that this buddy inherits from */
-	PurpleBListNode node;
+	PurpleBlistNode node;
 };
 
 /** The base class for all #PurpleBuddy's. */
 struct _PurpleBuddyClass {
 	/*< private >*/
-	PurpleBListNodeClass node_class;
+	PurpleBlistNodeClass node_class;
 
 	void (*_purple_reserved1)(void);
 	void (*_purple_reserved2)(void);
@@ -161,13 +161,13 @@ struct _PurpleGroupClass {
  */
 struct _PurpleChat {
 	/** The node that this chat inherits from */
-	PurpleBListNode node;
+	PurpleBlistNode node;
 };
 
 /** The base class for all #PurpleChat's. */
 struct _PurpleChatClass {
 	/*< private >*/
-	PurpleBListNodeClass node_class;
+	PurpleBlistNodeClass node_class;
 
 	void (*_purple_reserved1)(void);
 	void (*_purple_reserved2)(void);
@@ -467,7 +467,7 @@ void purple_contact_invalidate_priority_buddy(PurpleContact *contact);
  * @param source  The contact to merge
  * @param node    The place to merge to (a buddy or contact)
  */
-void purple_contact_merge(PurpleContact *source, PurpleBListNode *node);
+void purple_contact_merge(PurpleContact *source, PurpleBlistNode *node);
 
 /*@}*/
 
diff --git a/libpurple/buddyicon.c b/libpurple/buddyicon.c
index 89dcf2c0bb..edb3828bfe 100644
--- a/libpurple/buddyicon.c
+++ b/libpurple/buddyicon.c
@@ -95,7 +95,7 @@ static GHashTable *icon_data_cache = NULL;
 static GHashTable *icon_file_cache = NULL;
 
 /**
- * This hash table is used for both custom buddy icons on PurpleBListNodes and
+ * This hash table is used for both custom buddy icons on PurpleBlistNodes and
  * account icons.
  */
 static GHashTable *pointer_icon_cache = NULL;
@@ -105,7 +105,7 @@ static char       *cache_dir     = NULL;
 /** "Should icons be cached to disk?" */
 static gboolean    icon_caching  = TRUE;
 
-static void delete_buddy_icon_settings(PurpleBListNode *node, const char *setting_name);
+static void delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name);
 
 /*
  * Begin functions for dealing with the on-disk icon cache
@@ -399,32 +399,32 @@ purple_buddy_icon_update(PurpleBuddyIcon *icon)
 		char *old_icon;
 
 		purple_buddy_set_icon(buddy, icon_to_set);
-		old_icon = g_strdup(purple_blist_node_get_string((PurpleBListNode *)buddy,
+		old_icon = g_strdup(purple_blist_node_get_string((PurpleBlistNode *)buddy,
 		                                                 "buddy_icon"));
 		if (icon->img && purple_buddy_icons_is_caching())
 		{
 			const char *filename = purple_imgstore_get_filename(icon->img);
-			purple_blist_node_set_string((PurpleBListNode *)buddy,
+			purple_blist_node_set_string((PurpleBlistNode *)buddy,
 			                             "buddy_icon",
 			                             filename);
 
 			if (icon->checksum && *icon->checksum)
 			{
-				purple_blist_node_set_string((PurpleBListNode *)buddy,
+				purple_blist_node_set_string((PurpleBlistNode *)buddy,
 				                             "icon_checksum",
 				                             icon->checksum);
 			}
 			else
 			{
-				purple_blist_node_remove_setting((PurpleBListNode *)buddy,
+				purple_blist_node_remove_setting((PurpleBlistNode *)buddy,
 				                                 "icon_checksum");
 			}
 			ref_filename(filename);
 		}
 		else if (!icon->img)
 		{
-			purple_blist_node_remove_setting((PurpleBListNode *)buddy, "buddy_icon");
-			purple_blist_node_remove_setting((PurpleBListNode *)buddy, "icon_checksum");
+			purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "buddy_icon");
+			purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "icon_checksum");
 		}
 		unref_filename(old_icon);
 		g_free(old_icon);
@@ -559,9 +559,9 @@ purple_buddy_icons_set_for_user(PurpleAccount *account, const char *username,
 		{
 			PurpleBuddy *buddy = (PurpleBuddy *)buddies->data;
 
-			unref_filename(purple_blist_node_get_string((PurpleBListNode *)buddy, "buddy_icon"));
-			purple_blist_node_remove_setting((PurpleBListNode *)buddy, "buddy_icon");
-			purple_blist_node_remove_setting((PurpleBListNode *)buddy, "icon_checksum");
+			unref_filename(purple_blist_node_get_string((PurpleBlistNode *)buddy, "buddy_icon"));
+			purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "buddy_icon");
+			purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "icon_checksum");
 
 			buddies = g_slist_delete_link(buddies, buddies);
 		}
@@ -590,7 +590,7 @@ char *purple_buddy_icon_get_full_path(PurpleBuddyIcon *icon)
 const char *
 purple_buddy_icons_get_checksum_for_user(PurpleBuddy *buddy)
 {
-	return purple_blist_node_get_string((PurpleBListNode*)buddy,
+	return purple_blist_node_get_string((PurpleBlistNode*)buddy,
 	                                    "icon_checksum");
 }
 
@@ -635,7 +635,7 @@ purple_buddy_icons_find(PurpleAccount *account, const char *username)
 		if (!b)
 			return NULL;
 
-		protocol_icon_file = purple_blist_node_get_string((PurpleBListNode*)b, "buddy_icon");
+		protocol_icon_file = purple_blist_node_get_string((PurpleBlistNode*)b, "buddy_icon");
 
 		if (protocol_icon_file == NULL)
 			return NULL;
@@ -657,11 +657,11 @@ purple_buddy_icons_find(PurpleAccount *account, const char *username)
 
 				icon = purple_buddy_icon_create(account, username);
 				icon->img = NULL;
-				checksum = purple_blist_node_get_string((PurpleBListNode*)b, "icon_checksum");
+				checksum = purple_blist_node_get_string((PurpleBlistNode*)b, "icon_checksum");
 				purple_buddy_icon_set_data(icon, data, len, checksum);
 			}
 			else
-				delete_buddy_icon_settings((PurpleBListNode*)b, "buddy_icon");
+				delete_buddy_icon_settings((PurpleBlistNode*)b, "buddy_icon");
 
 			g_free(path);
 		}
@@ -788,7 +788,7 @@ purple_buddy_icons_get_account_icon_timestamp(PurpleAccount *account)
 }
 
 gboolean
-purple_buddy_icons_node_has_custom_icon(PurpleBListNode *node)
+purple_buddy_icons_node_has_custom_icon(PurpleBlistNode *node)
 {
 	g_return_val_if_fail(node != NULL, FALSE);
 
@@ -796,7 +796,7 @@ purple_buddy_icons_node_has_custom_icon(PurpleBListNode *node)
 }
 
 PurpleStoredImage *
-purple_buddy_icons_node_find_custom_icon(PurpleBListNode *node)
+purple_buddy_icons_node_find_custom_icon(PurpleBlistNode *node)
 {
 	char *path;
 	size_t len;
@@ -832,13 +832,13 @@ purple_buddy_icons_node_find_custom_icon(PurpleBListNode *node)
 }
 
 PurpleStoredImage *
-purple_buddy_icons_node_set_custom_icon(PurpleBListNode *node,
+purple_buddy_icons_node_set_custom_icon(PurpleBlistNode *node,
                                         guchar *icon_data, size_t icon_len)
 {
 	char *old_icon;
 	PurpleStoredImage *old_img;
 	PurpleStoredImage *img = NULL;
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 
 	g_return_val_if_fail(node != NULL, NULL);
 
@@ -872,7 +872,7 @@ purple_buddy_icons_node_set_custom_icon(PurpleBListNode *node,
 		g_hash_table_remove(pointer_icon_cache, node);
 
 	if (PURPLE_IS_CONTACT(node)) {
-		PurpleBListNode *child;
+		PurpleBlistNode *child;
 		for (child = purple_blist_node_get_first_child(node);
 		     child;
 			 child = purple_blist_node_get_sibling_next(child))
@@ -921,7 +921,7 @@ purple_buddy_icons_node_set_custom_icon(PurpleBListNode *node,
 }
 
 PurpleStoredImage *
-purple_buddy_icons_node_set_custom_icon_from_file(PurpleBListNode *node,
+purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
                                                   const gchar *filename)
 {
 	size_t len = 0;
@@ -945,7 +945,7 @@ purple_buddy_icons_node_set_custom_icon_from_file(PurpleBListNode *node,
 }
 
 static void
-delete_buddy_icon_settings(PurpleBListNode *node, const char *setting_name)
+delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name)
 {
 	purple_blist_node_remove_setting(node, setting_name);
 
@@ -984,7 +984,7 @@ _purple_buddy_icons_account_loaded_cb()
 void
 _purple_buddy_icons_blist_loaded_cb()
 {
-	PurpleBListNode *node = purple_blist_get_root();
+	PurpleBlistNode *node = purple_blist_get_root();
 	const char *dirname = purple_buddy_icons_get_cache_dir();
 
 	while (node != NULL)
diff --git a/libpurple/buddyicon.h b/libpurple/buddyicon.h
index 304662c678..f395a85c55 100644
--- a/libpurple/buddyicon.h
+++ b/libpurple/buddyicon.h
@@ -279,7 +279,7 @@ purple_buddy_icons_get_account_icon_timestamp(PurpleAccount *account);
  * @return A boolean indicating if @a node has a custom buddy icon.
  */
 gboolean
-purple_buddy_icons_node_has_custom_icon(PurpleBListNode *node);
+purple_buddy_icons_node_has_custom_icon(PurpleBlistNode *node);
 
 /**
  * Returns the custom buddy icon image for a blist node.
@@ -296,7 +296,7 @@ purple_buddy_icons_node_has_custom_icon(PurpleBListNode *node);
  * @return The custom buddy icon.
  */
 PurpleStoredImage *
-purple_buddy_icons_node_find_custom_icon(PurpleBListNode *node);
+purple_buddy_icons_node_find_custom_icon(PurpleBlistNode *node);
 
 /**
  * Sets a custom buddy icon for a blist node.
@@ -313,7 +313,7 @@ purple_buddy_icons_node_find_custom_icon(PurpleBListNode *node);
  *         and must call purple_imgstore_ref() if it wants one.
  */
 PurpleStoredImage *
-purple_buddy_icons_node_set_custom_icon(PurpleBListNode *node,
+purple_buddy_icons_node_set_custom_icon(PurpleBlistNode *node,
                                         guchar *icon_data, size_t icon_len);
 
 /**
@@ -330,7 +330,7 @@ purple_buddy_icons_node_set_custom_icon(PurpleBListNode *node,
  *         and must call purple_imgstore_ref() if it wants one.
  */
 PurpleStoredImage *
-purple_buddy_icons_node_set_custom_icon_from_file(PurpleBListNode *node,
+purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
                                                   const gchar *filename);
 
 /**
diff --git a/libpurple/buddylist.c b/libpurple/buddylist.c
index bbe8cb92ea..75f70a520f 100644
--- a/libpurple/buddylist.c
+++ b/libpurple/buddylist.c
@@ -42,7 +42,7 @@ typedef struct  {
 	GHashTable *buddies;  /**< Every buddy in this list */
 } PurpleBuddyListPrivate;
 
-static PurpleBListUiOps *blist_ui_ops = NULL;
+static PurpleBlistUiOps *blist_ui_ops = NULL;
 
 static PurpleBuddyList *purplebuddylist = NULL;
 
@@ -64,15 +64,15 @@ static GHashTable *groups_cache = NULL;
 static guint          save_timer = 0;
 static gboolean       blist_loaded = FALSE;
 
-PurpleBListNode *_purple_blist_get_last_child(PurpleBListNode *node);
+PurpleBlistNode *_purple_blist_get_last_child(PurpleBlistNode *node);
 
 /*********************************************************************
  * Private utility functions                                         *
  *********************************************************************/
 
-static PurpleBListNode *purple_blist_get_last_sibling(PurpleBListNode *node)
+static PurpleBlistNode *purple_blist_get_last_sibling(PurpleBlistNode *node)
 {
-	PurpleBListNode *n = node;
+	PurpleBlistNode *n = node;
 	if (!n)
 		return NULL;
 	while (n->next)
@@ -80,7 +80,7 @@ static PurpleBListNode *purple_blist_get_last_sibling(PurpleBListNode *node)
 	return n;
 }
 
-PurpleBListNode *_purple_blist_get_last_child(PurpleBListNode *node)
+PurpleBlistNode *_purple_blist_get_last_child(PurpleBlistNode *node)
 {
 	if (!node)
 		return NULL;
@@ -95,7 +95,7 @@ struct _list_account_buddies {
 struct _purple_hbuddy {
 	char *name;
 	PurpleAccount *account;
-	PurpleBListNode *group;
+	PurpleBlistNode *group;
 };
 
 /* This function must not use purple_normalize */
@@ -219,7 +219,7 @@ static xmlnode *
 contact_to_xmlnode(PurpleContact *contact)
 {
 	xmlnode *node, *child;
-	PurpleBListNode *bnode;
+	PurpleBlistNode *bnode;
 	gchar *alias;
 
 	node = xmlnode_new("contact");
@@ -285,7 +285,7 @@ static xmlnode *
 group_to_xmlnode(PurpleGroup *group)
 {
 	xmlnode *node, *child;
-	PurpleBListNode *cnode;
+	PurpleBlistNode *cnode;
 
 	node = xmlnode_new("group");
 	xmlnode_set_attrib(node, "name", purple_group_get_name(group));
@@ -346,7 +346,7 @@ static xmlnode *
 blist_to_xmlnode(void)
 {
 	xmlnode *node, *child, *grandchild;
-	PurpleBListNode *gnode;
+	PurpleBlistNode *gnode;
 	GList *cur;
 
 	node = xmlnode_new("purple");
@@ -426,14 +426,14 @@ purple_blist_save_account(PurpleAccount *account)
 }
 
 static void
-purple_blist_save_node(PurpleBListNode *node)
+purple_blist_save_node(PurpleBlistNode *node)
 {
 	_purple_blist_schedule_save();
 }
 
 void purple_blist_schedule_save()
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 
 	/* Save everything */
 	if (ops && ops->save_account)
@@ -445,7 +445,7 @@ void purple_blist_schedule_save()
  *********************************************************************/
 
 static void
-parse_setting(PurpleBListNode *node, xmlnode *setting)
+parse_setting(PurpleBlistNode *node, xmlnode *setting)
 {
 	const char *name = xmlnode_get_attrib(setting, "name");
 	const char *type = xmlnode_get_attrib(setting, "type");
@@ -495,10 +495,10 @@ parse_buddy(PurpleGroup *group, PurpleContact *contact, xmlnode *bnode)
 
 	buddy = purple_buddy_new(account, name, alias);
 	purple_blist_add_buddy(buddy, contact, group,
-			_purple_blist_get_last_child((PurpleBListNode*)contact));
+			_purple_blist_get_last_child((PurpleBlistNode*)contact));
 
 	for (x = xmlnode_get_child(bnode, "setting"); x; x = xmlnode_get_next_twin(x)) {
-		parse_setting((PurpleBListNode*)buddy, x);
+		parse_setting((PurpleBlistNode*)buddy, x);
 	}
 
 	g_free(name);
@@ -513,7 +513,7 @@ parse_contact(PurpleGroup *group, xmlnode *cnode)
 	const char *alias;
 
 	purple_blist_add_contact(contact, group,
-			_purple_blist_get_last_child((PurpleBListNode*)group));
+			_purple_blist_get_last_child((PurpleBlistNode*)group));
 
 	if ((alias = xmlnode_get_attrib(cnode, "alias"))) {
 		purple_contact_set_alias(contact, alias);
@@ -570,10 +570,10 @@ parse_chat(PurpleGroup *group, xmlnode *cnode)
 
 	chat = purple_chat_new(account, alias, components);
 	purple_blist_add_chat(chat, group,
-			_purple_blist_get_last_child((PurpleBListNode*)group));
+			_purple_blist_get_last_child((PurpleBlistNode*)group));
 
 	for (x = xmlnode_get_child(cnode, "setting"); x; x = xmlnode_get_next_twin(x)) {
-		parse_setting((PurpleBListNode*)chat, x);
+		parse_setting((PurpleBlistNode*)chat, x);
 	}
 
 	g_free(alias);
@@ -597,7 +597,7 @@ parse_group(xmlnode *groupnode)
 		if (cnode->type != XMLNODE_TYPE_TAG)
 			continue;
 		if (purple_strequal(cnode->name, "setting"))
-			parse_setting((PurpleBListNode*)group, cnode);
+			parse_setting((PurpleBlistNode*)group, cnode);
 		else if (purple_strequal(cnode->name, "contact") ||
 				purple_strequal(cnode->name, "person"))
 			parse_contact(group, cnode);
@@ -682,7 +682,7 @@ load_blist(void)
 void
 purple_blist_boot(void)
 {
-	PurpleBListUiOps *ui_ops;
+	PurpleBlistUiOps *ui_ops;
 	GList *account;
 	PurpleBuddyList *gbl = g_object_new(PURPLE_TYPE_BUDDY_LIST, NULL);
 
@@ -714,7 +714,7 @@ purple_blist_get_buddy_list()
 	return purplebuddylist;
 }
 
-PurpleBListNode *
+PurpleBlistNode *
 purple_blist_get_root()
 {
 	return purplebuddylist ? purplebuddylist->root : NULL;
@@ -754,7 +754,7 @@ purple_blist_set_ui_data(void *ui_data)
 
 void purple_blist_show()
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 
 	if (ops && ops->show)
 		ops->show(purplebuddylist);
@@ -762,7 +762,7 @@ void purple_blist_show()
 
 void purple_blist_set_visible(gboolean show)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 
 	if (ops && ops->set_visible)
 		ops->set_visible(purplebuddylist, show);
@@ -811,10 +811,10 @@ void purple_blist_update_groups_cache(PurpleGroup *group, const char *new_name)
 		g_hash_table_insert(groups_cache, key, group);
 }
 
-void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBListNode *node)
+void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBlistNode *node)
 {
-	PurpleBListNode *cnode = PURPLE_BLIST_NODE(chat);
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistNode *cnode = PURPLE_BLIST_NODE(chat);
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleCountingNode *group_counter;
 
 	g_return_if_fail(chat != NULL);
@@ -875,11 +875,11 @@ void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBListNode
 			purple_counting_node_change_current_size(group_counter, +1);
 		}
 	} else {
-		if (((PurpleBListNode *)group)->child)
-			((PurpleBListNode *)group)->child->prev = cnode;
-		cnode->next = ((PurpleBListNode *)group)->child;
+		if (((PurpleBlistNode *)group)->child)
+			((PurpleBlistNode *)group)->child->prev = cnode;
+		cnode->next = ((PurpleBlistNode *)group)->child;
 		cnode->prev = NULL;
-		((PurpleBListNode *)group)->child = cnode;
+		((PurpleBlistNode *)group)->child = cnode;
 		cnode->parent = PURPLE_BLIST_NODE(group);
 		group_counter = PURPLE_COUNTING_NODE(group);
 		purple_counting_node_change_total_size(group_counter, +1);
@@ -900,27 +900,27 @@ void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBListNode
 			cnode);
 }
 
-void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGroup *group, PurpleBListNode *node)
+void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node)
 {
-	PurpleBListNode *cnode, *bnode;
+	PurpleBlistNode *cnode, *bnode;
 	PurpleCountingNode *contact_counter, *group_counter;
 	PurpleGroup *g;
 	PurpleContact *c;
 	PurpleAccount *account;
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	struct _purple_hbuddy *hb, *hb2;
 	GHashTable *account_buddies;
 	PurpleBuddyListPrivate *priv = PURPLE_BUDDY_LIST_GET_PRIVATE(purplebuddylist);
 
 	g_return_if_fail(buddy != NULL);
-	g_return_if_fail(PURPLE_IS_BUDDY((PurpleBListNode*)buddy));
+	g_return_if_fail(PURPLE_IS_BUDDY((PurpleBlistNode*)buddy));
 
 	bnode = PURPLE_BLIST_NODE(buddy);
 	account = purple_buddy_get_account(buddy);
 
 	/* if we're moving to overtop of ourselves, do nothing */
 	if (bnode == node || (!node && bnode->parent &&
-				contact && bnode->parent == (PurpleBListNode*)contact
+				contact && bnode->parent == (PurpleBlistNode*)contact
 				&& bnode == bnode->parent->child))
 		return;
 
@@ -941,7 +941,7 @@ void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGr
 		}
 		c = purple_contact_new();
 		purple_blist_add_contact(c, g,
-				_purple_blist_get_last_child((PurpleBListNode*)g));
+				_purple_blist_get_last_child((PurpleBlistNode*)g));
 	}
 
 	cnode = PURPLE_BLIST_NODE(c);
@@ -963,7 +963,7 @@ void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGr
 		purple_counting_node_change_total_size(contact_counter, -1);
 		/* the group totalsize will be taken care of by remove_contact below */
 
-		if (bnode->parent->parent != (PurpleBListNode*)g)
+		if (bnode->parent->parent != (PurpleBlistNode*)g)
 			serv_move_buddy(buddy, (PurpleGroup *)bnode->parent->parent, g);
 
 		if (bnode->next)
@@ -976,7 +976,7 @@ void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGr
 		if (ops && ops->remove)
 			ops->remove(purplebuddylist, bnode);
 
-		if (bnode->parent->parent != (PurpleBListNode*)g) {
+		if (bnode->parent->parent != (PurpleBlistNode*)g) {
 			struct _purple_hbuddy hb;
 			hb.name = (gchar *)purple_normalize(account,
 					purple_buddy_get_name(buddy));
@@ -1041,7 +1041,7 @@ void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGr
 	hb2 = g_new(struct _purple_hbuddy, 1);
 	hb2->name = g_strdup(hb->name);
 	hb2->account = account;
-	hb2->group = ((PurpleBListNode*)buddy)->parent->parent;
+	hb2->group = ((PurpleBlistNode*)buddy)->parent->parent;
 
 	g_hash_table_replace(account_buddies, hb2, buddy);
 
@@ -1049,7 +1049,7 @@ void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGr
 
 	if (ops) {
 		if (ops->save_node)
-			ops->save_node((PurpleBListNode*) buddy);
+			ops->save_node((PurpleBlistNode*) buddy);
 		if (ops->update)
 			ops->update(purplebuddylist, PURPLE_BLIST_NODE(buddy));
 	}
@@ -1061,11 +1061,11 @@ void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGr
 			PURPLE_BLIST_NODE(buddy));
 }
 
-void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, PurpleBListNode *node)
+void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleGroup *g;
-	PurpleBListNode *gnode, *cnode, *bnode;
+	PurpleBlistNode *gnode, *cnode, *bnode;
 	PurpleCountingNode *contact_counter, *group_counter;
 	PurpleBuddyListPrivate *priv = PURPLE_BUDDY_LIST_GET_PRIVATE(purplebuddylist);
 
@@ -1088,8 +1088,8 @@ void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, Purple
 		}
 	}
 
-	gnode = (PurpleBListNode*)g;
-	cnode = (PurpleBListNode*)contact;
+	gnode = (PurpleBlistNode*)g;
+	cnode = (PurpleBlistNode*)contact;
 
 	if (cnode->parent) {
 		if (cnode->parent->child == cnode)
@@ -1102,7 +1102,7 @@ void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, Purple
 		if (cnode->parent != gnode) {
 			bnode = cnode->child;
 			while (bnode) {
-				PurpleBListNode *next_bnode = bnode->next;
+				PurpleBlistNode *next_bnode = bnode->next;
 				PurpleBuddy *b = PURPLE_BUDDY(bnode);
 				PurpleAccount *account = purple_buddy_get_account(b);
 				GHashTable *account_buddies;
@@ -1216,14 +1216,14 @@ void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, Purple
 	}
 }
 
-void purple_blist_add_group(PurpleGroup *group, PurpleBListNode *node)
+void purple_blist_add_group(PurpleGroup *group, PurpleBlistNode *node)
 {
-	PurpleBListUiOps *ops;
-	PurpleBListNode *gnode = (PurpleBListNode*)group;
+	PurpleBlistUiOps *ops;
+	PurpleBlistNode *gnode = (PurpleBlistNode*)group;
 	gchar* key;
 
 	g_return_if_fail(group != NULL);
-	g_return_if_fail(PURPLE_IS_GROUP((PurpleBListNode *)group));
+	g_return_if_fail(PURPLE_IS_GROUP((PurpleBlistNode *)group));
 
 	ops = purple_blist_get_ui_ops();
 
@@ -1239,7 +1239,7 @@ void purple_blist_add_group(PurpleGroup *group, PurpleBListNode *node)
 		/* This is just being moved */
 
 		if (ops && ops->remove)
-			ops->remove(purplebuddylist, (PurpleBListNode *)group);
+			ops->remove(purplebuddylist, (PurpleBlistNode *)group);
 
 		if (gnode == purplebuddylist->root)
 			purplebuddylist->root = gnode->next;
@@ -1284,13 +1284,13 @@ void purple_blist_add_group(PurpleGroup *group, PurpleBListNode *node)
 
 void purple_blist_remove_contact(PurpleContact *contact)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
-	PurpleBListNode *node, *gnode;
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistNode *node, *gnode;
 	PurpleGroup *group;
 
 	g_return_if_fail(contact != NULL);
 
-	node = (PurpleBListNode *)contact;
+	node = (PurpleBlistNode *)contact;
 	gnode = node->parent;
 	group = PURPLE_GROUP(gnode);
 
@@ -1336,8 +1336,8 @@ void purple_blist_remove_contact(PurpleContact *contact)
 
 void purple_blist_remove_buddy(PurpleBuddy *buddy)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
-	PurpleBListNode *node, *cnode, *gnode;
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistNode *node, *cnode, *gnode;
 	PurpleCountingNode *contact_counter, *group_counter;
 	PurpleContact *contact;
 	PurpleGroup *group;
@@ -1422,14 +1422,14 @@ void purple_blist_remove_buddy(PurpleBuddy *buddy)
 
 void purple_blist_remove_chat(PurpleChat *chat)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
-	PurpleBListNode *node, *gnode;
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistNode *node, *gnode;
 	PurpleGroup *group;
 	PurpleCountingNode *group_counter;
 
 	g_return_if_fail(chat != NULL);
 
-	node = (PurpleBListNode *)chat;
+	node = (PurpleBlistNode *)chat;
 	gnode = node->parent;
 	group = (PurpleGroup *)gnode;
 
@@ -1468,14 +1468,14 @@ void purple_blist_remove_chat(PurpleChat *chat)
 
 void purple_blist_remove_group(PurpleGroup *group)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
-	PurpleBListNode *node;
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistNode *node;
 	GList *l;
 	gchar* key;
 
 	g_return_if_fail(group != NULL);
 
-	node = (PurpleBListNode *)group;
+	node = (PurpleBlistNode *)group;
 
 	/* Make sure the group is empty */
 	if (node->child)
@@ -1520,7 +1520,7 @@ PurpleBuddy *purple_blist_find_buddy(PurpleAccount *account, const char *name)
 {
 	PurpleBuddy *buddy;
 	struct _purple_hbuddy hb;
-	PurpleBListNode *group;
+	PurpleBlistNode *group;
 
 	g_return_val_if_fail(purplebuddylist != NULL, NULL);
 	g_return_val_if_fail(account != NULL, NULL);
@@ -1554,7 +1554,7 @@ PurpleBuddy *purple_blist_find_buddy_in_group(PurpleAccount *account, const char
 
 	hb.name = (gchar *)purple_normalize(account, name);
 	hb.account = account;
-	hb.group = (PurpleBListNode*)group;
+	hb.group = (PurpleBlistNode*)group;
 
 	return g_hash_table_lookup(PURPLE_BUDDY_LIST_GET_PRIVATE(purplebuddylist)->buddies,
 			&hb);
@@ -1571,7 +1571,7 @@ static void find_acct_buddies(gpointer key, gpointer value, gpointer data)
 GSList *purple_blist_find_buddies(PurpleAccount *account, const char *name)
 {
 	PurpleBuddy *buddy;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	GSList *ret = NULL;
 
 	g_return_val_if_fail(purplebuddylist != NULL, NULL);
@@ -1625,7 +1625,7 @@ purple_blist_find_chat(PurpleAccount *account, const char *name)
 	PurplePlugin *prpl;
 	PurplePluginProtocolInfo *prpl_info = NULL;
 	struct proto_chat_entry *pce;
-	PurpleBListNode *node, *group;
+	PurpleBlistNode *node, *group;
 	GList *parts;
 	char *normname;
 
@@ -1675,8 +1675,8 @@ purple_blist_find_chat(PurpleAccount *account, const char *name)
 
 void purple_blist_add_account(PurpleAccount *account)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
-	PurpleBListNode *gnode, *cnode, *bnode;
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistNode *gnode, *cnode, *bnode;
 	PurpleCountingNode *contact_counter, *group_counter;
 
 	g_return_if_fail(purplebuddylist != NULL);
@@ -1721,8 +1721,8 @@ void purple_blist_add_account(PurpleAccount *account)
 
 void purple_blist_remove_account(PurpleAccount *account)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
-	PurpleBListNode *gnode, *cnode, *bnode;
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistNode *gnode, *cnode, *bnode;
 	PurpleCountingNode *contact_counter, *group_counter;
 	PurpleBuddy *buddy;
 	PurpleChat *chat;
@@ -1813,7 +1813,7 @@ void
 purple_blist_request_add_buddy(PurpleAccount *account, const char *username,
 							 const char *group, const char *alias)
 {
-	PurpleBListUiOps *ui_ops;
+	PurpleBlistUiOps *ui_ops;
 
 	ui_ops = purple_blist_get_ui_ops();
 
@@ -1825,7 +1825,7 @@ void
 purple_blist_request_add_chat(PurpleAccount *account, PurpleGroup *group,
 							const char *alias, const char *name)
 {
-	PurpleBListUiOps *ui_ops;
+	PurpleBlistUiOps *ui_ops;
 
 	ui_ops = purple_blist_get_ui_ops();
 
@@ -1836,7 +1836,7 @@ purple_blist_request_add_chat(PurpleAccount *account, PurpleGroup *group,
 void
 purple_blist_request_add_group(void)
 {
-	PurpleBListUiOps *ui_ops;
+	PurpleBlistUiOps *ui_ops;
 
 	ui_ops = purple_blist_get_ui_ops();
 
@@ -1845,7 +1845,7 @@ purple_blist_request_add_group(void)
 }
 
 void
-purple_blist_set_ui_ops(PurpleBListUiOps *ops)
+purple_blist_set_ui_ops(PurpleBlistUiOps *ops)
 {
 	gboolean overrode = FALSE;
 	blist_ui_ops = ops;
@@ -1874,7 +1874,7 @@ purple_blist_set_ui_ops(PurpleBListUiOps *ops)
 	}
 }
 
-PurpleBListUiOps *
+PurpleBlistUiOps *
 purple_blist_get_ui_ops(void)
 {
 	return blist_ui_ops;
@@ -1966,10 +1966,10 @@ purple_blist_init(void)
 }
 
 static void
-blist_node_destroy(PurpleBListNode *node)
+blist_node_destroy(PurpleBlistNode *node)
 {
-	PurpleBListUiOps *ui_ops;
-	PurpleBListNode *child, *next_child;
+	PurpleBlistUiOps *ui_ops;
+	PurpleBlistNode *child, *next_child;
 
 	ui_ops = purple_blist_get_ui_ops();
 	child = node->child;
@@ -1993,8 +1993,8 @@ blist_node_destroy(PurpleBListNode *node)
 void
 purple_blist_uninit(void)
 {
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
-	PurpleBListNode *node, *next_node;
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistNode *node, *next_node;
 
 	/* This happens if we quit before purple_set_blist is called. */
 	if (purplebuddylist == NULL)
diff --git a/libpurple/buddylist.h b/libpurple/buddylist.h
index 8736687caa..e731e5eab0 100644
--- a/libpurple/buddylist.h
+++ b/libpurple/buddylist.h
@@ -43,8 +43,8 @@ typedef struct _PurpleBuddyList       PurpleBuddyList;
 /** @copydoc _PurpleBuddyList */
 typedef struct _PurpleBuddyListClass  PurpleBuddyListClass;
 
-/** @copydoc _PurpleBListUiOps */
-typedef struct _PurpleBListUiOps PurpleBListUiOps;
+/** @copydoc _PurpleBlistUiOps */
+typedef struct _PurpleBlistUiOps PurpleBlistUiOps;
 
 /**************************************************************************/
 /* Data Structures                                                        */
@@ -62,7 +62,7 @@ struct _PurpleBuddyList {
 	gpointer ui_data;
 
 	/** The first node in the buddy list */
-	PurpleBListNode *root;
+	PurpleBlistNode *root;
 };
 
 /** The base class for all #PurpleBuddyList's. */
@@ -79,18 +79,18 @@ struct _PurpleBuddyListClass {
 /**
  * Buddy list UI operations.
  *
- * Any UI representing a buddy list must assign a filled-out PurpleBListUiOps
+ * Any UI representing a buddy list must assign a filled-out PurpleBlistUiOps
  * structure to the buddy list core.
  */
-struct _PurpleBListUiOps
+struct _PurpleBlistUiOps
 {
 	void (*new_list)(PurpleBuddyList *list); /**< Sets UI-specific data on a buddy list. */
-	void (*new_node)(PurpleBListNode *node); /**< Sets UI-specific data on a node. */
+	void (*new_node)(PurpleBlistNode *node); /**< Sets UI-specific data on a node. */
 	void (*show)(PurpleBuddyList *list);     /**< The core will call this when it's finished doing its core stuff */
 	void (*update)(PurpleBuddyList *list,
-		       PurpleBListNode *node);       /**< This will update a node in the buddy list. */
+		       PurpleBlistNode *node);       /**< This will update a node in the buddy list. */
 	void (*remove)(PurpleBuddyList *list,
-		       PurpleBListNode *node);       /**< This removes a node from the list */
+		       PurpleBlistNode *node);       /**< This removes a node from the list */
 	void (*destroy)(PurpleBuddyList *list);  /**< When the list is destroyed, this is called to destroy the UI. */
 	void (*set_visible)(PurpleBuddyList *list,
 			    gboolean show);            /**< Hides or unhides the buddy list */
@@ -109,7 +109,7 @@ struct _PurpleBListUiOps
 	 *
 	 * @param node    The node which has been modified.
 	 */
-	void (*save_node)(PurpleBListNode *node);
+	void (*save_node)(PurpleBlistNode *node);
 
 	/**
 	 * Called when a node is about to be removed from the buddy list.
@@ -122,7 +122,7 @@ struct _PurpleBListUiOps
 	 *
 	 * @param node  The node which has been modified.
 	 */
-	void (*remove_node)(PurpleBListNode *node);
+	void (*remove_node)(PurpleBlistNode *node);
 
 	/**
 	 * Called to save all the data for an account. If the UI sets this,
@@ -165,7 +165,7 @@ PurpleBuddyList *purple_blist_get_buddy_list(void);
  *
  * @return The root node.
  */
-PurpleBListNode *purple_blist_get_root(void);
+PurpleBlistNode *purple_blist_get_root(void);
 
 /**
  * Returns a list of every buddy in the list.  Use of this function is
@@ -236,7 +236,7 @@ void purple_blist_update_groups_cache(PurpleGroup *group, const char *new_name);
  * @param group  The group to add the new chat to.
  * @param node   The insertion point
  */
-void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBListNode *node);
+void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBlistNode *node);
 
 /**
  * Adds a new buddy to the buddy list.
@@ -251,7 +251,7 @@ void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBListNode
  * @param node    The insertion point.  Pass in NULL to add the node as
  *                the first child in the given group.
  */
-void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGroup *group, PurpleBListNode *node);
+void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node);
 
 /**
  * Adds a new group to the buddy list.
@@ -262,7 +262,7 @@ void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGr
  * @param group  The group
  * @param node   The insertion point
  */
-void purple_blist_add_group(PurpleGroup *group, PurpleBListNode *node);
+void purple_blist_add_group(PurpleGroup *group, PurpleBlistNode *node);
 
 /**
  * Adds a new contact to the buddy list.
@@ -274,7 +274,7 @@ void purple_blist_add_group(PurpleGroup *group, PurpleBListNode *node);
  * @param group   The group to add the contact to
  * @param node    The insertion point
  */
-void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, PurpleBListNode *node);
+void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node);
 
 /**
  * Removes a buddy from the buddy list and frees the memory allocated to it.
@@ -434,14 +434,14 @@ void purple_blist_request_add_group(void);
  *
  * @param ops The ops struct.
  */
-void purple_blist_set_ui_ops(PurpleBListUiOps *ops);
+void purple_blist_set_ui_ops(PurpleBlistUiOps *ops);
 
 /**
  * Returns the UI operations structure to be used for the buddy list.
  *
  * @return The UI operations structure.
  */
-PurpleBListUiOps *purple_blist_get_ui_ops(void);
+PurpleBlistUiOps *purple_blist_get_ui_ops(void);
 
 /*@}*/
 
diff --git a/libpurple/dbus-server.c b/libpurple/dbus-server.c
index 4a446722fe..431040aa57 100644
--- a/libpurple/dbus-server.c
+++ b/libpurple/dbus-server.c
@@ -90,10 +90,10 @@ purple_dbus_init_ids(void)
 	map_id_type = g_hash_table_new(g_direct_hash, g_direct_equal);
 	map_node_id = g_hash_table_new(g_direct_hash, g_direct_equal);
 
-	PURPLE_DBUS_TYPE(PurpleBuddy)->parent   = PURPLE_DBUS_TYPE(PurpleBListNode);
-	PURPLE_DBUS_TYPE(PurpleContact)->parent = PURPLE_DBUS_TYPE(PurpleBListNode);
-	PURPLE_DBUS_TYPE(PurpleChat)->parent    = PURPLE_DBUS_TYPE(PurpleBListNode);
-	PURPLE_DBUS_TYPE(PurpleGroup)->parent   = PURPLE_DBUS_TYPE(PurpleBListNode);
+	PURPLE_DBUS_TYPE(PurpleBuddy)->parent   = PURPLE_DBUS_TYPE(PurpleBlistNode);
+	PURPLE_DBUS_TYPE(PurpleContact)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode);
+	PURPLE_DBUS_TYPE(PurpleChat)->parent    = PURPLE_DBUS_TYPE(PurpleBlistNode);
+	PURPLE_DBUS_TYPE(PurpleGroup)->parent   = PURPLE_DBUS_TYPE(PurpleBlistNode);
 }
 
 void
diff --git a/libpurple/log.c b/libpurple/log.c
index 9fa9270c2b..76bb7e74b8 100644
--- a/libpurple/log.c
+++ b/libpurple/log.c
@@ -1999,7 +1999,7 @@ static void old_logger_get_log_sets(PurpleLogSetCallback cb, GHashTable *sets)
 	char *log_path = g_build_filename(purple_user_dir(), "logs", NULL);
 	GDir *log_dir = g_dir_open(log_path, 0, NULL);
 	gchar *name;
-	PurpleBListNode *gnode, *cnode, *bnode;
+	PurpleBlistNode *gnode, *cnode, *bnode;
 
 	g_free(log_path);
 	if (log_dir == NULL)
diff --git a/libpurple/plugins/autoaccept.c b/libpurple/plugins/autoaccept.c
index 14a9d85198..6824d80f2a 100644
--- a/libpurple/plugins/autoaccept.c
+++ b/libpurple/plugins/autoaccept.c
@@ -86,7 +86,7 @@ static void
 file_recv_request_cb(PurpleXfer *xfer, gpointer handle)
 {
 	PurpleAccount *account;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	const char *pref;
 	char *filename;
 	char *dirname;
@@ -180,7 +180,7 @@ file_recv_request_cb(PurpleXfer *xfer, gpointer handle)
 }
 
 static void
-save_cb(PurpleBListNode *node, int choice)
+save_cb(PurpleBlistNode *node, int choice)
 {
 	if (PURPLE_IS_BUDDY(node))
 		node = purple_blist_node_get_parent(node);
@@ -189,7 +189,7 @@ save_cb(PurpleBListNode *node, int choice)
 }
 
 static void
-set_auto_accept_settings(PurpleBListNode *node, gpointer plugin)
+set_auto_accept_settings(PurpleBlistNode *node, gpointer plugin)
 {
 	char *message;
 
@@ -214,7 +214,7 @@ set_auto_accept_settings(PurpleBListNode *node, gpointer plugin)
 }
 
 static void
-context_menu(PurpleBListNode *node, GList **menu, gpointer plugin)
+context_menu(PurpleBlistNode *node, GList **menu, gpointer plugin)
 {
 	PurpleMenuAction *action;
 
diff --git a/libpurple/plugins/buddynote.c b/libpurple/plugins/buddynote.c
index e1133b8791..c1160aadc3 100644
--- a/libpurple/plugins/buddynote.c
+++ b/libpurple/plugins/buddynote.c
@@ -26,18 +26,18 @@
 #include <version.h>
 
 static void
-dont_do_it_cb(PurpleBListNode *node, const char *note)
+dont_do_it_cb(PurpleBlistNode *node, const char *note)
 {
 }
 
 static void
-do_it_cb(PurpleBListNode *node, const char *note)
+do_it_cb(PurpleBlistNode *node, const char *note)
 {
 	purple_blist_node_set_string(node, "notes", note);
 }
 
 static void
-buddynote_edit_cb(PurpleBListNode *node, gpointer data)
+buddynote_edit_cb(PurpleBlistNode *node, gpointer data)
 {
 	const char *note;
 
@@ -54,7 +54,7 @@ buddynote_edit_cb(PurpleBListNode *node, gpointer data)
 }
 
 static void
-buddynote_extended_menu_cb(PurpleBListNode *node, GList **m)
+buddynote_extended_menu_cb(PurpleBlistNode *node, GList **m)
 {
 	PurpleMenuAction *bna = NULL;
 
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
index 0aa2705f89..3c73b6537d 100644
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -824,7 +824,7 @@ static GList *msn_logger_list(PurpleLogType type, const char *sn, PurpleAccount
 	 * detected for both buddies.
 	 */
 	if (buddy && logfile) {
-		PurpleBListNode *node = PURPLE_BLIST_NODE(buddy);
+		PurpleBlistNode *node = PURPLE_BLIST_NODE(buddy);
 		purple_blist_node_set_string(node, "log_reader_msn_log_filename", logfile);
 		g_free(logfile);
 	}
diff --git a/libpurple/plugins/perl/common/module.h b/libpurple/plugins/perl/common/module.h
index de8a2cd73a..9c4627c339 100644
--- a/libpurple/plugins/perl/common/module.h
+++ b/libpurple/plugins/perl/common/module.h
@@ -84,7 +84,7 @@ typedef PurpleAccountUserSplit *		Purple__Account__UserSplit;
 typedef PurpleAccountPrivacyType		Purple__Account__PrivacyType;
 
 /* buddylist.h */
-typedef PurpleBListNode *			Purple__BuddyList__Node;
+typedef PurpleBlistNode *			Purple__BuddyList__Node;
 typedef PurpleCountingNode *			Purple__BuddyList__CountingNode;
 typedef PurpleBuddyList *			Purple__BuddyList;
 typedef PurpleBuddy *			Purple__BuddyList__Buddy;
diff --git a/libpurple/plugins/signals-test.c b/libpurple/plugins/signals-test.c
index 16987465bf..43f1d88a1d 100644
--- a/libpurple/plugins/signals-test.c
+++ b/libpurple/plugins/signals-test.c
@@ -145,7 +145,7 @@ buddy_signed_off_cb(PurpleBuddy *buddy, void *data)
 }
 
 static void
-blist_node_added_cb(PurpleBListNode *bnode, void *data)
+blist_node_added_cb(PurpleBlistNode *bnode, void *data)
 {
 	const char *name;
 	if (PURPLE_IS_GROUP(bnode))
@@ -163,7 +163,7 @@ blist_node_added_cb(PurpleBListNode *bnode, void *data)
 }
 
 static void
-blist_node_removed_cb(PurpleBListNode *bnode, void *data)
+blist_node_removed_cb(PurpleBlistNode *bnode, void *data)
 {
 	const char *name;
 	if (PURPLE_IS_GROUP(bnode))
@@ -181,7 +181,7 @@ blist_node_removed_cb(PurpleBListNode *bnode, void *data)
 }
 
 static void
-blist_node_aliased(PurpleBListNode *node, const char *old_alias)
+blist_node_aliased(PurpleBlistNode *node, const char *old_alias)
 {
 	PurpleContact *p = PURPLE_CONTACT(node);
 	PurpleBuddy *b = PURPLE_BUDDY(node);
@@ -208,7 +208,7 @@ blist_node_aliased(PurpleBListNode *node, const char *old_alias)
 }
 
 static void
-blist_node_extended_menu_cb(PurpleBListNode *node, void *data)
+blist_node_extended_menu_cb(PurpleBlistNode *node, void *data)
 {
 	PurpleContact *p = PURPLE_CONTACT(node);
 	PurpleBuddy *b = PURPLE_BUDDY(node);
diff --git a/libpurple/plugins/tcl/tcl_cmds.c b/libpurple/plugins/tcl/tcl_cmds.c
index a72e649489..4a95b4883e 100644
--- a/libpurple/plugins/tcl/tcl_cmds.c
+++ b/libpurple/plugins/tcl/tcl_cmds.c
@@ -383,9 +383,9 @@ int tcl_cmd_account(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CO
 	return TCL_OK;
 }
 
-static PurpleBListNode *tcl_list_to_buddy(Tcl_Interp *interp, int count, Tcl_Obj **elems)
+static PurpleBlistNode *tcl_list_to_buddy(Tcl_Interp *interp, int count, Tcl_Obj **elems)
 {
-	PurpleBListNode *node = NULL;
+	PurpleBlistNode *node = NULL;
 	PurpleAccount *account;
 	char *name;
 	char *type;
@@ -415,7 +415,7 @@ int tcl_cmd_buddy(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONS
 	Tcl_Obj *list, *tclgroup, *tclgrouplist, *tclcontact, *tclcontactlist, *tclbud, **elems, *result;
 	const char *cmds[] = { "alias", "handle", "info", "list", NULL };
 	enum { CMD_BUDDY_ALIAS, CMD_BUDDY_HANDLE, CMD_BUDDY_INFO, CMD_BUDDY_LIST } cmd;
-	PurpleBListNode *node, *gnode, *bnode;
+	PurpleBlistNode *node, *gnode, *bnode;
 	PurpleAccount *account;
 	PurpleBuddy *bud;
 	PurpleChat *cnode;
diff --git a/libpurple/plugins/tcl/tcl_signals.c b/libpurple/plugins/tcl/tcl_signals.c
index 281cb3b4b6..56f658604c 100644
--- a/libpurple/plugins/tcl/tcl_signals.c
+++ b/libpurple/plugins/tcl/tcl_signals.c
@@ -156,7 +156,7 @@ static PurpleStringref *ref_purple_type(GType type)
 static void *tcl_signal_callback(va_list args, struct tcl_signal_handler *handler)
 {
 	GString *name, *val;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	int i;
 	void *retval = NULL;
 	Tcl_Obj *cmd, *arg, *result;
@@ -290,10 +290,10 @@ static void *tcl_signal_callback(va_list args, struct tcl_signal_handler *handle
 				/* We're going to switch again for code-deduping */
 #if 0
 				if (purple_value_is_outgoing(handler->argtypes[i]))
-					node = *va_arg(args, PurpleBListNode **);
+					node = *va_arg(args, PurpleBlistNode **);
 				else
 #endif
-				node = va_arg(args, PurpleBListNode *);
+				node = va_arg(args, PurpleBlistNode *);
 
 				if (PURPLE_IS_GROUP(node)) {
 					arg = Tcl_NewListObj(0, NULL);
diff --git a/libpurple/presence.c b/libpurple/presence.c
index c25d0068e3..4c36647ce7 100644
--- a/libpurple/presence.c
+++ b/libpurple/presence.c
@@ -806,7 +806,7 @@ purple_buddy_presence_update_idle(PurplePresence *presence, gboolean old_idle)
 {
 	PurpleBuddy *buddy = purple_buddy_presence_get_buddy(PURPLE_BUDDY_PRESENCE(presence));
 	time_t current_time = time(NULL);
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleAccount *account = purple_buddy_get_account(buddy);
 	gboolean idle = purple_presence_is_idle(presence);
 
@@ -862,7 +862,7 @@ purple_buddy_presence_update_idle(PurplePresence *presence, gboolean old_idle)
 	 */
 
 	if (ops != NULL && ops->update != NULL)
-		ops->update(purple_blist_get_buddy_list(), (PurpleBListNode *)buddy);
+		ops->update(purple_blist_get_buddy_list(), (PurpleBlistNode *)buddy);
 }
 
 PurpleBuddy *
diff --git a/libpurple/protocols/bonjour/bonjour.c b/libpurple/protocols/bonjour/bonjour.c
index 7e86f934fe..55ae9924fa 100644
--- a/libpurple/protocols/bonjour/bonjour.c
+++ b/libpurple/protocols/bonjour/bonjour.c
@@ -59,14 +59,14 @@ static void
 bonjour_removeallfromlocal(PurpleConnection *conn, PurpleGroup *bonjour_group)
 {
 	PurpleAccount *account = purple_connection_get_account(conn);
-	PurpleBListNode *cnode, *cnodenext, *bnode, *bnodenext;
+	PurpleBlistNode *cnode, *cnodenext, *bnode, *bnodenext;
 	PurpleBuddy *buddy;
 
 	if (bonjour_group == NULL)
 		return;
 
 	/* Go through and remove all buddies that belong to this account */
-	for (cnode = purple_blist_node_get_first_child((PurpleBListNode *) bonjour_group); cnode; cnode = cnodenext) {
+	for (cnode = purple_blist_node_get_first_child((PurpleBlistNode *) bonjour_group); cnode; cnode = cnodenext) {
 		cnodenext = purple_blist_node_get_sibling_next(cnode);
 		if (!PURPLE_IS_CONTACT(cnode))
 			continue;
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
index d9f08faccf..93fffdba00 100644
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -192,7 +192,7 @@ static void ggp_callback_add_to_chat_ok(PurpleBuddy *buddy, PurpleRequestFields
 					ggp_str_to_uin(purple_buddy_get_name(buddy)));
 }
 
-static void ggp_bmenu_add_to_chat(PurpleBListNode *node, gpointer ignored)
+static void ggp_bmenu_add_to_chat(PurpleBlistNode *node, gpointer ignored)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -828,7 +828,7 @@ static void ggp_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gb
 	}
 }
 
-static GList *ggp_blist_node_menu(PurpleBListNode *node)
+static GList *ggp_blist_node_menu(PurpleBlistNode *node)
 {
 	PurpleMenuAction *act;
 	GList *m = NULL;
diff --git a/libpurple/protocols/gg/purplew.c b/libpurple/protocols/gg/purplew.c
index dcf0b6a596..9f134299ae 100644
--- a/libpurple/protocols/gg/purplew.c
+++ b/libpurple/protocols/gg/purplew.c
@@ -96,7 +96,7 @@ PurpleGroup * ggp_purplew_buddy_get_group_only(PurpleBuddy *buddy)
 GList * ggp_purplew_group_get_buddies(PurpleGroup *group, PurpleAccount *account)
 {
 	GList *buddies = NULL;
-	PurpleBListNode *gnode, *cnode, *bnode;
+	PurpleBlistNode *gnode, *cnode, *bnode;
 	
 	g_return_val_if_fail(group != NULL, NULL);
 	
@@ -122,7 +122,7 @@ GList * ggp_purplew_group_get_buddies(PurpleGroup *group, PurpleAccount *account
 
 GList * ggp_purplew_account_get_groups(PurpleAccount *account, gboolean exclusive)
 {
-	PurpleBListNode *bnode;
+	PurpleBlistNode *bnode;
 	GList *groups = NULL;
 	for (bnode = purple_blist_get_root(); bnode; bnode = bnode->next)
 	{
diff --git a/libpurple/protocols/jabber/adhoccommands.c b/libpurple/protocols/jabber/adhoccommands.c
index 991ed16e45..23e8286047 100644
--- a/libpurple/protocols/jabber/adhoccommands.c
+++ b/libpurple/protocols/jabber/adhoccommands.c
@@ -223,7 +223,7 @@ jabber_adhoc_parse(JabberStream *js, const char *from,
 	}
 }
 
-void jabber_adhoc_execute_action(PurpleBListNode *node, gpointer data) {
+void jabber_adhoc_execute_action(PurpleBlistNode *node, gpointer data) {
 	if (PURPLE_IS_BUDDY(node)) {
 		JabberAdHocCommands *cmd = data;
 		PurpleBuddy *buddy = (PurpleBuddy *) node;
diff --git a/libpurple/protocols/jabber/adhoccommands.h b/libpurple/protocols/jabber/adhoccommands.h
index cc5f7fc1c2..67958c09bb 100644
--- a/libpurple/protocols/jabber/adhoccommands.h
+++ b/libpurple/protocols/jabber/adhoccommands.h
@@ -34,7 +34,7 @@ void jabber_adhoc_disco_result_cb(JabberStream *js, const char *from,
 
 void jabber_adhoc_execute(JabberStream *js, JabberAdHocCommands *cmd);
 
-void jabber_adhoc_execute_action(PurpleBListNode *node, gpointer data);
+void jabber_adhoc_execute_action(PurpleBlistNode *node, gpointer data);
 
 void jabber_adhoc_got_list(JabberStream *js, const char *from, xmlnode *query);
 
diff --git a/libpurple/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c
index 3122188495..3a37315fcc 100644
--- a/libpurple/protocols/jabber/buddy.c
+++ b/libpurple/protocols/jabber/buddy.c
@@ -1227,7 +1227,7 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 		serv_got_alias(js->gc, bare_jid, serverside_alias);
 		b = purple_blist_find_buddy(account, bare_jid);
 		if (b) {
-			purple_blist_node_set_string((PurpleBListNode*)b, "servernick", serverside_alias);
+			purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", serverside_alias);
 		}
 
 		g_free(serverside_alias);
@@ -1692,7 +1692,7 @@ static void jabber_buddy_set_invisibility(JabberStream *js, const char *who,
 	xmlnode_free(presence);
 }
 
-static void jabber_buddy_make_invisible(PurpleBListNode *node, gpointer data)
+static void jabber_buddy_make_invisible(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -1707,7 +1707,7 @@ static void jabber_buddy_make_invisible(PurpleBListNode *node, gpointer data)
 	jabber_buddy_set_invisibility(js, purple_buddy_get_name(buddy), TRUE);
 }
 
-static void jabber_buddy_make_visible(PurpleBListNode *node, gpointer data)
+static void jabber_buddy_make_visible(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -1736,7 +1736,7 @@ static void cancel_presence_notification(gpointer data)
 }
 
 static void
-jabber_buddy_cancel_presence_notification(PurpleBListNode *node,
+jabber_buddy_cancel_presence_notification(PurpleBlistNode *node,
                                           gpointer data)
 {
 	PurpleBuddy *buddy;
@@ -1760,7 +1760,7 @@ jabber_buddy_cancel_presence_notification(PurpleBListNode *node,
 	g_free(msg);
 }
 
-static void jabber_buddy_rerequest_auth(PurpleBListNode *node, gpointer data)
+static void jabber_buddy_rerequest_auth(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -1776,7 +1776,7 @@ static void jabber_buddy_rerequest_auth(PurpleBListNode *node, gpointer data)
 }
 
 
-static void jabber_buddy_unsubscribe(PurpleBListNode *node, gpointer data)
+static void jabber_buddy_unsubscribe(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -1791,7 +1791,7 @@ static void jabber_buddy_unsubscribe(PurpleBListNode *node, gpointer data)
 	jabber_presence_subscription_set(js, purple_buddy_get_name(buddy), "unsubscribe");
 }
 
-static void jabber_buddy_login(PurpleBListNode *node, gpointer data) {
+static void jabber_buddy_login(PurpleBlistNode *node, gpointer data) {
 	if(PURPLE_IS_BUDDY(node)) {
 		/* simply create a directed presence of the current status */
 		PurpleBuddy *buddy = (PurpleBuddy *) node;
@@ -1817,7 +1817,7 @@ static void jabber_buddy_login(PurpleBListNode *node, gpointer data) {
 	}
 }
 
-static void jabber_buddy_logout(PurpleBListNode *node, gpointer data) {
+static void jabber_buddy_logout(PurpleBlistNode *node, gpointer data) {
 	if(PURPLE_IS_BUDDY(node)) {
 		/* simply create a directed unavailable presence */
 		PurpleBuddy *buddy = (PurpleBuddy *) node;
@@ -1930,7 +1930,7 @@ static GList *jabber_buddy_menu(PurpleBuddy *buddy)
 }
 
 GList *
-jabber_blist_node_menu(PurpleBListNode *node)
+jabber_blist_node_menu(PurpleBlistNode *node)
 {
 	if(PURPLE_IS_BUDDY(node)) {
 		return jabber_buddy_menu((PurpleBuddy *) node);
diff --git a/libpurple/protocols/jabber/buddy.h b/libpurple/protocols/jabber/buddy.h
index f1cf20c533..3574c8e524 100644
--- a/libpurple/protocols/jabber/buddy.h
+++ b/libpurple/protocols/jabber/buddy.h
@@ -100,7 +100,7 @@ JabberBuddyResource *jabber_buddy_track_resource(JabberBuddy *jb, const char *re
 void jabber_buddy_remove_resource(JabberBuddy *jb, const char *resource);
 void jabber_buddy_get_info(PurpleConnection *gc, const char *who);
 
-GList *jabber_blist_node_menu(PurpleBListNode *node);
+GList *jabber_blist_node_menu(PurpleBlistNode *node);
 
 void jabber_set_info(PurpleConnection *gc, const char *info);
 void jabber_setup_set_info(PurplePluginAction *action);
diff --git a/libpurple/protocols/jabber/google/google.c b/libpurple/protocols/jabber/google/google.c
index 85c4c3d115..ba79112c14 100644
--- a/libpurple/protocols/jabber/google/google.c
+++ b/libpurple/protocols/jabber/google/google.c
@@ -143,7 +143,7 @@ char *jabber_google_format_to_html(const char *text)
 
 
 
-void google_buddy_node_chat(PurpleBListNode *node, gpointer data)
+void google_buddy_node_chat(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
diff --git a/libpurple/protocols/jabber/google/google.h b/libpurple/protocols/jabber/google/google.h
index 9b44b7a220..3f6a80361e 100644
--- a/libpurple/protocols/jabber/google/google.h
+++ b/libpurple/protocols/jabber/google/google.h
@@ -30,6 +30,6 @@
 
 char *jabber_google_format_to_html(const char *text);
 
-void google_buddy_node_chat(PurpleBListNode *node, gpointer data);
+void google_buddy_node_chat(PurpleBlistNode *node, gpointer data);
 
 #endif   /* PURPLE_JABBER_GOOGLE_H_ */
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index 5994d73513..cb230bb7f9 100644
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -2587,7 +2587,7 @@ GList *jabber_actions(PurplePlugin *plugin, gpointer context)
 
 PurpleChat *jabber_find_blist_chat(PurpleAccount *account, const char *name)
 {
-	PurpleBListNode *gnode, *cnode;
+	PurpleBlistNode *gnode, *cnode;
 	JabberID *jid;
 
 	if(!(jid = jabber_id_new(name)))
diff --git a/libpurple/protocols/jabber/roster.c b/libpurple/protocols/jabber/roster.c
index 19b3f4e9cf..8a4f4ccce9 100644
--- a/libpurple/protocols/jabber/roster.c
+++ b/libpurple/protocols/jabber/roster.c
@@ -142,7 +142,7 @@ static void add_purple_buddy_to_groups(JabberStream *js, const char *jid,
 			const char *servernick, *balias;
 
 			/* Previously stored serverside / buddy-supplied alias */
-			if((servernick = purple_blist_node_get_string((PurpleBListNode*)b, "servernick")))
+			if((servernick = purple_blist_node_get_string((PurpleBlistNode*)b, "servernick")))
 				serv_got_alias(js->gc, jid, servernick);
 
 			/* Alias from our roster retrieval */
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
index 4b44dc8290..d9cc0b663e 100644
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -770,7 +770,7 @@ msn_show_hotmail_inbox(PurplePluginAction *action)
 }
 
 static void
-show_send_to_mobile_cb(PurpleBListNode *node, gpointer ignored)
+show_send_to_mobile_cb(PurpleBlistNode *node, gpointer ignored)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -824,7 +824,7 @@ msn_send_privacy(PurpleConnection *gc)
 }
 
 static void
-initiate_chat_cb(PurpleBListNode *node, gpointer data)
+initiate_chat_cb(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -1312,7 +1312,7 @@ msn_buddy_menu(PurpleBuddy *buddy)
 }
 
 static GList *
-msn_blist_node_menu(PurpleBListNode *node)
+msn_blist_node_menu(PurpleBlistNode *node)
 {
 	if(PURPLE_IS_BUDDY(node))
 	{
diff --git a/libpurple/protocols/mxit/mxit.c b/libpurple/protocols/mxit/mxit.c
index 751da6b33e..02e75b64ff 100644
--- a/libpurple/protocols/mxit/mxit.c
+++ b/libpurple/protocols/mxit/mxit.c
@@ -607,7 +607,7 @@ static GHashTable* mxit_get_text_table( PurpleAccount* acc )
  *  @param node		The entry in the buddy list.
  *  @param ignored	(not used)
  */
-static void mxit_reinvite( PurpleBListNode *node, gpointer ignored )
+static void mxit_reinvite( PurpleBlistNode *node, gpointer ignored )
 {
 	PurpleBuddy*		buddy		= (PurpleBuddy *) node;
 	PurpleConnection*	gc			= purple_account_get_connection( purple_buddy_get_account( buddy ) );
@@ -628,7 +628,7 @@ static void mxit_reinvite( PurpleBListNode *node, gpointer ignored )
  *
  *  @param node		The entry in the buddy list.
  */
-static GList* mxit_blist_menu( PurpleBListNode *node )
+static GList* mxit_blist_menu( PurpleBlistNode *node )
 {
 	PurpleBuddy*		buddy;
 	struct contact*		contact;
diff --git a/libpurple/protocols/myspace/user.c b/libpurple/protocols/myspace/user.c
index ec17ddf774..5a83652e60 100644
--- a/libpurple/protocols/myspace/user.c
+++ b/libpurple/protocols/myspace/user.c
@@ -54,7 +54,7 @@ msim_get_user_from_buddy(PurpleBuddy *buddy, gboolean create)
 
 	user = purple_buddy_get_protocol_data(buddy);
 	if (create && !user) {
-		PurpleBListNode *node = PURPLE_BLIST_NODE(buddy);
+		PurpleBlistNode *node = PURPLE_BLIST_NODE(buddy);
 
 		/* No MsimUser for this buddy; make one. */
 
diff --git a/libpurple/protocols/myspace/zap.c b/libpurple/protocols/myspace/zap.c
index fb4266d7c4..09dcf49bd1 100644
--- a/libpurple/protocols/myspace/zap.c
+++ b/libpurple/protocols/myspace/zap.c
@@ -155,7 +155,7 @@ msim_send_attention(PurpleConnection *gc, const gchar *username, guint code)
 
 /** Zap someone. Callback from msim_blist_node_menu zap menu. */
 static void
-msim_send_zap_from_menu(PurpleBListNode *node, gpointer zap_num_ptr)
+msim_send_zap_from_menu(PurpleBlistNode *node, gpointer zap_num_ptr)
 {
 	PurpleBuddy *buddy;
 	PurpleAccount *account;
@@ -184,7 +184,7 @@ msim_send_zap_from_menu(PurpleBListNode *node, gpointer zap_num_ptr)
 
 /** Return menu, if any, for a buddy list node. */
 GList *
-msim_blist_node_menu(PurpleBListNode *node)
+msim_blist_node_menu(PurpleBlistNode *node)
 {
 	GList *menu, *zap_menu;
 	GList *types;
diff --git a/libpurple/protocols/myspace/zap.h b/libpurple/protocols/myspace/zap.h
index 5570fad68c..d6bf52c364 100644
--- a/libpurple/protocols/myspace/zap.h
+++ b/libpurple/protocols/myspace/zap.h
@@ -22,7 +22,7 @@
 
 GList *msim_attention_types(PurpleAccount *acct);
 gboolean msim_send_attention(PurpleConnection *gc, const gchar *username, guint code);
-GList *msim_blist_node_menu(PurpleBListNode *node);
+GList *msim_blist_node_menu(PurpleBlistNode *node);
 gboolean msim_incoming_zap(MsimSession *session, MsimMessage *msg);
 
 #endif /* !_MYSPACE_ZAP_H */
diff --git a/libpurple/protocols/novell/novell.c b/libpurple/protocols/novell/novell.c
index 8207b7393e..7c366b3670 100644
--- a/libpurple/protocols/novell/novell.c
+++ b/libpurple/protocols/novell/novell.c
@@ -1228,9 +1228,9 @@ _update_buddy_status(NMUser *user, PurpleBuddy * buddy, int novellstatus, int gm
 static void
 _remove_purple_buddies(NMUser *user)
 {
-	PurpleBListNode *gnode;
-	PurpleBListNode *cnode;
-	PurpleBListNode *bnode;
+	PurpleBlistNode *gnode;
+	PurpleBlistNode *cnode;
+	PurpleBlistNode *bnode;
 	PurpleGroup *group;
 	PurpleBuddy *buddy;
 	GSList *rem_list = NULL;
@@ -1615,7 +1615,7 @@ _reject_conference_cb(GSList * parms)
 }
 
 static void
-_initiate_conference_cb(PurpleBListNode *node, gpointer ignored)
+_initiate_conference_cb(PurpleBlistNode *node, gpointer ignored)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -3443,7 +3443,7 @@ novell_set_permit_deny(PurpleConnection *gc)
 }
 
 static GList *
-novell_blist_node_menu(PurpleBListNode *node)
+novell_blist_node_menu(PurpleBlistNode *node)
 {
 	GList *list = NULL;
 	PurpleMenuAction *act;
diff --git a/libpurple/protocols/null/nullprpl.c b/libpurple/protocols/null/nullprpl.c
index 1097840d95..8d62f57a63 100644
--- a/libpurple/protocols/null/nullprpl.c
+++ b/libpurple/protocols/null/nullprpl.c
@@ -311,7 +311,7 @@ static GList *nullprpl_status_types(PurpleAccount *acct)
   return g_list_reverse(types);
 }
 
-static void blist_example_menu_item(PurpleBListNode *node, gpointer userdata) {
+static void blist_example_menu_item(PurpleBlistNode *node, gpointer userdata) {
   purple_debug_info("nullprpl", "example menu item clicked on user %s\n",
                     ((PurpleBuddy *)node)->name);
 
@@ -321,7 +321,7 @@ static void blist_example_menu_item(PurpleBListNode *node, gpointer userdata) {
                      _("This is the callback for the nullprpl menu item."));
 }
 
-static GList *nullprpl_blist_node_menu(PurpleBListNode *node) {
+static GList *nullprpl_blist_node_menu(PurpleBlistNode *node) {
   purple_debug_info("nullprpl", "providing buddy list context menu item\n");
 
   if (PURPLE_IS_BUDDY(node)) {
diff --git a/libpurple/protocols/oscar/authorization.c b/libpurple/protocols/oscar/authorization.c
index 98c9d6d264..22a43b65b4 100644
--- a/libpurple/protocols/oscar/authorization.c
+++ b/libpurple/protocols/oscar/authorization.c
@@ -91,7 +91,7 @@ oscar_auth_dontgrant(const char *msg, gpointer cbdata)
 }
 
 void
-oscar_auth_sendrequest_menu(PurpleBListNode *node, gpointer ignored)
+oscar_auth_sendrequest_menu(PurpleBlistNode *node, gpointer ignored)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
diff --git a/libpurple/protocols/oscar/family_icq.c b/libpurple/protocols/oscar/family_icq.c
index d833abe6a6..a78b2d75aa 100644
--- a/libpurple/protocols/oscar/family_icq.c
+++ b/libpurple/protocols/oscar/family_icq.c
@@ -425,7 +425,7 @@ gotalias(OscarData *od, struct aim_icq_info *info)
 			g_snprintf(who, sizeof(who), "%u", info->uin);
 			serv_got_alias(gc, who, utf8);
 			if ((b = purple_blist_find_buddy(account, who))) {
-				purple_blist_node_set_string((PurpleBListNode*)b, "servernick", utf8);
+				purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", utf8);
 			}
 		}
 		g_free(utf8);
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index 9fb308a793..5bdf9520e0 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -3583,7 +3583,7 @@ void oscar_rename_group(PurpleConnection *gc, const char *old_name, PurpleGroup
 
 			/* Make a list of what the groups each buddy is in */
 			for (cur = moved_buddies; cur != NULL; cur = cur->next) {
-				PurpleBListNode *node = cur->data;
+				PurpleBlistNode *node = cur->data;
 				/* node is PurpleBuddy, parent is a PurpleContact.
 				 * We must go two levels up to get the Group */
 				groups = g_list_append(groups,
@@ -3725,7 +3725,7 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 
 		if (aim_ssi_itemlist_exists(&od->ssi.local, bname)) {
 			/* If the buddy is an ICQ user then load his nickname */
-			const char *servernick = purple_blist_node_get_string((PurpleBListNode*)b, "servernick");
+			const char *servernick = purple_blist_node_get_string((PurpleBlistNode*)b, "servernick");
 			char *alias;
 			const char *balias;
 			if (servernick)
@@ -4696,7 +4696,7 @@ static void oscar_ssi_editcomment(struct name_data *data, const char *text) {
 	oscar_free_name_data(data);
 }
 
-static void oscar_buddycb_edit_comment(PurpleBListNode *node, gpointer ignore) {
+static void oscar_buddycb_edit_comment(PurpleBlistNode *node, gpointer ignore) {
 
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -4761,7 +4761,7 @@ oscar_ask_directim_no_cb(struct oscar_ask_directim_data *data)
 static void
 oscar_ask_directim(gpointer object, gpointer ignored)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
 	gchar *buf;
@@ -4797,7 +4797,7 @@ oscar_ask_directim(gpointer object, gpointer ignored)
 static void
 oscar_close_directim(gpointer object, gpointer ignored)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	PurpleBuddy *buddy;
 	PurpleAccount *account;
 	PurpleConnection *gc;
@@ -4832,7 +4832,7 @@ oscar_close_directim(gpointer object, gpointer ignored)
 	}
 }
 
-static void oscar_get_icqxstatusmsg(PurpleBListNode *node, gpointer ignore)
+static void oscar_get_icqxstatusmsg(PurpleBlistNode *node, gpointer ignore)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -4855,7 +4855,7 @@ static void oscar_get_icqxstatusmsg(PurpleBListNode *node, gpointer ignore)
 }
 
 static void
-oscar_get_aim_info_cb(PurpleBListNode *node, gpointer ignore)
+oscar_get_aim_info_cb(PurpleBlistNode *node, gpointer ignore)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -4959,7 +4959,7 @@ oscar_buddy_menu(PurpleBuddy *buddy) {
 }
 
 
-GList *oscar_blist_node_menu(PurpleBListNode *node) {
+GList *oscar_blist_node_menu(PurpleBlistNode *node) {
 	if(PURPLE_IS_BUDDY(node)) {
 		return oscar_buddy_menu((PurpleBuddy *) node);
 	} else {
diff --git a/libpurple/protocols/oscar/oscar.h b/libpurple/protocols/oscar/oscar.h
index c18d140de2..1ab9e73ad2 100644
--- a/libpurple/protocols/oscar/oscar.h
+++ b/libpurple/protocols/oscar/oscar.h
@@ -1315,7 +1315,7 @@ void oscar_user_info_display_aim(OscarData *od, aim_userinfo_t *userinfo);
 
 /* authorization.c - OSCAR authorization requests */
 void oscar_auth_sendrequest(PurpleConnection *gc, const char *name, const char *msg);
-void oscar_auth_sendrequest_menu(PurpleBListNode *node, gpointer ignored);
+void oscar_auth_sendrequest_menu(PurpleBlistNode *node, gpointer ignored);
 void oscar_auth_recvrequest(PurpleConnection *gc, gchar *name, gchar *nick, gchar *reason);
 
 void oscar_set_aim_permdeny(PurpleConnection *gc);
diff --git a/libpurple/protocols/oscar/oscarcommon.h b/libpurple/protocols/oscar/oscarcommon.h
index 8233ca0360..a3cadfc0ae 100644
--- a/libpurple/protocols/oscar/oscarcommon.h
+++ b/libpurple/protocols/oscar/oscarcommon.h
@@ -67,7 +67,7 @@ const char* oscar_list_emblem(PurpleBuddy *b);
 char *oscar_status_text(PurpleBuddy *b);
 void oscar_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full);
 GList *oscar_status_types(PurpleAccount *account);
-GList *oscar_blist_node_menu(PurpleBListNode *node);
+GList *oscar_blist_node_menu(PurpleBlistNode *node);
 GList *oscar_chat_info(PurpleConnection *gc);
 GHashTable *oscar_chat_info_defaults(PurpleConnection *gc, const char *chat_name);
 void oscar_login(PurpleAccount *account);
diff --git a/libpurple/protocols/oscar/visibility.c b/libpurple/protocols/oscar/visibility.c
index 8001d3a7e2..123f14a595 100644
--- a/libpurple/protocols/oscar/visibility.c
+++ b/libpurple/protocols/oscar/visibility.c
@@ -55,7 +55,7 @@ is_buddy_on_list(OscarData *od, const char *bname)
 }
 
 static void
-visibility_cb(PurpleBListNode *node, gpointer whatever)
+visibility_cb(PurpleBlistNode *node, gpointer whatever)
 {
 	PurpleBuddy *buddy = PURPLE_BUDDY(node);
 	const char* bname = purple_buddy_get_name(buddy);
diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c
index 002f862c6d..4a6e4a6f0b 100644
--- a/libpurple/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
@@ -565,11 +565,11 @@ static void mw_aware_list_on_aware(struct mwAwareList *list,
   if(aware->group) {
     PurpleGroup *group;
     PurpleBuddy *buddy;
-    PurpleBListNode *bnode;
+    PurpleBlistNode *bnode;
 
     group = g_hash_table_lookup(pd->group_list_map, list);
     buddy = purple_blist_find_buddy_in_group(acct, id, group);
-    bnode = (PurpleBListNode *) buddy;
+    bnode = (PurpleBlistNode *) buddy;
 
     if(! buddy) {
       struct mwServiceResolve *srvc;
@@ -578,7 +578,7 @@ static void mw_aware_list_on_aware(struct mwAwareList *list,
       buddy = purple_buddy_new(acct, id, NULL);
       purple_blist_add_buddy(buddy, NULL, group, NULL);
 
-      bnode = (PurpleBListNode *) buddy;
+      bnode = (PurpleBlistNode *) buddy;
 
       srvc = pd->srvc_resolve;
       query = g_list_append(NULL, (char *) id);
@@ -659,7 +659,7 @@ static void blist_export(PurpleConnection *gc, struct mwSametimeList *stlist) {
   */
 
   PurpleAccount *acct;
-  PurpleBListNode *gn, *cn, *bn;
+  PurpleBlistNode *gn, *cn, *bn;
   PurpleGroup *grp;
   PurpleBuddy *bdy;
 
@@ -870,8 +870,8 @@ static PurpleBuddy *buddy_ensure(PurpleConnection *gc, PurpleGroup *group,
 
   purple_buddy_set_local_alias(buddy, alias);
   purple_buddy_set_server_alias(buddy, name);
-  purple_blist_node_set_string((PurpleBListNode *) buddy, BUDDY_KEY_NAME, name);
-  purple_blist_node_set_int((PurpleBListNode *) buddy, BUDDY_KEY_TYPE, type);
+  purple_blist_node_set_string((PurpleBlistNode *) buddy, BUDDY_KEY_NAME, name);
+  purple_blist_node_set_int((PurpleBlistNode *) buddy, BUDDY_KEY_TYPE, type);
 
   return buddy;
 }
@@ -886,7 +886,7 @@ static void group_add(struct mwPurplePluginData *pd,
   const char *n;
   GList *add;
 
-  n = purple_blist_node_get_string((PurpleBListNode *) group, GROUP_KEY_NAME);
+  n = purple_blist_node_get_string((PurpleBlistNode *) group, GROUP_KEY_NAME);
   if(! n) n = purple_group_get_name(group);
 
   idb.user = (char *) n;
@@ -905,7 +905,7 @@ static PurpleGroup *group_ensure(PurpleConnection *gc,
   PurpleAccount *acct;
   PurpleGroup *group = NULL;
   PurpleBuddyList *blist;
-  PurpleBListNode *gn;
+  PurpleBlistNode *gn;
   const char *name, *alias, *owner;
   enum mwSametimeGroupType type;
 
@@ -964,7 +964,7 @@ static PurpleGroup *group_ensure(PurpleConnection *gc,
     purple_blist_add_group(group, NULL);
   }
 
-  gn = (PurpleBListNode *) group;
+  gn = (PurpleBlistNode *) group;
   purple_blist_node_set_string(gn, GROUP_KEY_NAME, name);
   purple_blist_node_set_int(gn, GROUP_KEY_TYPE, type);
 
@@ -1009,7 +1009,7 @@ static void blist_merge(PurpleConnection *gc, struct mwSametimeList *stlist) {
 static void group_clear(PurpleGroup *group, PurpleAccount *acct, gboolean del) {
   PurpleConnection *gc;
   GList *prune = NULL;
-  PurpleBListNode *gn, *cn, *bn;
+  PurpleBlistNode *gn, *cn, *bn;
 
   g_return_if_fail(group != NULL);
 
@@ -1018,7 +1018,7 @@ static void group_clear(PurpleGroup *group, PurpleAccount *acct, gboolean del) {
   gc = purple_account_get_connection(acct);
   g_return_if_fail(gc != NULL);
 
-  gn = (PurpleBListNode *) group;
+  gn = (PurpleBlistNode *) group;
 
   for(cn = purple_blist_node_get_first_child(gn);
 		  cn;
@@ -1062,7 +1062,7 @@ static void group_prune(PurpleConnection *gc, PurpleGroup *group,
 			struct mwSametimeGroup *stgroup) {
 
   PurpleAccount *acct;
-  PurpleBListNode *gn, *cn, *bn;
+  PurpleBlistNode *gn, *cn, *bn;
 
   GHashTable *stusers;
   GList *prune = NULL;
@@ -1087,7 +1087,7 @@ static void group_prune(PurpleConnection *gc, PurpleGroup *group,
   }
   g_list_free(utl);
 
-  gn = (PurpleBListNode *) group;
+  gn = (PurpleBlistNode *) group;
 
   for(cn = purple_blist_node_get_first_child(gn);
 		  cn;
@@ -1129,7 +1129,7 @@ static void blist_sync(PurpleConnection *gc, struct mwSametimeList *stlist) {
 
   PurpleAccount *acct;
   PurpleBuddyList *blist;
-  PurpleBListNode *gn;
+  PurpleBlistNode *gn;
 
   GHashTable *stgroups;
   GList *g_prune = NULL;
@@ -1201,7 +1201,7 @@ static void blist_sync(PurpleConnection *gc, struct mwSametimeList *stlist) {
   /* prune all marked groups */
   while(g_prune) {
     PurpleGroup *grp = g_prune->data;
-    PurpleBListNode *gn = (PurpleBListNode *) grp;
+    PurpleBlistNode *gn = (PurpleBlistNode *) grp;
     const char *owner;
     gboolean del = TRUE;
 
@@ -1292,7 +1292,7 @@ static void conversation_created_cb(PurpleConversation *g_conv,
 }
 
 
-static void blist_menu_nab(PurpleBListNode *node, gpointer data) {
+static void blist_menu_nab(PurpleBlistNode *node, gpointer data) {
   struct mwPurplePluginData *pd = data;
   PurpleConnection *gc;
 
@@ -1330,7 +1330,7 @@ static void blist_menu_nab(PurpleBListNode *node, gpointer data) {
 /** The normal blist menu prpl function doesn't get called for groups,
     so we use the blist-node-extended-menu signal to trigger this
     handler */
-static void blist_node_menu_cb(PurpleBListNode *node,
+static void blist_node_menu_cb(PurpleBlistNode *node,
                                GList **menu, struct mwPurplePluginData *pd) {
   const char *owner;
   PurpleAccount *acct;
@@ -1370,7 +1370,7 @@ static void blist_node_menu_cb(PurpleBListNode *node,
 /* lifted this from oldstatus, since HEAD doesn't do this at login
    anymore. */
 static void blist_init(PurpleAccount *acct) {
-  PurpleBListNode *gnode, *cnode, *bnode;
+  PurpleBlistNode *gnode, *cnode, *bnode;
   GList *add_buds = NULL;
 
   for(gnode = purple_blist_get_root(); gnode;
@@ -1410,7 +1410,7 @@ static void services_starting(struct mwPurplePluginData *pd) {
   PurpleConnection *gc;
   PurpleAccount *acct;
   struct mwStorageUnit *unit;
-  PurpleBListNode *l;
+  PurpleBlistNode *l;
 
   gc = pd->gc;
   acct = purple_connection_get_account(gc);
@@ -2593,7 +2593,7 @@ static void mw_conversation_opened(struct mwConversation *conv) {
 
     buddy = purple_blist_find_buddy(acct, info->user_id);
     if(buddy) {
-      purple_blist_node_set_int((PurpleBListNode *) buddy,
+      purple_blist_node_set_int((PurpleBlistNode *) buddy,
 			      BUDDY_KEY_CLIENT, info->type);
     }
   }
@@ -3536,7 +3536,7 @@ static void blist_menu_conf_list(PurpleBuddy *buddy,
 }
 
 
-static void blist_menu_conf(PurpleBListNode *node, gpointer data) {
+static void blist_menu_conf(PurpleBlistNode *node, gpointer data) {
   PurpleBuddy *buddy = (PurpleBuddy *) node;
   PurpleAccount *acct;
   PurpleConnection *gc;
@@ -3573,7 +3573,7 @@ static void blist_menu_conf(PurpleBListNode *node, gpointer data) {
 
 
 #if 0
-static void blist_menu_announce(PurpleBListNode *node, gpointer data) {
+static void blist_menu_announce(PurpleBlistNode *node, gpointer data) {
   PurpleBuddy *buddy = (PurpleBuddy *) node;
   PurpleAccount *acct;
   PurpleConnection *gc;
@@ -3608,7 +3608,7 @@ static void blist_menu_announce(PurpleBListNode *node, gpointer data) {
 #endif
 
 
-static GList *mw_prpl_blist_node_menu(PurpleBListNode *node) {
+static GList *mw_prpl_blist_node_menu(PurpleBlistNode *node) {
   GList *l = NULL;
   PurpleMenuAction *act;
 
@@ -4152,7 +4152,7 @@ static void mw_prpl_get_info(PurpleConnection *gc, const char *who) {
 		purple_notify_user_info_add_pair_html(user_info, _("Full Name"), purple_buddy_get_server_alias(b));
     }
 
-    type = purple_blist_node_get_int((PurpleBListNode *) b, BUDDY_KEY_CLIENT);
+    type = purple_blist_node_get_int((PurpleBlistNode *) b, BUDDY_KEY_CLIENT);
     if(type) {
 	  tmp2 = mw_client_name(type);
 	  if (tmp2) {
@@ -4397,7 +4397,7 @@ static void add_buddy_resolved(struct mwServiceResolve *srvc,
 
 	/* same person, set the server alias */
 	purple_buddy_set_server_alias(buddy, match->name);
-	purple_blist_node_set_string((PurpleBListNode *) buddy,
+	purple_blist_node_set_string((PurpleBlistNode *) buddy,
 				   BUDDY_KEY_NAME, match->name);
 
 	/* subscribe to awareness */
@@ -4526,7 +4526,7 @@ static void mw_prpl_add_buddies(PurpleConnection *gc,
     GList *l;
 
     /* nab the saved server alias and stick it on the buddy */
-    fn = purple_blist_node_get_string((PurpleBListNode *) b, BUDDY_KEY_NAME);
+    fn = purple_blist_node_get_string((PurpleBlistNode *) b, BUDDY_KEY_NAME);
     purple_buddy_set_server_alias(b, fn);
 
     /* convert PurpleBuddy into a mwAwareIdBlock */
@@ -5330,7 +5330,7 @@ static void remote_group_done(struct mwPurplePluginData *pd,
   PurpleConnection *gc;
   PurpleAccount *acct;
   PurpleGroup *group;
-  PurpleBListNode *gn;
+  PurpleBlistNode *gn;
   const char *owner;
 
   g_return_if_fail(pd != NULL);
@@ -5356,7 +5356,7 @@ static void remote_group_done(struct mwPurplePluginData *pd,
   }
 
   group = purple_group_new(name);
-  gn = (PurpleBListNode *) group;
+  gn = (PurpleBlistNode *) group;
 
   owner = purple_account_get_username(acct);
 
diff --git a/libpurple/protocols/silc/buddy.c b/libpurple/protocols/silc/buddy.c
index 59805bdb58..5fc90a3b17 100644
--- a/libpurple/protocols/silc/buddy.c
+++ b/libpurple/protocols/silc/buddy.c
@@ -26,7 +26,7 @@
 /***************************** Key Agreement *********************************/
 
 static void
-silcpurple_buddy_keyagr(PurpleBListNode *node, gpointer data);
+silcpurple_buddy_keyagr(PurpleBlistNode *node, gpointer data);
 
 static void
 silcpurple_buddy_keyagr_do(PurpleConnection *gc, const char *name,
@@ -320,7 +320,7 @@ void silcpurple_buddy_keyagr_request(SilcClient client,
 }
 
 static void
-silcpurple_buddy_keyagr(PurpleBListNode *node, gpointer data)
+silcpurple_buddy_keyagr(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *buddy;
 	PurpleAccount *account;
@@ -335,7 +335,7 @@ silcpurple_buddy_keyagr(PurpleBListNode *node, gpointer data)
 /**************************** Static IM Key **********************************/
 
 static void
-silcpurple_buddy_resetkey(PurpleBListNode *node, gpointer data)
+silcpurple_buddy_resetkey(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *b;
 	PurpleConnection *gc;
@@ -463,7 +463,7 @@ silcpurple_buddy_privkey(PurpleConnection *gc, const char *name)
 }
 
 static void
-silcpurple_buddy_privkey_menu(PurpleBListNode *node, gpointer data)
+silcpurple_buddy_privkey_menu(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -592,7 +592,7 @@ silcpurple_buddy_getkey(PurpleConnection *gc, const char *name)
 }
 
 static void
-silcpurple_buddy_getkey_menu(PurpleBListNode *node, gpointer data)
+silcpurple_buddy_getkey_menu(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -606,7 +606,7 @@ silcpurple_buddy_getkey_menu(PurpleBListNode *node, gpointer data)
 }
 
 static void
-silcpurple_buddy_showkey(PurpleBListNode *node, gpointer data)
+silcpurple_buddy_showkey(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *b;
 	PurpleConnection *gc;
@@ -691,7 +691,7 @@ void silcpurple_get_info(PurpleConnection *gc, const char *who)
 		/* See if we have this buddy's public key.  If we do use that
 		   to search the details. */
 		gpointer proto_data;
-		filename = purple_blist_node_get_string((PurpleBListNode *)b, "public-key");
+		filename = purple_blist_node_get_string((PurpleBlistNode *)b, "public-key");
 		if (filename) {
 			/* Call WHOIS.  The user info is displayed in the WHOIS
 			   command reply. */
@@ -773,7 +773,7 @@ silcpurple_add_buddy_save(SilcBool success, void *context)
 		g_snprintf(filename, sizeof(filename) - 1,
 			   "%s" G_DIR_SEPARATOR_S "clientkeys" G_DIR_SEPARATOR_S "clientkey_%s.pub",
 			   silcpurple_silcdir(), fingerprint);
-		purple_blist_node_set_string((PurpleBListNode *)b, "public-key", filename);
+		purple_blist_node_set_string((PurpleBlistNode *)b, "public-key", filename);
 		purple_prpl_got_user_status(purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), SILCPURPLE_STATUS_ID_OFFLINE, NULL);
 		silc_free(fingerprint);
 		silc_free(r->offline_pk);
@@ -1004,7 +1004,7 @@ silcpurple_add_buddy_save(SilcBool success, void *context)
 	g_snprintf(filename, sizeof(filename) - 1,
 		   "%s" G_DIR_SEPARATOR_S "clientkeys" G_DIR_SEPARATOR_S "clientkey_%s.pub",
 		   silcpurple_silcdir(), fingerprint);
-	purple_blist_node_set_string((PurpleBListNode *)b, "public-key", filename);
+	purple_blist_node_set_string((PurpleBlistNode *)b, "public-key", filename);
 
 	/* Update online status */
 	purple_prpl_got_user_status(purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), SILCPURPLE_STATUS_ID_AVAILABLE, NULL);
@@ -1216,7 +1216,7 @@ silcpurple_add_buddy_resolved(SilcClient client,
 	SilcUInt16 cmd_ident;
 	const char *name;
 
-	filename = purple_blist_node_get_string((PurpleBListNode *)b, "public-key");
+	filename = purple_blist_node_get_string((PurpleBlistNode *)b, "public-key");
 
 	/* If the buddy is offline/nonexistent, we will require user
 	   to associate a public key with the buddy or the buddy
@@ -1355,7 +1355,7 @@ silcpurple_add_buddy_i(PurpleConnection *gc, PurpleBuddy *b, gboolean init)
 
 	/* See if we have this buddy's public key.  If we do use that
 	   to search the details. */
-	filename = purple_blist_node_get_string((PurpleBListNode *)b, "public-key");
+	filename = purple_blist_node_get_string((PurpleBlistNode *)b, "public-key");
 	if (filename) {
 		SilcPublicKey public_key;
 		SilcAttributeObjPk userpk;
@@ -1615,7 +1615,7 @@ void silcpurple_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gb
 }
 
 static void
-silcpurple_buddy_kill(PurpleBListNode *node, gpointer data)
+silcpurple_buddy_kill(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *b;
 	PurpleConnection *gc;
@@ -1638,7 +1638,7 @@ typedef struct {
 } *SilcPurpleBuddyWb;
 
 static void
-silcpurple_buddy_wb(PurpleBListNode *node, gpointer data)
+silcpurple_buddy_wb(PurpleBlistNode *node, gpointer data)
 {
 	SilcPurpleBuddyWb wb = data;
 	silcpurple_wb_init(wb->sg, wb->client_entry);
@@ -1657,7 +1657,7 @@ GList *silcpurple_buddy_menu(PurpleBuddy *buddy)
 	GList *m = NULL;
 	SilcPurpleBuddyWb wb;
 
-	pkfile = purple_blist_node_get_string((PurpleBListNode *) buddy, "public-key");
+	pkfile = purple_blist_node_get_string((PurpleBlistNode *) buddy, "public-key");
 	client_entry = silc_client_get_client_by_id(sg->client,
 						    sg->conn,
 						    purple_buddy_get_protocol_data(buddy));
diff --git a/libpurple/protocols/silc/chat.c b/libpurple/protocols/silc/chat.c
index f37142fa27..3cd91a0e84 100644
--- a/libpurple/protocols/silc/chat.c
+++ b/libpurple/protocols/silc/chat.c
@@ -180,7 +180,7 @@ silcpurple_chat_getinfo(PurpleConnection *gc, GHashTable *components)
 
 
 static void
-silcpurple_chat_getinfo_menu(PurpleBListNode *node, gpointer data)
+silcpurple_chat_getinfo_menu(PurpleBlistNode *node, gpointer data)
 {
 	PurpleChat *chat = (PurpleChat *)node;
 	PurpleAccount *account = purple_chat_get_account(chat);
@@ -194,7 +194,7 @@ silcpurple_chat_getinfo_menu(PurpleBListNode *node, gpointer data)
 /************************** Channel Invite List ******************************/
 
 static void
-silcpurple_chat_invitelist(PurpleBListNode *node, gpointer data);
+silcpurple_chat_invitelist(PurpleBlistNode *node, gpointer data);
 {
 
 }
@@ -203,7 +203,7 @@ silcpurple_chat_invitelist(PurpleBListNode *node, gpointer data);
 /**************************** Channel Ban List *******************************/
 
 static void
-silcpurple_chat_banlist(PurpleBListNode *node, gpointer data);
+silcpurple_chat_banlist(PurpleBlistNode *node, gpointer data);
 {
 
 }
@@ -366,7 +366,7 @@ silcpurple_chat_chauth_ok(SilcPurpleChauth sgc, PurpleRequestFields *fields)
 
 	f = purple_request_fields_get_field(fields, "passphrase");
 	val = purple_request_field_string_get_value(f);
-	curpass = purple_blist_node_get_string((PurpleBListNode *)sgc->c, "passphrase");
+	curpass = purple_blist_node_get_string((PurpleBlistNode *)sgc->c, "passphrase");
 
 	if (!val && curpass)
 		set = 0;
@@ -380,11 +380,11 @@ silcpurple_chat_chauth_ok(SilcPurpleChauth sgc, PurpleRequestFields *fields)
 	if (set == 1) {
 		silc_client_command_call(sg->client, sg->conn, NULL, "CMODE",
 					 sgc->channel->channel_name, "+a", val, NULL);
-		purple_blist_node_set_string((PurpleBListNode *)sgc->c, "passphrase", val);
+		purple_blist_node_set_string((PurpleBlistNode *)sgc->c, "passphrase", val);
 	} else if (set == 0) {
 		silc_client_command_call(sg->client, sg->conn, NULL, "CMODE",
 					 sgc->channel->channel_name, "-a", NULL);
-		purple_blist_node_remove_setting((PurpleBListNode *)sgc->c, "passphrase");
+		purple_blist_node_remove_setting((PurpleBlistNode *)sgc->c, "passphrase");
 	}
 
 	if (sgc->pubkeys) {
@@ -421,7 +421,7 @@ void silcpurple_chat_chauth_show(SilcPurple sg, SilcChannelEntry channel,
 	fields = purple_request_fields_new();
 
 	if (sgc->c)
-	  curpass = purple_blist_node_get_string((PurpleBListNode *)sgc->c, "passphrase");
+	  curpass = purple_blist_node_get_string((PurpleBlistNode *)sgc->c, "passphrase");
 
 	g = purple_request_field_group_new(NULL);
 	f = purple_request_field_string_new("passphrase", _("Channel Passphrase"),
@@ -490,7 +490,7 @@ void silcpurple_chat_chauth_show(SilcPurple sg, SilcChannelEntry channel,
 }
 
 static void
-silcpurple_chat_chauth(PurpleBListNode *node, gpointer data)
+silcpurple_chat_chauth(PurpleBlistNode *node, gpointer data)
 {
 	PurpleChat *chat;
 	PurpleConnection *gc;
@@ -553,10 +553,10 @@ silcpurple_chat_prv_add(SilcPurpleCharPrv p, PurpleRequestFields *fields)
 
 	cn = purple_chat_new(sg->account, alias, comp);
 	g = purple_chat_get_group(p->c);
-	purple_blist_add_chat(cn, g, (PurpleBListNode *)p->c);
+	purple_blist_add_chat(cn, g, (PurpleBlistNode *)p->c);
 
 	/* Associate to a real channel */
-	purple_blist_node_set_string((PurpleBListNode *)cn, "parentch", p->channel);
+	purple_blist_node_set_string((PurpleBlistNode *)cn, "parentch", p->channel);
 
 	/* Join the group */
 	silcpurple_chat_join(sg->gc, comp);
@@ -571,7 +571,7 @@ silcpurple_chat_prv_cancel(SilcPurpleCharPrv p, PurpleRequestFields *fields)
 }
 
 static void
-silcpurple_chat_prv(PurpleBListNode *node, gpointer data)
+silcpurple_chat_prv(PurpleBlistNode *node, gpointer data)
 {
 	PurpleChat *chat;
 	PurpleConnection *gc;
@@ -627,7 +627,7 @@ silcpurple_chat_prv(PurpleBListNode *node, gpointer data)
 /****************************** Channel Modes ********************************/
 
 static void
-silcpurple_chat_permanent_reset(PurpleBListNode *node, gpointer data)
+silcpurple_chat_permanent_reset(PurpleBlistNode *node, gpointer data)
 {
 	PurpleChat *chat;
 	PurpleConnection *gc;
@@ -645,7 +645,7 @@ silcpurple_chat_permanent_reset(PurpleBListNode *node, gpointer data)
 }
 
 static void
-silcpurple_chat_permanent(PurpleBListNode *node, gpointer data)
+silcpurple_chat_permanent(PurpleBlistNode *node, gpointer data)
 {
 	PurpleChat *chat;
 	PurpleConnection *gc;
@@ -718,7 +718,7 @@ silcpurple_chat_ulimit_cb(SilcPurpleChatInput s, const char *limit)
 }
 
 static void
-silcpurple_chat_ulimit(PurpleBListNode *node, gpointer data)
+silcpurple_chat_ulimit(PurpleBlistNode *node, gpointer data)
 {
 	PurpleChat *chat;
 	PurpleConnection *gc;
@@ -758,7 +758,7 @@ silcpurple_chat_ulimit(PurpleBListNode *node, gpointer data)
 }
 
 static void
-silcpurple_chat_resettopic(PurpleBListNode *node, gpointer data)
+silcpurple_chat_resettopic(PurpleBlistNode *node, gpointer data)
 {
 	PurpleChat *chat;
 	PurpleConnection *gc;
@@ -776,7 +776,7 @@ silcpurple_chat_resettopic(PurpleBListNode *node, gpointer data)
 }
 
 static void
-silcpurple_chat_settopic(PurpleBListNode *node, gpointer data)
+silcpurple_chat_settopic(PurpleBlistNode *node, gpointer data)
 {
 	PurpleChat *chat;
 	PurpleConnection *gc;
@@ -794,7 +794,7 @@ silcpurple_chat_settopic(PurpleBListNode *node, gpointer data)
 }
 
 static void
-silcpurple_chat_resetprivate(PurpleBListNode *node, gpointer data)
+silcpurple_chat_resetprivate(PurpleBlistNode *node, gpointer data)
 {
 	PurpleChat *chat;
 	PurpleConnection *gc;
@@ -812,7 +812,7 @@ silcpurple_chat_resetprivate(PurpleBListNode *node, gpointer data)
 }
 
 static void
-silcpurple_chat_setprivate(PurpleBListNode *node, gpointer data)
+silcpurple_chat_setprivate(PurpleBlistNode *node, gpointer data)
 {
 	PurpleChat *chat;
 	PurpleConnection *gc;
@@ -830,7 +830,7 @@ silcpurple_chat_setprivate(PurpleBListNode *node, gpointer data)
 }
 
 static void
-silcpurple_chat_resetsecret(PurpleBListNode *node, gpointer data)
+silcpurple_chat_resetsecret(PurpleBlistNode *node, gpointer data)
 {
 	PurpleChat *chat;
 	PurpleConnection *gc;
@@ -848,7 +848,7 @@ silcpurple_chat_resetsecret(PurpleBListNode *node, gpointer data)
 }
 
 static void
-silcpurple_chat_setsecret(PurpleBListNode *node, gpointer data)
+silcpurple_chat_setsecret(PurpleBlistNode *node, gpointer data)
 {
 	PurpleChat *chat;
 	PurpleConnection *gc;
@@ -871,7 +871,7 @@ typedef struct {
 } *SilcPurpleChatWb;
 
 static void
-silcpurple_chat_wb(PurpleBListNode *node, gpointer data)
+silcpurple_chat_wb(PurpleBlistNode *node, gpointer data)
 {
 	SilcPurpleChatWb wb = data;
 	silcpurple_wb_init_ch(wb->sg, wb->channel);
@@ -1040,7 +1040,7 @@ void silcpurple_chat_join(PurpleConnection *gc, GHashTable *data)
 		SilcPurplePrvgrp grp;
 
 		c = purple_blist_find_chat(sg->account, channel);
-		parentch = purple_blist_node_get_string((PurpleBListNode *)c, "parentch");
+		parentch = purple_blist_node_get_string((PurpleBlistNode *)c, "parentch");
 		if (!parentch)
 			return;
 
diff --git a/libpurple/protocols/silc/silc.c b/libpurple/protocols/silc/silc.c
index 9a89ba5d88..40e6954244 100644
--- a/libpurple/protocols/silc/silc.c
+++ b/libpurple/protocols/silc/silc.c
@@ -1530,7 +1530,7 @@ silcpurple_send_im(PurpleConnection *gc, const char *who, const char *message,
 }
 
 
-static GList *silcpurple_blist_node_menu(PurpleBListNode *node) {
+static GList *silcpurple_blist_node_menu(PurpleBlistNode *node) {
 	/* split this single menu building function back into the two
 	   original: one for buddies and one for chats */
 	if(PURPLE_IS_CHAT(node)) {
diff --git a/libpurple/protocols/yahoo/libymsg.c b/libpurple/protocols/yahoo/libymsg.c
index a6b194d920..544fb6f92a 100644
--- a/libpurple/protocols/yahoo/libymsg.c
+++ b/libpurple/protocols/yahoo/libymsg.c
@@ -3830,7 +3830,7 @@ static const char *yahoo_get_status_string(enum yahoo_status a)
 	}
 }
 
-static void yahoo_initiate_conference(PurpleBListNode *node, gpointer data) {
+static void yahoo_initiate_conference(PurpleBlistNode *node, gpointer data) {
 
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -3857,7 +3857,7 @@ static void yahoo_initiate_conference(PurpleBListNode *node, gpointer data) {
 	yahoo_c_invite(gc, id, "Join my conference...", purple_buddy_get_name(buddy));
 }
 
-static void yahoo_presence_settings(PurpleBListNode *node, gpointer data) {
+static void yahoo_presence_settings(PurpleBlistNode *node, gpointer data) {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
 	int presence_val = GPOINTER_TO_INT(data);
@@ -3868,7 +3868,7 @@ static void yahoo_presence_settings(PurpleBListNode *node, gpointer data) {
 	yahoo_friend_update_presence(gc, purple_buddy_get_name(buddy), presence_val);
 }
 
-static void yahoo_game(PurpleBListNode *node, gpointer data) {
+static void yahoo_game(PurpleBlistNode *node, gpointer data) {
 
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -3996,7 +3996,7 @@ void yahoo_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolea
 	}
 }
 
-static void yahoo_addbuddyfrommenu_cb(PurpleBListNode *node, gpointer data)
+static void yahoo_addbuddyfrommenu_cb(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -4010,7 +4010,7 @@ static void yahoo_addbuddyfrommenu_cb(PurpleBListNode *node, gpointer data)
 }
 
 
-static void yahoo_chat_goto_menu(PurpleBListNode *node, gpointer data)
+static void yahoo_chat_goto_menu(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
@@ -4061,7 +4061,7 @@ static GList *build_presence_submenu(YahooFriend *f, PurpleConnection *gc) {
 	return m;
 }
 
-static void yahoo_doodle_blist_node(PurpleBListNode *node, gpointer data)
+static void yahoo_doodle_blist_node(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *b = (PurpleBuddy *)node;
 	PurpleAccount *account = purple_buddy_get_account(b);
@@ -4073,7 +4073,7 @@ static void yahoo_doodle_blist_node(PurpleBListNode *node, gpointer data)
 #if 0
 /* XXX: it doesn't seems to work */
 static void
-yahoo_userinfo_blist_node(PurpleBListNode *node, gpointer data)
+yahoo_userinfo_blist_node(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *b = (PurpleBuddy *)node;
 	PurpleAccount *account = purple_buddy_get_account(b);
@@ -4164,7 +4164,7 @@ static GList *yahoo_buddy_menu(PurpleBuddy *buddy)
 	return m;
 }
 
-GList *yahoo_blist_node_menu(PurpleBListNode *node)
+GList *yahoo_blist_node_menu(PurpleBlistNode *node)
 {
 	if(PURPLE_IS_BUDDY(node)) {
 		return yahoo_buddy_menu((PurpleBuddy *) node);
diff --git a/libpurple/protocols/yahoo/libymsg.h b/libpurple/protocols/yahoo/libymsg.h
index f03032aa74..8beaa121f9 100644
--- a/libpurple/protocols/yahoo/libymsg.h
+++ b/libpurple/protocols/yahoo/libymsg.h
@@ -367,7 +367,7 @@ const char *yahoo_list_emblem(PurpleBuddy *b);
 char *yahoo_status_text(PurpleBuddy *b);
 void yahoo_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full);
 GList *yahoo_status_types(PurpleAccount *account);
-GList *yahoo_blist_node_menu(PurpleBListNode *node);
+GList *yahoo_blist_node_menu(PurpleBlistNode *node);
 void yahoo_login(PurpleAccount *account);
 void yahoo_close(PurpleConnection *gc);
 int yahoo_send_im(PurpleConnection *gc, const char *who, const char *what, PurpleMessageFlags flags);
diff --git a/libpurple/protocols/zephyr/zephyr.c b/libpurple/protocols/zephyr/zephyr.c
index cb58cc9915..bc9dd89920 100644
--- a/libpurple/protocols/zephyr/zephyr.c
+++ b/libpurple/protocols/zephyr/zephyr.c
@@ -2494,7 +2494,7 @@ static void zephyr_chat_leave(PurpleConnection * gc, int id)
 
 static PurpleChat *zephyr_find_blist_chat(PurpleAccount *account, const char *name)
 {
-	PurpleBListNode *gnode, *cnode;
+	PurpleBlistNode *gnode, *cnode;
 
 	/* XXX needs to be %host%,%canon%, and %me% clean */
 	for(gnode = purple_blist_get_root(); gnode;
diff --git a/libpurple/prpl.h b/libpurple/prpl.h
index 3bd678aaec..44fa9e13f1 100644
--- a/libpurple/prpl.h
+++ b/libpurple/prpl.h
@@ -285,7 +285,7 @@ struct _PurplePluginProtocolInfo
 	 * actions to be shown in (for example) the right-click menu for @a
 	 * node.
 	 */
-	GList *(*blist_node_menu)(PurpleBListNode *node);
+	GList *(*blist_node_menu)(PurpleBlistNode *node);
 
 	/**
 	 * Returns a list of #proto_chat_entry structs, which represent
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index 495e763abd..cc77d4491a 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -148,11 +148,11 @@ static gboolean editing_blist = FALSE;
 
 static GList *pidgin_blist_sort_methods = NULL;
 static struct pidgin_blist_sort_method *current_sort_method = NULL;
-static void sort_method_none(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
+static void sort_method_none(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
 
-static void sort_method_alphabetical(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
-static void sort_method_status(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
-static void sort_method_log_activity(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
+static void sort_method_alphabetical(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
+static void sort_method_status(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
+static void sort_method_log_activity(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
 static guint sort_merge_id;
 static GtkActionGroup *sort_action_group = NULL;
 
@@ -160,18 +160,18 @@ static PidginBuddyList *gtkblist = NULL;
 
 static GList *groups_tree(void);
 static gboolean pidgin_blist_refresh_timer(PurpleBuddyList *list);
-static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBListNode *node, gboolean status_change);
+static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean status_change);
 static void pidgin_blist_selection_changed(GtkTreeSelection *selection, gpointer data);
-static void pidgin_blist_update(PurpleBuddyList *list, PurpleBListNode *node);
-static void pidgin_blist_update_group(PurpleBuddyList *list, PurpleBListNode *node);
-static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBListNode *node);
-static char *pidgin_get_tooltip_text(PurpleBListNode *node, gboolean full);
-static gboolean get_iter_from_node(PurpleBListNode *node, GtkTreeIter *iter);
+static void pidgin_blist_update(PurpleBuddyList *list, PurpleBlistNode *node);
+static void pidgin_blist_update_group(PurpleBuddyList *list, PurpleBlistNode *node);
+static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBlistNode *node);
+static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full);
+static gboolean get_iter_from_node(PurpleBlistNode *node, GtkTreeIter *iter);
 static gboolean buddy_is_displayable(PurpleBuddy *buddy);
 static void redo_buddy_list(PurpleBuddyList *list, gboolean remove, gboolean rerender);
-static void pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBListNode *node);
-static char *pidgin_get_group_title(PurpleBListNode *gnode, gboolean expanded);
-static void pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBListNode *node);
+static void pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBlistNode *node);
+static char *pidgin_get_group_title(PurpleBlistNode *gnode, gboolean expanded);
+static void pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBlistNode *node);
 static void set_urgent(void);
 
 typedef enum {
@@ -351,7 +351,7 @@ static void gtk_blist_menu_send_file_cb(GtkWidget *w, PurpleBuddy *b)
 	               purple_buddy_get_name(b), NULL);
 }
 
-static void gtk_blist_menu_move_to_cb(GtkWidget *w, PurpleBListNode *node)
+static void gtk_blist_menu_move_to_cb(GtkWidget *w, PurpleBlistNode *node)
 {
 	PurpleGroup *group = g_object_get_data(G_OBJECT(w), "groupnode");
 	purple_blist_add_contact((PurpleContact *)node, group, NULL);
@@ -435,7 +435,7 @@ static void gtk_blist_renderer_editing_started_cb(GtkCellRenderer *renderer,
 {
 	GtkTreeIter iter;
 	GtkTreePath *path = NULL;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	const char *text = NULL;
 
 	path = gtk_tree_path_new_from_string (path_str);
@@ -464,7 +464,7 @@ static void gtk_blist_renderer_editing_started_cb(GtkCellRenderer *renderer,
 static void
 gtk_blist_do_personize(GList *merges)
 {
-	PurpleBListNode *contact = NULL;
+	PurpleBlistNode *contact = NULL;
 	int max = 0;
 	GList *tmp;
 
@@ -473,8 +473,8 @@ gtk_blist_do_personize(GList *merges)
 	 * by which contact is higher in the list
 	 */
 	for (tmp = merges; tmp; tmp = tmp->next) {
-		PurpleBListNode *node = tmp->data;
-		PurpleBListNode *b;
+		PurpleBlistNode *node = tmp->data;
+		PurpleBlistNode *b;
 		int i = 0;
 
 		if (PURPLE_IS_BUDDY(node))
@@ -501,7 +501,7 @@ gtk_blist_do_personize(GList *merges)
 
 	/* Merge all those buddies into this contact */
 	for (tmp = merges; tmp; tmp = tmp->next) {
-		PurpleBListNode *node = tmp->data;
+		PurpleBlistNode *node = tmp->data;
 		if (PURPLE_IS_BUDDY(node))
 			node = purple_blist_node_get_parent(node);
 
@@ -517,10 +517,10 @@ gtk_blist_do_personize(GList *merges)
 }
 
 static void
-gtk_blist_auto_personize(PurpleBListNode *group, const char *alias)
+gtk_blist_auto_personize(PurpleBlistNode *group, const char *alias)
 {
-	PurpleBListNode *contact;
-	PurpleBListNode *buddy;
+	PurpleBlistNode *contact;
+	PurpleBlistNode *buddy;
 	GList *merges = NULL;
 	int i = 0;
 	char *a = g_utf8_casefold(alias, -1);
@@ -576,7 +576,7 @@ static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *a
 {
 	GtkTreeIter iter;
 	GtkTreePath *path;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	PurpleGroup *dest;
 	gchar *alias;
 
@@ -658,7 +658,7 @@ chat_components_edit_ok(PurpleChat *chat, PurpleRequestFields *allfields)
 	}
 }
 
-static void chat_components_edit(GtkWidget *w, PurpleBListNode *node)
+static void chat_components_edit(GtkWidget *w, PurpleBlistNode *node)
 {
 	PurpleRequestFields *fields = purple_request_fields_new();
 	PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
@@ -703,7 +703,7 @@ static void chat_components_edit(GtkWidget *w, PurpleBListNode *node)
 			chat);
 }
 
-static void gtk_blist_menu_alias_cb(GtkWidget *w, PurpleBListNode *node)
+static void gtk_blist_menu_alias_cb(GtkWidget *w, PurpleBlistNode *node)
 {
 	GtkTreeIter iter;
 	GtkTreePath *path;
@@ -733,7 +733,7 @@ static void gtk_blist_menu_bp_cb(GtkWidget *w, PurpleBuddy *b)
 	                          purple_buddy_get_name(b), NULL);
 }
 
-static void gtk_blist_menu_showlog_cb(GtkWidget *w, PurpleBListNode *node)
+static void gtk_blist_menu_showlog_cb(GtkWidget *w, PurpleBlistNode *node)
 {
 	PurpleLogType type;
 	PurpleAccount *account;
@@ -775,7 +775,7 @@ static void gtk_blist_menu_showlog_cb(GtkWidget *w, PurpleBListNode *node)
 	g_free(name);
 }
 
-static void gtk_blist_menu_showoffline_cb(GtkWidget *w, PurpleBListNode *node)
+static void gtk_blist_menu_showoffline_cb(GtkWidget *w, PurpleBlistNode *node)
 {
 	if (PURPLE_IS_BUDDY(node))
 	{
@@ -785,7 +785,7 @@ static void gtk_blist_menu_showoffline_cb(GtkWidget *w, PurpleBListNode *node)
 	}
 	else if (PURPLE_IS_CONTACT(node))
 	{
-		PurpleBListNode *bnode;
+		PurpleBlistNode *bnode;
 		gboolean setting = !purple_blist_node_get_bool(node, "show_offline");
 
 		purple_blist_node_set_bool(node, "show_offline", setting);
@@ -797,7 +797,7 @@ static void gtk_blist_menu_showoffline_cb(GtkWidget *w, PurpleBListNode *node)
 			pidgin_blist_update(purple_blist_get_buddy_list(), bnode);
 		}
 	} else if (PURPLE_IS_GROUP(node)) {
-		PurpleBListNode *cnode, *bnode;
+		PurpleBlistNode *cnode, *bnode;
 		gboolean setting = !purple_blist_node_get_bool(node, "show_offline");
 
 		purple_blist_node_set_bool(node, "show_offline", setting);
@@ -1169,7 +1169,7 @@ pidgin_blist_joinchat_show(void)
 
 static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 
 	gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), iter, NODE_COLUMN, &node, -1);
 
@@ -1191,14 +1191,14 @@ static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTre
 
 static void gtk_blist_row_collapsed_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 
 	gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), iter, NODE_COLUMN, &node, -1);
 
 	if (PURPLE_IS_GROUP(node)) {
 		char *title;
 		struct _pidgin_blist_node *gtknode;
-		PurpleBListNode *cnode;
+		PurpleBlistNode *cnode;
 
 		title = pidgin_get_group_title(node, FALSE);
 
@@ -1226,7 +1226,7 @@ static void gtk_blist_row_collapsed_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTr
 }
 
 static void gtk_blist_row_activated_cb(GtkTreeView *tv, GtkTreePath *path, GtkTreeViewColumn *col, gpointer data) {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	GtkTreeIter iter;
 
 	gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, path);
@@ -1255,7 +1255,7 @@ static void pidgin_blist_add_chat_cb(void)
 {
 	GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview));
 	GtkTreeIter iter;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 
 	if(gtk_tree_selection_get_selected(sel, NULL, &iter)){
 		gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1);
@@ -1275,7 +1275,7 @@ static void pidgin_blist_add_buddy_cb(void)
 {
 	GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview));
 	GtkTreeIter iter;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 
 	if(gtk_tree_selection_get_selected(sel, NULL, &iter)){
 		gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1);
@@ -1295,7 +1295,7 @@ static void pidgin_blist_add_buddy_cb(void)
 }
 
 static void
-pidgin_blist_remove_cb (GtkWidget *w, PurpleBListNode *node)
+pidgin_blist_remove_cb (GtkWidget *w, PurpleBlistNode *node)
 {
 	if (PURPLE_IS_BUDDY(node)) {
 		pidgin_dialogs_remove_buddy((PurpleBuddy*)node);
@@ -1311,7 +1311,7 @@ pidgin_blist_remove_cb (GtkWidget *w, PurpleBListNode *node)
 struct _expand {
 	GtkTreeView *treeview;
 	GtkTreePath *path;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 };
 
 static gboolean
@@ -1328,11 +1328,11 @@ scroll_to_expanded_cell(gpointer data)
 }
 
 static void
-pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBListNode *node)
+pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBlistNode *node)
 {
 	struct _pidgin_blist_node *gtknode;
 	GtkTreeIter iter, parent;
-	PurpleBListNode *bnode;
+	PurpleBlistNode *bnode;
 	GtkTreePath *path;
 
 	if(!PURPLE_IS_CONTACT(node))
@@ -1363,9 +1363,9 @@ pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBListNode *node)
 }
 
 static void
-pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBListNode *node)
+pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBlistNode *node)
 {
-	PurpleBListNode *bnode;
+	PurpleBlistNode *bnode;
 	struct _pidgin_blist_node *gtknode;
 
 	if(!PURPLE_IS_CONTACT(node))
@@ -1381,7 +1381,7 @@ pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBListNode *node)
 }
 
 static void
-toggle_privacy(GtkWidget *widget, PurpleBListNode *node)
+toggle_privacy(GtkWidget *widget, PurpleBlistNode *node)
 {
 	PurpleBuddy *buddy;
 	PurpleAccount *account;
@@ -1407,7 +1407,7 @@ toggle_privacy(GtkWidget *widget, PurpleBListNode *node)
 	pidgin_blist_update(purple_blist_get_buddy_list(), node);
 }
 
-void pidgin_append_blist_node_privacy_menu(GtkWidget *menu, PurpleBListNode *node)
+void pidgin_append_blist_node_privacy_menu(GtkWidget *menu, PurpleBlistNode *node)
 {
 	PurpleBuddy *buddy = (PurpleBuddy *)node;
 	PurpleAccount *account;
@@ -1423,7 +1423,7 @@ void pidgin_append_blist_node_privacy_menu(GtkWidget *menu, PurpleBListNode *nod
 
 void
 pidgin_append_blist_node_proto_menu(GtkWidget *menu, PurpleConnection *gc,
-                                      PurpleBListNode *node)
+                                      PurpleBlistNode *node)
 {
 	GList *l, *ll;
 	PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc));
@@ -1439,7 +1439,7 @@ pidgin_append_blist_node_proto_menu(GtkWidget *menu, PurpleConnection *gc,
 }
 
 void
-pidgin_append_blist_node_extended_menu(GtkWidget *menu, PurpleBListNode *node)
+pidgin_append_blist_node_extended_menu(GtkWidget *menu, PurpleBlistNode *node)
 {
 	GList *l, *ll;
 
@@ -1453,11 +1453,11 @@ pidgin_append_blist_node_extended_menu(GtkWidget *menu, PurpleBListNode *node)
 
 
 static void
-pidgin_append_blist_node_move_to_menu(GtkWidget *menu, PurpleBListNode *node)
+pidgin_append_blist_node_move_to_menu(GtkWidget *menu, PurpleBlistNode *node)
 {
 	GtkWidget *submenu;
 	GtkWidget *menuitem;
-	PurpleBListNode *group;
+	PurpleBlistNode *group;
 
 	menuitem = gtk_menu_item_new_with_label(_("Move to"));
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -1484,7 +1484,7 @@ pidgin_blist_make_buddy_menu(GtkWidget *menu, PurpleBuddy *buddy, gboolean sub)
 	PurpleConnection *pc = NULL;
 	PurplePluginProtocolInfo *prpl_info;
 	PurpleContact *contact;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	gboolean contact_expanded = FALSE;
 
 	g_return_if_fail(menu);
@@ -1592,7 +1592,7 @@ pidgin_blist_make_buddy_menu(GtkWidget *menu, PurpleBuddy *buddy, gboolean sub)
 static gboolean
 gtk_blist_key_press_cb(GtkWidget *tv, GdkEventKey *event, gpointer data)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	GtkTreeIter iter, parent;
 	GtkTreeSelection *sel;
 	GtkTreePath *path;
@@ -1681,7 +1681,7 @@ static void
 set_node_custom_icon_cb(const gchar *filename, gpointer data)
 {
 	if (filename) {
-		PurpleBListNode *node = (PurpleBListNode*)data;
+		PurpleBlistNode *node = (PurpleBlistNode*)data;
 
 		purple_buddy_icons_node_set_custom_icon_from_file(node,
 		                                                  filename);
@@ -1689,7 +1689,7 @@ set_node_custom_icon_cb(const gchar *filename, gpointer data)
 }
 
 static void
-set_node_custom_icon(GtkWidget *w, PurpleBListNode *node)
+set_node_custom_icon(GtkWidget *w, PurpleBlistNode *node)
 {
 	/* This doesn't keep track of the returned dialog (so that successive
 	 * calls could be made to re-display that dialog). Do we want that? */
@@ -1698,13 +1698,13 @@ set_node_custom_icon(GtkWidget *w, PurpleBListNode *node)
 }
 
 static void
-remove_node_custom_icon(GtkWidget *w, PurpleBListNode *node)
+remove_node_custom_icon(GtkWidget *w, PurpleBlistNode *node)
 {
 	purple_buddy_icons_node_set_custom_icon(node, NULL, 0);
 }
 
 static void
-add_buddy_icon_menu_items(GtkWidget *menu, PurpleBListNode *node)
+add_buddy_icon_menu_items(GtkWidget *menu, PurpleBlistNode *node)
 {
 	GtkWidget *item;
 
@@ -1720,7 +1720,7 @@ add_buddy_icon_menu_items(GtkWidget *menu, PurpleBListNode *node)
 }
 
 static GtkWidget *
-create_group_menu (PurpleBListNode *node, PurpleGroup *g)
+create_group_menu (PurpleBlistNode *node, PurpleGroup *g)
 {
 	GtkWidget *menu;
 	GtkWidget *item;
@@ -1750,7 +1750,7 @@ create_group_menu (PurpleBListNode *node, PurpleGroup *g)
 }
 
 static GtkWidget *
-create_chat_menu(PurpleBListNode *node, PurpleChat *c)
+create_chat_menu(PurpleBlistNode *node, PurpleChat *c)
 {
 	GtkWidget *menu;
 	gboolean autojoin, persistent;
@@ -1786,7 +1786,7 @@ create_chat_menu(PurpleBListNode *node, PurpleChat *c)
 }
 
 static GtkWidget *
-create_contact_menu (PurpleBListNode *node)
+create_contact_menu (PurpleBlistNode *node)
 {
 	GtkWidget *menu;
 
@@ -1816,7 +1816,7 @@ create_contact_menu (PurpleBListNode *node)
 }
 
 static GtkWidget *
-create_buddy_menu(PurpleBListNode *node, PurpleBuddy *b)
+create_buddy_menu(PurpleBlistNode *node, PurpleBuddy *b)
 {
 	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
 	GtkWidget *menu;
@@ -1843,7 +1843,7 @@ create_buddy_menu(PurpleBListNode *node, PurpleBuddy *b)
 						 0, 0, NULL);
 		}
 		if(node->child->next) {
-			PurpleBListNode *bnode;
+			PurpleBlistNode *bnode;
 
 			for(bnode = node->child; bnode; bnode = bnode->next) {
 				PurpleBuddy *buddy = (PurpleBuddy*)bnode;
@@ -1880,7 +1880,7 @@ create_buddy_menu(PurpleBListNode *node, PurpleBuddy *b)
 }
 
 static gboolean
-pidgin_blist_show_context_menu(PurpleBListNode *node,
+pidgin_blist_show_context_menu(PurpleBlistNode *node,
 								 GtkMenuPositionFunc func,
 								 GtkWidget *tv,
 								 guint button,
@@ -1938,7 +1938,7 @@ static gboolean
 gtk_blist_button_press_cb(GtkWidget *tv, GdkEventButton *event, gpointer user_data)
 {
 	GtkTreePath *path;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	GtkTreeIter iter;
 	GtkTreeSelection *sel;
 	PurplePlugin *prpl = NULL;
@@ -2008,7 +2008,7 @@ gtk_blist_button_press_cb(GtkWidget *tv, GdkEventButton *event, gpointer user_da
 static gboolean
 pidgin_blist_popup_menu_cb(GtkWidget *tv, void *user_data)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	GtkTreeIter iter;
 	GtkTreeSelection *sel;
 	gboolean handled = FALSE;
@@ -2263,7 +2263,7 @@ static void pidgin_blist_drag_data_get_cb(GtkWidget *widget,
 		GtkTreeRowReference *ref = g_object_get_data(G_OBJECT(dc), "gtk-tree-view-source-row");
 		GtkTreePath *sourcerow = gtk_tree_row_reference_get_path(ref);
 		GtkTreeIter iter;
-		PurpleBListNode *node = NULL;
+		PurpleBlistNode *node = NULL;
 		if(!sourcerow)
 			return;
 		gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, sourcerow);
@@ -2279,7 +2279,7 @@ static void pidgin_blist_drag_data_get_cb(GtkWidget *widget,
 		GtkTreeRowReference *ref;
 		GtkTreePath *sourcerow;
 		GtkTreeIter iter;
-		PurpleBListNode *node = NULL;
+		PurpleBlistNode *node = NULL;
 		PurpleBuddy *buddy;
 		PurpleConnection *gc;
 		GString *str;
@@ -2362,14 +2362,14 @@ static void pidgin_blist_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc,
 	}
 
 	if (target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE) && data) {
-		PurpleBListNode *n = NULL;
+		PurpleBlistNode *n = NULL;
 		GtkTreePath *path = NULL;
 		GtkTreeViewDropPosition position;
 		memcpy(&n, data, sizeof(n));
 		if(gtk_tree_view_get_dest_row_at_pos(GTK_TREE_VIEW(widget), x, y, &path, &position)) {
 			/* if we're here, I think it means the drop is ok */
 			GtkTreeIter iter;
-			PurpleBListNode *node;
+			PurpleBlistNode *node;
 			struct _pidgin_blist_node *gtknode;
 
 			gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel),
@@ -2517,7 +2517,7 @@ static void pidgin_blist_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc,
 											  x, y, &path, &position))
 		{
 			GtkTreeIter iter;
-			PurpleBListNode *node;
+			PurpleBlistNode *node;
 
 			gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel),
 									&iter, path);
@@ -2577,7 +2577,7 @@ static void pidgin_blist_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc,
 											  x, y, &path, &position))
 		{
 			GtkTreeIter iter;
-			PurpleBListNode *node;
+			PurpleBlistNode *node;
 
 			gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel),
 									&iter, path);
@@ -2611,7 +2611,7 @@ static void pidgin_blist_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc,
 											  x, y, &path, &position))
 			{
 				GtkTreeIter iter;
-				PurpleBListNode *node;
+				PurpleBlistNode *node;
 
 				gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel),
 							&iter, path);
@@ -2660,7 +2660,7 @@ do_alphashift(GdkPixbuf *pixbuf, int shift)
 }
 
 
-static GdkPixbuf *pidgin_blist_get_buddy_icon(PurpleBListNode *node,
+static GdkPixbuf *pidgin_blist_get_buddy_icon(PurpleBlistNode *node,
                                               gboolean scaled, gboolean greyed)
 {
 	gsize len;
@@ -2884,7 +2884,7 @@ static struct tooltip_data * create_tip_for_account(PurpleAccount *account)
 	return td;
 }
 
-static struct tooltip_data * create_tip_for_node(PurpleBListNode *node, gboolean full)
+static struct tooltip_data * create_tip_for_node(PurpleBlistNode *node, gboolean full)
 {
 	struct tooltip_data *td = g_new0(struct tooltip_data, 1);
 	PurpleAccount *account = NULL;
@@ -3167,7 +3167,7 @@ pidgin_blist_align_tooltip(struct tooltip_data *td, GtkWidget *widget)
 static gboolean
 pidgin_blist_create_tooltip_for_node(GtkWidget *widget, gpointer data, int *w, int *h)
 {
-	PurpleBListNode *node = data;
+	PurpleBlistNode *node = data;
 	int width, height;
 	GList *list;
 	int max_text_width = 0;
@@ -3201,7 +3201,7 @@ pidgin_blist_create_tooltip_for_node(GtkWidget *widget, gpointer data, int *w, i
 			gtkblist->tooltipdata = g_list_append(gtkblist->tooltipdata, td);
 		}
 	} else if (PURPLE_IS_CONTACT(node)) {
-		PurpleBListNode *child;
+		PurpleBlistNode *child;
 		PurpleBuddy *b = purple_contact_get_priority_buddy((PurpleContact *)node);
 
 		for(child = node->child; child; child = child->next)
@@ -3244,7 +3244,7 @@ static gboolean pidgin_blist_expand_timeout(GtkWidget *tv)
 {
 	GtkTreePath *path;
 	GtkTreeIter iter;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	struct _pidgin_blist_node *gtknode;
 
 	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->tip_rect.x, gtkblist->tip_rect.y + (gtkblist->tip_rect.height/2),
@@ -3297,7 +3297,7 @@ static gboolean buddy_is_displayable(PurpleBuddy *buddy)
 			 purple_blist_node_get_bool(PURPLE_BLIST_NODE(buddy), "show_offline")));
 }
 
-void pidgin_blist_draw_tooltip(PurpleBListNode *node, GtkWidget *widget)
+void pidgin_blist_draw_tooltip(PurpleBlistNode *node, GtkWidget *widget)
 {
 	pidgin_tooltip_show(widget, node, pidgin_blist_create_tooltip_for_node, pidgin_blist_paint_tip);
 }
@@ -3355,7 +3355,7 @@ pidgin_blist_create_tooltip(GtkWidget *widget, GtkTreePath *path,
 		gpointer null, int *w, int *h)
 {
 	GtkTreeIter iter;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	gboolean editable = FALSE;
 
 	/* If we're editing a cell (e.g. alias editing), don't show the tooltip */
@@ -3801,7 +3801,7 @@ static const char *blist_menu =
  * Private Utility functions                             *
  *********************************************************/
 
-static char *pidgin_get_tooltip_text(PurpleBListNode *node, gboolean full)
+static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full)
 {
 	GString *str = g_string_new("");
 	PurplePlugin *prpl;
@@ -3978,7 +3978,7 @@ static char *pidgin_get_tooltip_text(PurpleBListNode *node, gboolean full)
 		if (full && c && !PURPLE_BUDDY_IS_ONLINE(b))
 		{
 			struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(c));
-			PurpleBListNode *bnode;
+			PurpleBlistNode *bnode;
 			int lastseen = 0;
 
 			if (gtknode && (!gtknode->contact_expanded || PURPLE_IS_CONTACT(node)))
@@ -3987,7 +3987,7 @@ static char *pidgin_get_tooltip_text(PurpleBListNode *node, gboolean full)
 				 * an expanded contact itself so we show the most recent
 				 * (largest) last_seen time for any of the buddies under
 				 * the contact. */
-				for (bnode = ((PurpleBListNode *)c)->child ; bnode != NULL ; bnode = bnode->next)
+				for (bnode = ((PurpleBlistNode *)c)->child ; bnode != NULL ; bnode = bnode->next)
 				{
 					int value = purple_blist_node_get_int(bnode, "last_seen");
 					if (value > lastseen)
@@ -4104,7 +4104,7 @@ static GdkPixbuf * _pidgin_blist_get_cached_emblem(gchar *path) {
 }
 
 GdkPixbuf *
-pidgin_blist_get_emblem(PurpleBListNode *node)
+pidgin_blist_get_emblem(PurpleBlistNode *node)
 {
 	PurpleBuddy *buddy = NULL;
 	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
@@ -4210,7 +4210,7 @@ pidgin_blist_get_emblem(PurpleBListNode *node)
 
 
 GdkPixbuf *
-pidgin_blist_get_status_icon(PurpleBListNode *node, PidginStatusIconSize size)
+pidgin_blist_get_status_icon(PurpleBlistNode *node, PidginStatusIconSize size)
 {
 	GdkPixbuf *ret;
 	const char *icon = NULL;
@@ -4563,7 +4563,7 @@ static void pidgin_blist_restore_position(void)
 
 static gboolean pidgin_blist_refresh_timer(PurpleBuddyList *list)
 {
-	PurpleBListNode *gnode, *cnode;
+	PurpleBlistNode *gnode, *cnode;
 
 	if (gtk_blist_visibility == GDK_VISIBILITY_FULLY_OBSCURED
 			|| !gtk_widget_get_visible(gtkblist->window))
@@ -4589,7 +4589,7 @@ static gboolean pidgin_blist_refresh_timer(PurpleBuddyList *list)
 	return TRUE;
 }
 
-static void pidgin_blist_hide_node(PurpleBuddyList *list, PurpleBListNode *node, gboolean update)
+static void pidgin_blist_hide_node(PurpleBuddyList *list, PurpleBlistNode *node, gboolean update)
 {
 	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
 	GtkTreeIter iter;
@@ -4821,7 +4821,7 @@ conversation_deleted_update_ui_cb(PurpleConversation *conv, struct _pidgin_blist
 
 static void
 written_msg_update_ui_cb(PurpleAccount *account, const char *who, const char *message,
-		PurpleConversation *conv, PurpleMessageFlags flag, PurpleBListNode *node)
+		PurpleConversation *conv, PurpleMessageFlags flag, PurpleBlistNode *node)
 {
 	PidginBlistNode *ui = purple_blist_node_get_ui_data(node);
 	if (ui->conv.conv != conv || !pidgin_conv_is_hidden(PIDGIN_CONVERSATION(conv)) ||
@@ -4836,7 +4836,7 @@ written_msg_update_ui_cb(PurpleAccount *account, const char *who, const char *me
 }
 
 static void
-displayed_msg_update_ui_cb(PidginConversation *gtkconv, PurpleBListNode *node)
+displayed_msg_update_ui_cb(PidginConversation *gtkconv, PurpleBlistNode *node)
 {
 	PidginBlistNode *ui = purple_blist_node_get_ui_data(node);
 	if (ui->conv.conv != gtkconv->active_conv)
@@ -4854,7 +4854,7 @@ conversation_created_cb(PurpleConversation *conv, PidginBuddyList *gtkblist)
 	if (PURPLE_IS_IM_CONVERSATION(conv)) {
 		GSList *buddies = purple_blist_find_buddies(account, purple_conversation_get_name(conv));
 		while (buddies) {
-			PurpleBListNode *buddy = buddies->data;
+			PurpleBlistNode *buddy = buddies->data;
 			struct _pidgin_blist_node *ui = purple_blist_node_get_ui_data(buddy);
 			buddies = g_slist_delete_link(buddies, buddies);
 			if (!ui)
@@ -4903,12 +4903,12 @@ static void pidgin_blist_new_list(PurpleBuddyList *blist)
 	blist->ui_data = gtkblist;
 }
 
-static void pidgin_blist_new_node(PurpleBListNode *node)
+static void pidgin_blist_new_node(PurpleBlistNode *node)
 {
 	purple_blist_node_set_ui_data(node, g_new0(struct _pidgin_blist_node, 1));
 }
 
-gboolean pidgin_blist_node_is_contact_expanded(PurpleBListNode *node)
+gboolean pidgin_blist_node_is_contact_expanded(PurpleBlistNode *node)
 {
 	if (PURPLE_IS_BUDDY(node)) {
 		node = node->parent;
@@ -4952,7 +4952,7 @@ static void _prefs_change_redo_list(const char *name, PurplePrefType type,
 {
 	GtkTreeSelection *sel;
 	GtkTreeIter iter;
-	PurpleBListNode *node = NULL;
+	PurpleBlistNode *node = NULL;
 
 	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview));
 	if (gtk_tree_selection_get_selected(sel, NULL, &iter))
@@ -5618,7 +5618,7 @@ treeview_style_set (GtkWidget *widget,
 		    gpointer data)
 {
 	PurpleBuddyList *list = data;
-	PurpleBListNode *node = list->root;
+	PurpleBlistNode *node = list->root;
 	while (node) {
 		pidgin_blist_update_group(list, node);
 		node = node->next;
@@ -5834,7 +5834,7 @@ static gboolean
 pidgin_blist_search_equal_func(GtkTreeModel *model, gint column,
 			const gchar *key, GtkTreeIter *iter, gpointer data)
 {
-	PurpleBListNode *node = NULL;
+	PurpleBlistNode *node = NULL;
 	gboolean res = TRUE;
 	const char *compare = NULL;
 
@@ -6317,7 +6317,7 @@ static void pidgin_blist_show(PurpleBuddyList *list)
 
 static void redo_buddy_list(PurpleBuddyList *list, gboolean remove, gboolean rerender)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 
 	gtkblist = PIDGIN_BLIST(list);
 	if(!gtkblist || !gtkblist->treeview)
@@ -6361,7 +6361,7 @@ pidgin_blist_update_refresh_timeout()
 	gtkblist->refresh_timer = purple_timeout_add_seconds(30,(GSourceFunc)pidgin_blist_refresh_timer, blist);
 }
 
-static gboolean get_iter_from_node(PurpleBListNode *node, GtkTreeIter *iter) {
+static gboolean get_iter_from_node(PurpleBlistNode *node, GtkTreeIter *iter) {
 	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
 	GtkTreePath *path;
 
@@ -6389,7 +6389,7 @@ static gboolean get_iter_from_node(PurpleBListNode *node, GtkTreeIter *iter) {
 	return TRUE;
 }
 
-static void pidgin_blist_remove(PurpleBuddyList *list, PurpleBListNode *node)
+static void pidgin_blist_remove(PurpleBuddyList *list, PurpleBlistNode *node)
 {
 	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
 
@@ -6419,9 +6419,9 @@ static void pidgin_blist_remove(PurpleBuddyList *list, PurpleBListNode *node)
 	}
 }
 
-static gboolean do_selection_changed(PurpleBListNode *new_selection)
+static gboolean do_selection_changed(PurpleBlistNode *new_selection)
 {
-	PurpleBListNode *old_selection = NULL;
+	PurpleBlistNode *old_selection = NULL;
 
 	/* test for gtkblist because crazy timeout means we can be called after the blist is gone */
 	if (gtkblist && new_selection != gtkblist->selected_node) {
@@ -6438,7 +6438,7 @@ static gboolean do_selection_changed(PurpleBListNode *new_selection)
 
 static void pidgin_blist_selection_changed(GtkTreeSelection *selection, gpointer data)
 {
-	PurpleBListNode *new_selection = NULL;
+	PurpleBlistNode *new_selection = NULL;
 	GtkTreeIter iter;
 
 	if(gtk_tree_selection_get_selected(selection, NULL, &iter)){
@@ -6457,7 +6457,7 @@ static void pidgin_blist_selection_changed(GtkTreeSelection *selection, gpointer
 	}
 }
 
-static gboolean insert_node(PurpleBuddyList *list, PurpleBListNode *node, GtkTreeIter *iter)
+static gboolean insert_node(PurpleBuddyList *list, PurpleBlistNode *node, GtkTreeIter *iter)
 {
 	GtkTreeIter parent_iter = {0, NULL, NULL, NULL}, cur, *curptr = NULL;
 	struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node);
@@ -6520,7 +6520,7 @@ static gboolean insert_node(PurpleBuddyList *list, PurpleBListNode *node, GtkTre
 
 static gboolean pidgin_blist_group_has_show_offline_buddy(PurpleGroup *group)
 {
-	PurpleBListNode *gnode, *cnode, *bnode;
+	PurpleBlistNode *gnode, *cnode, *bnode;
 
 	gnode = PURPLE_BLIST_NODE(group);
 	for(cnode = gnode->child; cnode; cnode = cnode->next) {
@@ -6540,11 +6540,11 @@ static gboolean pidgin_blist_group_has_show_offline_buddy(PurpleGroup *group)
  * group, but has much better algorithmic performance with a pre-known buddy.
  */
 static void pidgin_blist_update_group(PurpleBuddyList *list,
-                                      PurpleBListNode *node)
+                                      PurpleBlistNode *node)
 {
 	gint count;
 	PurpleGroup *group;
-	PurpleBListNode* gnode;
+	PurpleBlistNode* gnode;
 	gboolean show = FALSE, show_offline = FALSE;
 
 	g_return_if_fail(node != NULL);
@@ -6629,13 +6629,13 @@ static void pidgin_blist_update_group(PurpleBuddyList *list,
 	}
 }
 
-static char *pidgin_get_group_title(PurpleBListNode *gnode, gboolean expanded)
+static char *pidgin_get_group_title(PurpleBlistNode *gnode, gboolean expanded)
 {
 	PurpleGroup *group;
 	gboolean selected;
 	char group_count[12] = "";
 	char *mark, *esc;
-	PurpleBListNode *selected_node = NULL;
+	PurpleBlistNode *selected_node = NULL;
 	GtkTreeIter iter;
 	PidginThemeFont *pair;
 	gchar const *text_color, *text_font;
@@ -6687,7 +6687,7 @@ static char *pidgin_get_group_title(PurpleBListNode *gnode, gboolean expanded)
 	return mark;
 }
 
-static void buddy_node(PurpleBuddy *buddy, GtkTreeIter *iter, PurpleBListNode *node)
+static void buddy_node(PurpleBuddy *buddy, GtkTreeIter *iter, PurpleBlistNode *node)
 {
 	PurplePresence *presence = purple_buddy_get_presence(buddy);
 	GdkPixbuf *status, *avatar, *emblem, *prpl_icon;
@@ -6796,9 +6796,9 @@ static void buddy_node(PurpleBuddy *buddy, GtkTreeIter *iter, PurpleBListNode *n
 
 /* This is a variation on the original gtk_blist_update_contact. Here we
 	can know in advance which buddy has changed so we can just update that */
-static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBListNode *node)
+static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBlistNode *node)
 {
-	PurpleBListNode *cnode;
+	PurpleBlistNode *cnode;
 	PurpleContact *contact;
 	PurpleBuddy *buddy;
 	gboolean biglist = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons");
@@ -6892,7 +6892,7 @@ static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBListNode *
 
 
 
-static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBListNode *node, gboolean status_change)
+static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean status_change)
 {
 	PurpleBuddy *buddy;
 	struct _pidgin_blist_node *gtkparentnode;
@@ -6924,7 +6924,7 @@ static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBListNode *no
 
 }
 
-static void pidgin_blist_update_chat(PurpleBuddyList *list, PurpleBListNode *node)
+static void pidgin_blist_update_chat(PurpleBuddyList *list, PurpleBlistNode *node)
 {
 	PurpleChat *chat;
 
@@ -7036,7 +7036,7 @@ static void pidgin_blist_update_chat(PurpleBuddyList *list, PurpleBListNode *nod
 	}
 }
 
-static void pidgin_blist_update(PurpleBuddyList *list, PurpleBListNode *node)
+static void pidgin_blist_update(PurpleBuddyList *list, PurpleBlistNode *node)
 {
 	if (list)
 		gtkblist = PIDGIN_BLIST(list);
@@ -7136,7 +7136,7 @@ groups_tree(void)
 {
 	static GList *list = NULL;
 	PurpleGroup *g;
-	PurpleBListNode *gnode;
+	PurpleBlistNode *gnode;
 
 	g_list_free(list);
 	list = NULL;
@@ -7600,7 +7600,7 @@ set_urgent(void)
 		pidgin_set_urgent(GTK_WINDOW(gtkblist->window), TRUE);
 }
 
-static PurpleBListUiOps blist_ui_ops =
+static PurpleBlistUiOps blist_ui_ops =
 {
 	pidgin_blist_new_list,
 	pidgin_blist_new_node,
@@ -7619,7 +7619,7 @@ static PurpleBListUiOps blist_ui_ops =
 };
 
 
-PurpleBListUiOps *
+PurpleBlistUiOps *
 pidgin_blist_get_ui_ops(void)
 {
 	return &blist_ui_ops;
@@ -7633,7 +7633,7 @@ PidginBuddyList *pidgin_blist_get_default_gtk_blist()
 static gboolean autojoin_cb(PurpleConnection *gc, gpointer data)
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
-	PurpleBListNode *gnode, *cnode;
+	PurpleBlistNode *gnode, *cnode;
 	for(gnode = purple_blist_get_buddy_list()->root; gnode; gnode = gnode->next)
 	{
 		if(!PURPLE_IS_GROUP(gnode))
@@ -7868,9 +7868,9 @@ void pidgin_blist_sort_method_set(const char *id){
  ** Sort Methods
  ******************************************/
 
-static void sort_method_none(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter parent_iter, GtkTreeIter *cur, GtkTreeIter *iter)
+static void sort_method_none(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter parent_iter, GtkTreeIter *cur, GtkTreeIter *iter)
 {
-	PurpleBListNode *sibling = node->prev;
+	PurpleBlistNode *sibling = node->prev;
 	GtkTreeIter sibling_iter;
 
 	if (cur != NULL) {
@@ -7887,7 +7887,7 @@ static void sort_method_none(PurpleBListNode *node, PurpleBuddyList *blist, GtkT
 			sibling ? &sibling_iter : NULL);
 }
 
-static void sort_method_alphabetical(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter)
+static void sort_method_alphabetical(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter)
 {
 	GtkTreeIter more_z;
 
@@ -7908,7 +7908,7 @@ static void sort_method_alphabetical(PurpleBListNode *node, PurpleBuddyList *bli
 	}
 
 	do {
-		PurpleBListNode *n;
+		PurpleBlistNode *n;
 		const char *this_name;
 		int cmp;
 
@@ -7947,7 +7947,7 @@ static void sort_method_alphabetical(PurpleBListNode *node, PurpleBuddyList *bli
 	}
 }
 
-static void sort_method_status(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter)
+static void sort_method_status(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter)
 {
 	GtkTreeIter more_z;
 
@@ -7975,7 +7975,7 @@ static void sort_method_status(PurpleBListNode *node, PurpleBuddyList *blist, Gt
 	}
 
 	do {
-		PurpleBListNode *n;
+		PurpleBlistNode *n;
 		gint name_cmp;
 		gint presence_cmp;
 
@@ -8029,7 +8029,7 @@ static void sort_method_status(PurpleBListNode *node, PurpleBuddyList *blist, Gt
 	}
 }
 
-static void sort_method_log_activity(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter)
+static void sort_method_log_activity(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter)
 {
 	GtkTreeIter more_z;
 
@@ -8042,7 +8042,7 @@ static void sort_method_log_activity(PurpleBListNode *node, PurpleBuddyList *bli
 	}
 
 	if(PURPLE_IS_CONTACT(node)) {
-		PurpleBListNode *n;
+		PurpleBlistNode *n;
 		PurpleBuddy *buddy;
 		for (n = node->child; n; n = n->next) {
 			buddy = (PurpleBuddy*)n;
@@ -8071,8 +8071,8 @@ static void sort_method_log_activity(PurpleBListNode *node, PurpleBuddyList *bli
 	}
 
 	do {
-		PurpleBListNode *n;
-		PurpleBListNode *n2;
+		PurpleBlistNode *n;
+		PurpleBlistNode *n2;
 		PurpleBuddy *buddy;
 		int cmp;
 
diff --git a/pidgin/gtkblist.h b/pidgin/gtkblist.h
index e13a911841..49bbb3578c 100644
--- a/pidgin/gtkblist.h
+++ b/pidgin/gtkblist.h
@@ -96,12 +96,12 @@ struct _PidginBuddyList {
 	GdkRectangle contact_rect;       /**< This is the bounding rectangle of the contact node
 					      and its children.  This is used for auto-expand on
 					      mouseover. */
-	PurpleBListNode *mouseover_contact; /**< This is the contact currently mouse-over expanded */
+	PurpleBlistNode *mouseover_contact; /**< This is the contact currently mouse-over expanded */
 
 	GtkWidget *tipwindow;            /**< The window used by the tooltip */
 	GList *tooltipdata;              /**< The data for each "chunk" of the tooltip */
 
-	PurpleBListNode *selected_node;    /**< The currently selected node */
+	PurpleBlistNode *selected_node;    /**< The currently selected node */
 
 	GtkWidget *scrollbook;          /**< Scrollbook for alerts */
 	GtkWidget *headline;            /**< Widget for headline notifications */
@@ -149,7 +149,7 @@ void pidgin_blist_uninit(void);
  *
  * @return The GTK+ list operations structure.
  */
-PurpleBListUiOps *pidgin_blist_get_ui_ops(void);
+PurpleBlistUiOps *pidgin_blist_get_ui_ops(void);
 
 /**
  * Returns the default gtk buddy list
@@ -193,12 +193,12 @@ void pidgin_blist_update_refresh_timeout(void);
  * @return  A GdkPixbuf for the emblem to show, or NULL
  */
 GdkPixbuf *
-pidgin_blist_get_emblem(PurpleBListNode *node);
+pidgin_blist_get_emblem(PurpleBlistNode *node);
 
 /**
  * Useful for the buddy ticker
  */
-GdkPixbuf *pidgin_blist_get_status_icon(PurpleBListNode *node,
+GdkPixbuf *pidgin_blist_get_status_icon(PurpleBlistNode *node,
 		PidginStatusIconSize size);
 
 /**
@@ -210,7 +210,7 @@ GdkPixbuf *pidgin_blist_get_status_icon(PurpleBListNode *node,
  * @param node The node in question.
  * @return A boolean indicating if @a node is part of an expanded contact.
  */
-gboolean pidgin_blist_node_is_contact_expanded(PurpleBListNode *node);
+gboolean pidgin_blist_node_is_contact_expanded(PurpleBlistNode *node);
 
 /**
  * Intelligently toggles the visibility of the buddy list. If the buddy
@@ -260,7 +260,7 @@ PidginBlistTheme *pidgin_blist_get_theme(void);
  * @name GTK+ Buddy List sorting functions
  **************************************************************************/
 
-typedef void (*pidgin_blist_sort_function)(PurpleBListNode *new, PurpleBuddyList *blist, GtkTreeIter group, GtkTreeIter *cur, GtkTreeIter *iter);
+typedef void (*pidgin_blist_sort_function)(PurpleBlistNode *new, PurpleBuddyList *blist, GtkTreeIter group, GtkTreeIter *cur, GtkTreeIter *iter);
 
 /**
  * Gets the current list of sort methods.
@@ -335,22 +335,22 @@ gboolean pidgin_blist_joinchat_is_showable(void);
 void pidgin_blist_joinchat_show(void);
 
 /**
- * Appends the privacy menu items for a PurpleBListNode
+ * Appends the privacy menu items for a PurpleBlistNode
  * TODO: Rename these.
  */
-void pidgin_append_blist_node_privacy_menu(GtkWidget *menu, PurpleBListNode *node);
+void pidgin_append_blist_node_privacy_menu(GtkWidget *menu, PurpleBlistNode *node);
 
 /**
- * Appends the protocol specific menu items for a PurpleBListNode
+ * Appends the protocol specific menu items for a PurpleBlistNode
  * TODO: Rename these.
  */
-void pidgin_append_blist_node_proto_menu (GtkWidget *menu, PurpleConnection *gc, PurpleBListNode *node);
+void pidgin_append_blist_node_proto_menu (GtkWidget *menu, PurpleConnection *gc, PurpleBlistNode *node);
 
 /**
- * Appends the extended menu items for a PurpleBListNode
+ * Appends the extended menu items for a PurpleBlistNode
  * TODO: Rename these.
  */
-void pidgin_append_blist_node_extended_menu(GtkWidget *menu, PurpleBListNode *node);
+void pidgin_append_blist_node_extended_menu(GtkWidget *menu, PurpleBlistNode *node);
 
 /**
  * Sets a headline notification
@@ -386,7 +386,7 @@ gchar *pidgin_blist_get_name_markup(PurpleBuddy *buddy, gboolean selected, gbool
  * @param node The buddy list node to show a tooltip for
  * @param widget The widget to draw the tooltip on
  */
-void pidgin_blist_draw_tooltip(PurpleBListNode *node, GtkWidget *widget);
+void pidgin_blist_draw_tooltip(PurpleBlistNode *node, GtkWidget *widget);
 
 /**
  * Destroys the current (if any) Buddy List tooltip
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 4747a16aaa..bfa094c972 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -242,11 +242,11 @@ static const GdkColor *get_nick_color(PidginConversation *gtkconv, const char *n
 	return &col;
 }
 
-static PurpleBListNode *
+static PurpleBlistNode *
 get_conversation_blist_node(PurpleConversation *conv)
 {
 	PurpleAccount *account = purple_conversation_get_account(conv);
-	PurpleBListNode *node = NULL;
+	PurpleBlistNode *node = NULL;
 
 	if (PURPLE_IS_IM_CONVERSATION(conv)) {
 		node = PURPLE_BLIST_NODE(purple_blist_find_buddy(account, purple_conversation_get_name(conv)));
@@ -841,7 +841,7 @@ invite_dnd_recv(GtkWidget *widget, GdkDragContext *dc, gint x, gint y,
 
 	if (dnd_info == PIDGIN_DRAG_BLIST_NODE)
 	{
-		PurpleBListNode *node = NULL;
+		PurpleBlistNode *node = NULL;
 		PurpleBuddy *buddy;
 		const guchar *data = gtk_selection_data_get_data(sd);
 
@@ -1140,7 +1140,7 @@ menu_view_log_cb(GtkAction *action, gpointer data)
 	buddies = purple_blist_find_buddies(account, name);
 	for (cur = buddies; cur != NULL; cur = cur->next)
 	{
-		PurpleBListNode *node = cur->data;
+		PurpleBlistNode *node = cur->data;
 		if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL)))
 		{
 			pidgin_log_show_contact((PurpleContact *)node->parent);
@@ -1391,7 +1391,7 @@ menu_logging_cb(GtkAction *action, gpointer data)
 	PidginWindow *win = data;
 	PurpleConversation *conv;
 	gboolean logging;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
 
@@ -1453,7 +1453,7 @@ menu_sounds_cb(GtkAction *action, gpointer data)
 	PidginWindow *win = data;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
 
@@ -1735,8 +1735,8 @@ create_chat_menu(PurpleChatConversation *chat, const char *who, PurpleConnection
 	{
 		if (purple_account_is_connected(account))
 			pidgin_append_blist_node_proto_menu(menu, purple_account_get_connection(account),
-												  (PurpleBListNode *)buddy);
-		pidgin_append_blist_node_extended_menu(menu, (PurpleBListNode *)buddy);
+												  (PurpleBlistNode *)buddy);
+		pidgin_append_blist_node_extended_menu(menu, (PurpleBlistNode *)buddy);
 		gtk_widget_show_all(menu);
 	}
 
@@ -2547,7 +2547,7 @@ pidgin_conv_get_icon(PurpleConversation *conv, GtkWidget *parent, const char *ic
 	const char *name = NULL;
 	const char *stock = NULL;
 	GdkPixbuf *status = NULL;
-	PurpleBListUiOps *ops = purple_blist_get_ui_ops();
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	GtkIconSize size;
 
 	g_return_val_if_fail(conv != NULL, NULL);
@@ -2566,7 +2566,7 @@ pidgin_conv_get_icon(PurpleConversation *conv, GtkWidget *parent, const char *ic
 			 * displays in the conv tab even though it shouldn't.
 			 * A better solution would be great. */
 			if (ops && ops->update)
-				ops->update(NULL, (PurpleBListNode*)b);
+				ops->update(NULL, (PurpleBlistNode*)b);
 		}
 	}
 
@@ -2606,7 +2606,7 @@ update_tab_icon(PurpleConversation *conv)
 	if (PURPLE_IS_IM_CONVERSATION(conv)) {
 		PurpleBuddy *b = purple_blist_find_buddy(purple_conversation_get_account(conv), purple_conversation_get_name(conv));
 		if (b)
-			emblem = pidgin_blist_get_emblem((PurpleBListNode*)b);
+			emblem = pidgin_blist_get_emblem((PurpleBlistNode*)b);
 	}
 
 	g_return_if_fail(status != NULL);
@@ -2817,7 +2817,7 @@ custom_icon_sel_cb(const char *filename, gpointer data)
 		}
 		contact = purple_buddy_get_contact(buddy);
 
-		purple_buddy_icons_node_set_custom_icon_from_file((PurpleBListNode*)contact, filename);
+		purple_buddy_icons_node_set_custom_icon_from_file((PurpleBlistNode*)contact, filename);
 	}
 }
 
@@ -2852,7 +2852,7 @@ change_size_cb(GtkWidget *widget, PidginConversation *gtkconv)
 	for (; buddies; buddies = g_slist_delete_link(buddies, buddies)) {
 		PurpleBuddy *buddy = buddies->data;
 		PurpleContact *contact = purple_buddy_get_contact(buddy);
-		purple_blist_node_set_int((PurpleBListNode*)contact, "pidgin-infopane-iconsize", size);
+		purple_blist_node_set_int((PurpleBlistNode*)contact, "pidgin-infopane-iconsize", size);
 	}
 }
 
@@ -2873,7 +2873,7 @@ remove_custom_icon_cb(GtkWidget *widget, PidginConversation *gtkconv)
 	}
 	contact = purple_buddy_get_contact(buddy);
 
-	purple_buddy_icons_node_set_custom_icon_from_file((PurpleBListNode*)contact, NULL);
+	purple_buddy_icons_node_set_custom_icon_from_file((PurpleBlistNode*)contact, NULL);
 }
 
 static void
@@ -2974,7 +2974,7 @@ icon_menu(GtkWidget *widget, GdkEventButton *e, PidginConversation *gtkconv)
 	if (buddy)
 	{
 		PurpleContact *contact = purple_buddy_get_contact(buddy);
-		if (contact && purple_buddy_icons_node_has_custom_icon((PurpleBListNode*)contact))
+		if (contact && purple_buddy_icons_node_has_custom_icon((PurpleBlistNode*)contact))
 		{
 			pidgin_new_item_from_stock(menu, _("Remove Custom Icon"), NULL,
 			                           G_CALLBACK(remove_custom_icon_cb), gtkconv,
@@ -3254,7 +3254,7 @@ populate_menu_with_options(GtkWidget *menu, PidginConversation *gtkconv, gboolea
 	GList *list;
 	PurpleConversation *conv;
 	PurpleAccount *account;
-	PurpleBListNode *node = NULL;
+	PurpleBlistNode *node = NULL;
 	PurpleChat *chat = NULL;
 	PurpleBuddy *buddy = NULL;
 	gboolean ret;
@@ -3285,7 +3285,7 @@ populate_menu_with_options(GtkWidget *menu, PidginConversation *gtkconv, gboolea
 						g_strdup(purple_conversation_get_name(conv)));
 			}
 			chat = purple_chat_new(account, NULL, components);
-			purple_blist_node_set_dont_save((PurpleBListNode *)chat, TRUE);
+			purple_blist_node_set_dont_save((PurpleBlistNode *)chat, TRUE);
 			g_object_set_data_full(G_OBJECT(gtkconv->webview), "transient_chat",
 					chat, (GDestroyNotify)purple_blist_remove_chat);
 		}
@@ -3299,7 +3299,7 @@ populate_menu_with_options(GtkWidget *menu, PidginConversation *gtkconv, gboolea
 
 			if (!buddy) {
 				buddy = purple_buddy_new(account, purple_conversation_get_name(conv), NULL);
-				purple_blist_node_set_dont_save((PurpleBListNode *)buddy, TRUE);
+				purple_blist_node_set_dont_save((PurpleBlistNode *)buddy, TRUE);
 				g_object_set_data_full(G_OBJECT(gtkconv->webview), "transient_buddy",
 						buddy, (GDestroyNotify)g_object_unref);
 			}
@@ -3307,9 +3307,9 @@ populate_menu_with_options(GtkWidget *menu, PidginConversation *gtkconv, gboolea
 	}
 
 	if (chat)
-		node = (PurpleBListNode *)chat;
+		node = (PurpleBlistNode *)chat;
 	else if (buddy)
-		node = (PurpleBListNode *)buddy;
+		node = (PurpleBlistNode *)buddy;
 
 	/* Now add the stuff */
 	if (all) {
@@ -4044,7 +4044,7 @@ generate_send_to_items(PidginWindow *win)
 			GList *list = NULL, *iter;
 			for (l = buds; l != NULL; l = l->next)
 			{
-				PurpleBListNode *node;
+				PurpleBlistNode *node;
 
 				node = PURPLE_BLIST_NODE(purple_buddy_get_contact(PURPLE_BUDDY(l->data)));
 
@@ -4600,7 +4600,7 @@ update_chat_alias(PurpleBuddy *buddy, PurpleChatConversation *chat, PurpleConnec
 }
 
 static void
-blist_node_aliased_cb(PurpleBListNode *node, const char *old_alias, PurpleChatConversation *chat)
+blist_node_aliased_cb(PurpleBlistNode *node, const char *old_alias, PurpleChatConversation *chat)
 {
 	PurpleConnection *gc;
 	PurplePluginProtocolInfo *prpl_info;
@@ -4619,7 +4619,7 @@ blist_node_aliased_cb(PurpleBListNode *node, const char *old_alias, PurpleChatCo
 
 	if (PURPLE_IS_CONTACT(node))
 	{
-		PurpleBListNode *bnode;
+		PurpleBlistNode *bnode;
 
 		for(bnode = node->child; bnode; bnode = bnode->next) {
 
@@ -4683,7 +4683,7 @@ buddy_cb_common(PurpleBuddy *buddy, PurpleChatConversation *chat, gboolean is_bu
 
 	g_free(normalized_name);
 
-	blist_node_aliased_cb((PurpleBListNode *)buddy, NULL, chat);
+	blist_node_aliased_cb((PurpleBlistNode *)buddy, NULL, chat);
 
 	texttag = get_buddy_tag(chat, purple_buddy_get_name(buddy), 0, FALSE); /* XXX: do we want the normalized name? */
 	if (texttag) {
@@ -4692,7 +4692,7 @@ buddy_cb_common(PurpleBuddy *buddy, PurpleChatConversation *chat, gboolean is_bu
 }
 
 static void
-buddy_added_cb(PurpleBListNode *node, PurpleChatConversation *chat)
+buddy_added_cb(PurpleBlistNode *node, PurpleChatConversation *chat)
 {
 	if (!PURPLE_IS_BUDDY(node))
 		return;
@@ -4701,7 +4701,7 @@ buddy_added_cb(PurpleBListNode *node, PurpleChatConversation *chat)
 }
 
 static void
-buddy_removed_cb(PurpleBListNode *node, PurpleChatConversation *chat)
+buddy_removed_cb(PurpleBlistNode *node, PurpleChatConversation *chat)
 {
 	if (!PURPLE_IS_BUDDY(node))
 		return;
@@ -4872,7 +4872,7 @@ pidgin_conv_userlist_create_tooltip(GtkWidget *tipwindow, GtkTreePath *path,
 	GtkTreeIter iter;
 	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkconv->u.chat->list));
 	PurpleConversation *conv = gtkconv->active_conv;
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 	PurplePluginProtocolInfo *prpl_info;
 	PurpleAccount *account = purple_conversation_get_account(conv);
 	char *who = NULL;
@@ -4886,7 +4886,7 @@ pidgin_conv_userlist_create_tooltip(GtkWidget *tipwindow, GtkTreePath *path,
 	gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &who, -1);
 
 	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(purple_account_get_connection(account)));
-	node = (PurpleBListNode*)(purple_blist_find_buddy(purple_conversation_get_account(conv), who));
+	node = (PurpleBlistNode*)(purple_blist_find_buddy(purple_conversation_get_account(conv), who));
 	if (node && prpl_info && (prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME))
 		pidgin_blist_draw_tooltip(node, gtkconv->infopane);
 
@@ -4995,17 +4995,17 @@ setup_chat_userlist(PidginConversation *gtkconv, GtkWidget *hpaned)
 static gboolean
 pidgin_conv_create_tooltip(GtkWidget *tipwindow, gpointer userdata, int *w, int *h)
 {
-	PurpleBListNode *node = NULL;
+	PurpleBlistNode *node = NULL;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv = userdata;
 
 	conv = gtkconv->active_conv;
 	if (PURPLE_IS_CHAT_CONVERSATION(conv)) {
-		node = (PurpleBListNode*)(purple_blist_find_chat(purple_conversation_get_account(conv), purple_conversation_get_name(conv)));
+		node = (PurpleBlistNode*)(purple_blist_find_chat(purple_conversation_get_account(conv), purple_conversation_get_name(conv)));
 		if (!node)
 			node = g_object_get_data(G_OBJECT(gtkconv->webview), "transient_chat");
 	} else {
-		node = (PurpleBListNode*)(purple_blist_find_buddy(purple_conversation_get_account(conv), purple_conversation_get_name(conv)));
+		node = (PurpleBlistNode*)(purple_blist_find_buddy(purple_conversation_get_account(conv), purple_conversation_get_name(conv)));
 #if 0
 		/* Using the transient blist nodes to show the tooltip doesn't quite work yet. */
 		if (!node)
@@ -5381,7 +5381,7 @@ setup_common_pane(PidginConversation *gtkconv)
 						purple_conversation_get_name(conv))) != NULL) {
 			PurpleContact *contact = purple_buddy_get_contact(buddy);
 			if (contact) {
-				buddyicon_size = purple_blist_node_get_int((PurpleBListNode*)contact, "pidgin-infopane-iconsize");
+				buddyicon_size = purple_blist_node_get_int((PurpleBlistNode*)contact, "pidgin-infopane-iconsize");
 			}
 		}
 		buddyicon_size = CLAMP(buddyicon_size, BUDDYICON_SIZE_MIN, BUDDYICON_SIZE_MAX);
@@ -5522,13 +5522,13 @@ conv_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
 
 	if (info == PIDGIN_DRAG_BLIST_NODE)
 	{
-		PurpleBListNode *n = NULL;
+		PurpleBlistNode *n = NULL;
 		PurpleBuddy *b;
 		PidginConversation *gtkconv = NULL;
 		PurpleAccount *buddyaccount;
 		const char *buddyname;
 
-		n = *(PurpleBListNode **) data;
+		n = *(PurpleBlistNode **) data;
 
 		if (PURPLE_IS_CONTACT(n))
 			b = purple_contact_get_priority_buddy((PurpleContact*)n);
@@ -5636,7 +5636,7 @@ pidgin_conv_find_gtkconv(PurpleConversation * conv)
 {
 	PurpleBuddy *bud = purple_blist_find_buddy(purple_conversation_get_account(conv), purple_conversation_get_name(conv));
 	PurpleContact *c;
-	PurpleBListNode *cn, *bn;
+	PurpleBlistNode *cn, *bn;
 
 	if (!bud)
 		return NULL;
@@ -5658,7 +5658,7 @@ pidgin_conv_find_gtkconv(PurpleConversation * conv)
 }
 
 static void
-buddy_update_cb(PurpleBListNode *bnode, gpointer null)
+buddy_update_cb(PurpleBlistNode *bnode, gpointer null)
 {
 	GList *list;
 
@@ -5739,7 +5739,7 @@ private_gtkconv_new(PurpleConversation *conv, gboolean hidden)
 	gboolean is_chat = PURPLE_IS_CHAT_CONVERSATION(conv);
 	GtkWidget *pane = NULL;
 	GtkWidget *tab_cont;
-	PurpleBListNode *convnode;
+	PurpleBlistNode *convnode;
 	GtkTargetList *targets;
 
 	if (!is_chat && (gtkconv = pidgin_conv_find_gtkconv(conv))) {
@@ -7695,7 +7695,7 @@ pidgin_conv_update_buddy_icon(PurpleIMConversation *im)
 	{
 		PurpleContact *contact = purple_buddy_get_contact(buddy);
 		if (contact) {
-			custom_img = purple_buddy_icons_node_find_custom_icon((PurpleBListNode*)contact);
+			custom_img = purple_buddy_icons_node_find_custom_icon((PurpleBlistNode*)contact);
 			if (custom_img) {
 				/* There is a custom icon for this user */
 				data = purple_imgstore_get_data(custom_img);
@@ -8151,9 +8151,9 @@ conv_placement_pref_cb(const char *name, PurplePrefType type,
 static PidginConversation *
 get_gtkconv_with_contact(PurpleContact *contact)
 {
-	PurpleBListNode *node;
+	PurpleBlistNode *node;
 
-	node = ((PurpleBListNode*)contact)->child;
+	node = ((PurpleBlistNode*)contact)->child;
 
 	for (; node; node = node->next)
 	{
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
index bf76a4ced3..e4d808c46d 100644
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -1111,7 +1111,7 @@ pidgin_dialogs_log_cb(gpointer data, PurpleRequestFields *fields)
 		buddies = purple_blist_find_buddies(account, username);
 		for (cur = buddies; cur != NULL; cur = cur->next)
 		{
-			PurpleBListNode *node = cur->data;
+			PurpleBlistNode *node = cur->data;
 			if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL)))
 			{
 				pidgin_log_show_contact((PurpleContact *)node->parent);
@@ -1234,10 +1234,10 @@ pidgin_dialogs_alias_chat(PurpleChat *chat)
 static void
 pidgin_dialogs_remove_contact_cb(PurpleContact *contact)
 {
-	PurpleBListNode *bnode, *cnode;
+	PurpleBlistNode *bnode, *cnode;
 	PurpleGroup *group;
 
-	cnode = (PurpleBListNode *)contact;
+	cnode = (PurpleBlistNode *)contact;
 	group = (PurpleGroup*)cnode->parent;
 	for (bnode = cnode->child; bnode; bnode = bnode->next) {
 		PurpleBuddy *buddy = (PurpleBuddy*)bnode;
@@ -1324,9 +1324,9 @@ pidgin_dialogs_merge_groups(PurpleGroup *source, const char *new_name)
 static void
 pidgin_dialogs_remove_group_cb(PurpleGroup *group)
 {
-	PurpleBListNode *cnode, *bnode;
+	PurpleBlistNode *cnode, *bnode;
 
-	cnode = ((PurpleBListNode*)group)->child;
+	cnode = ((PurpleBlistNode*)group)->child;
 
 	while (cnode) {
 		if (PURPLE_IS_CONTACT(cnode)) {
diff --git a/pidgin/gtklog.c b/pidgin/gtklog.c
index 127423c261..c6e481f946 100644
--- a/pidgin/gtklog.c
+++ b/pidgin/gtklog.c
@@ -740,7 +740,7 @@ void pidgin_log_show(PurpleLogType type, const char *buddyname, PurpleAccount *a
 
 void pidgin_log_show_contact(PurpleContact *contact) {
 	struct log_viewer_hash_t *ht;
-	PurpleBListNode *child;
+	PurpleBlistNode *child;
 	PidginLogViewer *lv = NULL;
 	GList *logs = NULL;
 	GdkPixbuf *pixbuf;
@@ -763,7 +763,7 @@ void pidgin_log_show_contact(PurpleContact *contact) {
 		return;
 	}
 
-	for (child = purple_blist_node_get_first_child((PurpleBListNode*)contact) ;
+	for (child = purple_blist_node_get_first_child((PurpleBlistNode*)contact) ;
 	     child != NULL ;
 	     child = purple_blist_node_get_sibling_next(child)) {
 		const char *buddy_name;
diff --git a/pidgin/gtkpounce.c b/pidgin/gtkpounce.c
index fbfa698b81..b03f58f43e 100644
--- a/pidgin/gtkpounce.c
+++ b/pidgin/gtkpounce.c
@@ -430,7 +430,7 @@ pounce_dnd_recv(GtkWidget *widget, GdkDragContext *dc, gint x, gint y,
 
 	if (target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE))
 	{
-		PurpleBListNode *node = NULL;
+		PurpleBlistNode *node = NULL;
 		PurpleBuddy *buddy;
 
 		memcpy(&node, sd_data, sizeof(node));
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index 8c0c8616e4..92de25969d 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -1387,7 +1387,7 @@ static void dnd_image_ok_callback(_DndData *data, int choice)
 			break;
 		}
 		contact = purple_buddy_get_contact(buddy);
-		purple_buddy_icons_node_set_custom_icon_from_file((PurpleBListNode*)contact, data->filename);
+		purple_buddy_icons_node_set_custom_icon_from_file((PurpleBlistNode*)contact, data->filename);
 		break;
 	case DND_FILE_TRANSFER:
 		serv_send_file(purple_account_get_connection(data->account), data->who, data->filename);
@@ -1964,7 +1964,7 @@ static void get_log_set_name(PurpleLogSet *set, gpointer value, PidginCompletion
 static void
 add_completion_list(PidginCompletionData *data)
 {
-	PurpleBListNode *gnode, *cnode, *bnode;
+	PurpleBlistNode *gnode, *cnode, *bnode;
 	PidginFilterBuddyCompletionEntryFunc filter_func = data->filter_func;
 	gpointer user_data = data->filter_func_user_data;
 	GHashTable *sets;
diff --git a/pidgin/plugins/cap/cap.c b/pidgin/plugins/cap/cap.c
index e1eb82c511..f9a9122713 100644
--- a/pidgin/plugins/cap/cap.c
+++ b/pidgin/plugins/cap/cap.c
@@ -437,7 +437,7 @@ static void buddy_signed_off(PurpleBuddy *buddy) {
 }
 
 /* drawing-tooltip */
-static void drawing_tooltip(PurpleBListNode *node, GString *text, gboolean full) {
+static void drawing_tooltip(PurpleBlistNode *node, GString *text, gboolean full) {
 	if(node->type == PURPLE_BLIST_BUDDY_NODE) {
 		PurpleBuddy *buddy = PURPLE_BUDDY(node);
 		CapStatistics *stats = get_stats_for(buddy);
diff --git a/pidgin/plugins/cap/cap.h b/pidgin/plugins/cap/cap.h
index d3a915bdb0..d4adc47d69 100644
--- a/pidgin/plugins/cap/cap.h
+++ b/pidgin/plugins/cap/cap.h
@@ -99,7 +99,7 @@ static void buddy_signed_on(PurpleBuddy *buddy);
 /* buddy-signed-off */
 static void buddy_signed_off(PurpleBuddy *buddy);
 /* drawing-tooltip */
-static void drawing_tooltip(PurpleBListNode *node, GString *text, gboolean full);
+static void drawing_tooltip(PurpleBlistNode *node, GString *text, gboolean full);
 /* signed-on */
 static void signed_on(PurpleConnection *gc);
 /* signed-off */
diff --git a/pidgin/plugins/gevolution/gevo-util.c b/pidgin/plugins/gevolution/gevo-util.c
index 7ddd0a3bed..3d8ed1ca63 100644
--- a/pidgin/plugins/gevolution/gevo-util.c
+++ b/pidgin/plugins/gevolution/gevo-util.c
@@ -63,7 +63,7 @@ gevo_get_groups(void)
 {
 	static GList *list = NULL;
 	PurpleGroup *g;
-	PurpleBListNode *gnode;
+	PurpleBlistNode *gnode;
 
 	g_list_free(list);
 	list = NULL;
diff --git a/pidgin/plugins/gevolution/gevolution.c b/pidgin/plugins/gevolution/gevolution.c
index 3da29f8ed4..244460738e 100644
--- a/pidgin/plugins/gevolution/gevolution.c
+++ b/pidgin/plugins/gevolution/gevolution.c
@@ -67,8 +67,8 @@ enum
 	NUM_COLUMNS
 };
 
-static PurpleBListUiOps *backup_blist_ui_ops = NULL;
-static PurpleBListUiOps *blist_ui_ops = NULL;
+static PurpleBlistUiOps *backup_blist_ui_ops = NULL;
+static PurpleBlistUiOps *blist_ui_ops = NULL;
 static EBook *book = NULL;
 static gulong timer = 0;
 static gulong book_view_tag = 0;
@@ -218,14 +218,14 @@ signed_on_cb(PurpleConnection *gc)
 }
 
 static void
-menu_item_activate_cb(PurpleBListNode *node, gpointer user_data)
+menu_item_activate_cb(PurpleBlistNode *node, gpointer user_data)
 {
 	PurpleBuddy *buddy = PURPLE_BUDDY(node);
 	gevo_associate_buddy_dialog_new(buddy);
 }
 
 static void
-menu_item_send_mail_activate_cb(PurpleBListNode *node, gpointer user_data)
+menu_item_send_mail_activate_cb(PurpleBlistNode *node, gpointer user_data)
 {
 	PurpleBuddy *buddy = PURPLE_BUDDY(node);
 	char *mail = NULL;
@@ -260,7 +260,7 @@ menu_item_send_mail_activate_cb(PurpleBListNode *node, gpointer user_data)
 }
 
 static void
-blist_node_extended_menu_cb(PurpleBListNode *node, GList **menu)
+blist_node_extended_menu_cb(PurpleBlistNode *node, GList **menu)
 {
 	PurpleMenuAction *act;
 	PurpleBuddy *buddy;
@@ -342,7 +342,7 @@ plugin_load(PurplePlugin *plugin)
 
 	backup_blist_ui_ops = purple_blist_get_ui_ops();
 
-	blist_ui_ops = g_memdup(backup_blist_ui_ops, sizeof(PurpleBListUiOps));
+	blist_ui_ops = g_memdup(backup_blist_ui_ops, sizeof(PurpleBlistUiOps));
 	blist_ui_ops->request_add_buddy = request_add_buddy;
 
 	purple_blist_set_ui_ops(blist_ui_ops);
diff --git a/pidgin/plugins/gtk-signals-test.c b/pidgin/plugins/gtk-signals-test.c
index 0e568d15fd..f61f50a28d 100644
--- a/pidgin/plugins/gtk-signals-test.c
+++ b/pidgin/plugins/gtk-signals-test.c
@@ -49,7 +49,7 @@ blist_created_cb(PurpleBuddyList *blist, void *data) {
 }
 
 static void
-blist_drawing_tooltip_cb(PurpleBListNode *node, GString *str, gboolean full, void *data) {
+blist_drawing_tooltip_cb(PurpleBlistNode *node, GString *str, gboolean full, void *data) {
 	purple_debug_info("gtk-signal-test", "drawing tooltip cb\n");
 }
 
diff --git a/pidgin/plugins/gtkbuddynote.c b/pidgin/plugins/gtkbuddynote.c
index 5fe08aebad..bf08b8c1ac 100644
--- a/pidgin/plugins/gtkbuddynote.c
+++ b/pidgin/plugins/gtkbuddynote.c
@@ -25,7 +25,7 @@
 #include <version.h>
 
 static void
-append_to_tooltip(PurpleBListNode *node, GString *text, gboolean full)
+append_to_tooltip(PurpleBlistNode *node, GString *text, gboolean full)
 {
 	if (full) {
 		const gchar *note = purple_blist_node_get_string(node, "notes");
diff --git a/pidgin/plugins/history.c b/pidgin/plugins/history.c
index 3b13f6bec0..faea163a68 100644
--- a/pidgin/plugins/history.c
+++ b/pidgin/plugins/history.c
@@ -75,14 +75,14 @@ static void historize(PurpleConversation *c)
 
 		for (cur = buddies; cur != NULL; cur = cur->next)
 		{
-			PurpleBListNode *node = cur->data;
-			PurpleBListNode *prev = purple_blist_node_get_sibling_prev(node);
-			PurpleBListNode *next = purple_blist_node_get_sibling_next(node);
+			PurpleBlistNode *node = cur->data;
+			PurpleBlistNode *prev = purple_blist_node_get_sibling_prev(node);
+			PurpleBlistNode *next = purple_blist_node_get_sibling_next(node);
 			if ((node != NULL) && ((prev != NULL) || (next != NULL)))
 			{
-				PurpleBListNode *node2;
-				PurpleBListNode *parent = purple_blist_node_get_parent(node);
-				PurpleBListNode *child = purple_blist_node_get_first_child(parent);
+				PurpleBlistNode *node2;
+				PurpleBlistNode *parent = purple_blist_node_get_parent(node);
+				PurpleBlistNode *child = purple_blist_node_get_first_child(parent);
 
 				alias = purple_buddy_get_contact_alias(PURPLE_BUDDY(node));
 
diff --git a/pidgin/plugins/ticker/ticker.c b/pidgin/plugins/ticker/ticker.c
index 32b65f9556..c91e1a82b5 100644
--- a/pidgin/plugins/ticker/ticker.c
+++ b/pidgin/plugins/ticker/ticker.c
@@ -227,7 +227,7 @@ static void buddy_ticker_remove_buddy(PurpleBuddy *b) {
 
 static void buddy_ticker_show(void)
 {
-	PurpleBListNode *gnode, *cnode, *bnode;
+	PurpleBlistNode *gnode, *cnode, *bnode;
 	PurpleBuddy *b;
 
 	for(gnode = purple_blist_get_root();