Perl fixes for s/gaim/purple/. This hasn't really been tested yet.

51 files changed, 2281 insertions, 2281 deletions

diff --git a/libpurple/plugins/perl/Makefile.am b/libpurple/plugins/perl/Makefile.am
index d62c97e672..f785c88d8b 100644
--- a/libpurple/plugins/perl/Makefile.am
+++ b/libpurple/plugins/perl/Makefile.am
@@ -55,8 +55,8 @@ common_sources = \
         common/Conversation.xs \
         common/Debug.xs \
         common/FT.xs \
-        common/Gaim.pm \
-        common/Gaim.xs \
+        common/Purple.pm \
+        common/Purple.xs \
         common/ImgStore.xs \
         common/Log.xs \
         common/Makefile.PL.in \
diff --git a/libpurple/plugins/perl/common/Account.xs b/libpurple/plugins/perl/common/Account.xs
index c419fc5a82..84af647853 100644
--- a/libpurple/plugins/perl/common/Account.xs
+++ b/libpurple/plugins/perl/common/Account.xs
@@ -1,104 +1,104 @@
 #include "module.h"
 
-MODULE = Gaim::Account  PACKAGE = Gaim::Account  PREFIX = gaim_account_
+MODULE = Purple::Account  PACKAGE = Purple::Account  PREFIX = purple_account_
 PROTOTYPES: ENABLE
 
-Gaim::Presence
-gaim_account_get_presence(account)
-    Gaim::Account account
+Purple::Presence
+purple_account_get_presence(account)
+    Purple::Account account
 
-Gaim::Account
-gaim_account_new(class, username, protocol_id)
+Purple::Account
+purple_account_new(class, username, protocol_id)
     const char * username
     const char * protocol_id
     C_ARGS:
     username, protocol_id
 
 void
-gaim_account_destroy(account)
-    Gaim::Account account
+purple_account_destroy(account)
+    Purple::Account account
 
 void
-gaim_account_connect(account)
-    Gaim::Account account
+purple_account_connect(account)
+    Purple::Account account
 
 void
-gaim_account_register(account)
-    Gaim::Account account
+purple_account_register(account)
+    Purple::Account account
 
 void
-gaim_account_disconnect(account)
-    Gaim::Account account
+purple_account_disconnect(account)
+    Purple::Account account
 
 void
-gaim_account_request_change_password(account)
-    Gaim::Account account
+purple_account_request_change_password(account)
+    Purple::Account account
 
 void
-gaim_account_request_change_user_info(account)
-    Gaim::Account account
+purple_account_request_change_user_info(account)
+    Purple::Account account
 
 void
-gaim_account_set_username(account, username)
-    Gaim::Account account
+purple_account_set_username(account, username)
+    Purple::Account account
     const char * username
 
 void
-gaim_account_set_password(account, password)
-    Gaim::Account account
+purple_account_set_password(account, password)
+    Purple::Account account
     const char * password
 
 void
-gaim_account_set_alias(account, alias)
-    Gaim::Account account
+purple_account_set_alias(account, alias)
+    Purple::Account account
     const char * alias
 
 void
-gaim_account_set_user_info(account, user_info)
-    Gaim::Account account
+purple_account_set_user_info(account, user_info)
+    Purple::Account account
     const char *user_info
 
 void
-gaim_account_set_buddy_icon(account, icon)
-    Gaim::Account account
+purple_account_set_buddy_icon(account, icon)
+    Purple::Account account
     const char *icon
 
 void
-gaim_account_set_connection(account, gc)
-    Gaim::Account account
-    Gaim::Connection gc
+purple_account_set_connection(account, gc)
+    Purple::Account account
+    Purple::Connection gc
 
 void
-gaim_account_set_remember_password(account, value)
-    Gaim::Account account
+purple_account_set_remember_password(account, value)
+    Purple::Account account
     gboolean value
 
 void
-gaim_account_set_check_mail(account, value)
-    Gaim::Account account
+purple_account_set_check_mail(account, value)
+    Purple::Account account
     gboolean value
 
-void gaim_account_set_enabled(account, ui, value)
-    Gaim::Account account
+void purple_account_set_enabled(account, ui, value)
+    Purple::Account account
     const char *ui
     gboolean value
 
 void
-gaim_account_set_proxy_info(account, info)
-    Gaim::Account account
-    Gaim::ProxyInfo info
+purple_account_set_proxy_info(account, info)
+    Purple::Account account
+    Purple::ProxyInfo info
 
 void
-gaim_account_set_status(account, status_id, active)
-    Gaim::Account account
+purple_account_set_status(account, status_id, active)
+    Purple::Account account
     const char *status_id
     gboolean active
 CODE:
-    gaim_account_set_status(account, status_id, active, NULL);
+    purple_account_set_status(account, status_id, active, NULL);
 
 void
-gaim_account_set_status_types(account, status_types)
-    Gaim::Account account
+purple_account_set_status_types(account, status_types)
+    Purple::Account account
     SV * status_types
 PREINIT:
     GList *t_GL;
@@ -111,97 +111,97 @@ PPCODE:
         STRLEN t_sl;
         t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(status_types), i, 0), t_sl));
     }
-    gaim_account_set_status_types(account, t_GL);
+    purple_account_set_status_types(account, t_GL);
 
 void
-gaim_account_clear_settings(account)
-    Gaim::Account account
+purple_account_clear_settings(account)
+    Purple::Account account
 
 void
-gaim_account_set_int(account, name, value)
-    Gaim::Account account
+purple_account_set_int(account, name, value)
+    Purple::Account account
     const char *name
     int value
 
 gboolean
-gaim_account_is_connected(account)
-    Gaim::Account account
+purple_account_is_connected(account)
+    Purple::Account account
 
 const char *
-gaim_account_get_username(account)
-    Gaim::Account account
+purple_account_get_username(account)
+    Purple::Account account
 
 const char *
-gaim_account_get_password(account)
-    Gaim::Account account
+purple_account_get_password(account)
+    Purple::Account account
 
 const char *
-gaim_account_get_alias(account)
-    Gaim::Account account
+purple_account_get_alias(account)
+    Purple::Account account
 
 const char *
-gaim_account_get_user_info(account)
-    Gaim::Account account
+purple_account_get_user_info(account)
+    Purple::Account account
 
 const char *
-gaim_account_get_buddy_icon(account)
-    Gaim::Account account
+purple_account_get_buddy_icon(account)
+    Purple::Account account
 
 const char *
-gaim_account_get_protocol_id(account)
-    Gaim::Account account
+purple_account_get_protocol_id(account)
+    Purple::Account account
 
 const char *
-gaim_account_get_protocol_name(account)
-    Gaim::Account account
+purple_account_get_protocol_name(account)
+    Purple::Account account
 
-Gaim::Connection
-gaim_account_get_connection(account)
-    Gaim::Account account
+Purple::Connection
+purple_account_get_connection(account)
+    Purple::Account account
 
 gboolean
-gaim_account_get_remember_password(account)
-    Gaim::Account account
+purple_account_get_remember_password(account)
+    Purple::Account account
 
 gboolean
-gaim_account_get_check_mail(account)
-    Gaim::Account account
+purple_account_get_check_mail(account)
+    Purple::Account account
 
 gboolean
-gaim_account_get_enabled(account, ui)
-    Gaim::Account account
+purple_account_get_enabled(account, ui)
+    Purple::Account account
     const char *ui
 
-Gaim::ProxyInfo
-gaim_account_get_proxy_info(account)
-    Gaim::Account account
+Purple::ProxyInfo
+purple_account_get_proxy_info(account)
+    Purple::Account account
 
-Gaim::Status
-gaim_account_get_active_status(account)
-    Gaim::Account account
+Purple::Status
+purple_account_get_active_status(account)
+    Purple::Account account
 
 void
-gaim_account_get_status_types(account)
-    Gaim::Account account
+purple_account_get_status_types(account)
+    Purple::Account account
 PREINIT:
     const GList *l;
 PPCODE:
-    for (l = gaim_account_get_status_types(account); l != NULL; l = l->next) {
-        XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::StatusType")));
+    for (l = purple_account_get_status_types(account); l != NULL; l = l->next) {
+        XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::StatusType")));
     }
 
-Gaim::Log
-gaim_account_get_log(account, create)
-    Gaim::Account account
+Purple::Log
+purple_account_get_log(account, create)
+    Purple::Account account
     gboolean create
 
 void
-gaim_account_destroy_log(account)
-    Gaim::Account account
+purple_account_destroy_log(account)
+    Purple::Account account
 
 void
-gaim_account_add_buddies(account, list)
-    Gaim::Account account
+purple_account_add_buddies(account, list)
+    Purple::Account account
     SV * list
 PREINIT:
     GList *t_GL;
@@ -214,22 +214,22 @@ PPCODE:
         STRLEN t_sl;
         t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(list), i, 0), t_sl));
     }
-    gaim_account_add_buddies(account, t_GL);
+    purple_account_add_buddies(account, t_GL);
 
 void
-gaim_account_add_buddy(account, buddy)
-    Gaim::Account account
-    Gaim::BuddyList::Buddy  buddy
+purple_account_add_buddy(account, buddy)
+    Purple::Account account
+    Purple::BuddyList::Buddy  buddy
 
 void
-gaim_account_change_password(account, a, b)
-    Gaim::Account account
+purple_account_change_password(account, a, b)
+    Purple::Account account
     const char *    a
     const char *    b
 
 void
-gaim_account_remove_buddies(account, A, B)
-    Gaim::Account account
+purple_account_remove_buddies(account, A, B)
+    Purple::Account account
     SV * A
     SV * B
 PREINIT:
@@ -251,76 +251,76 @@ PPCODE:
         STRLEN t_sl;
         t_GL2 = g_list_append(t_GL2, SvPV(*av_fetch((AV *)SvRV(B), i, 0), t_sl));
     }
-    gaim_account_remove_buddies(account, t_GL1, t_GL2);
+    purple_account_remove_buddies(account, t_GL1, t_GL2);
 
 void
-gaim_account_remove_buddy(account, buddy, group)
-    Gaim::Account account
-    Gaim::BuddyList::Buddy buddy
-    Gaim::BuddyList::Group group
+purple_account_remove_buddy(account, buddy, group)
+    Purple::Account account
+    Purple::BuddyList::Buddy buddy
+    Purple::BuddyList::Group group
 
 void
-gaim_account_remove_group(account, group)
-    Gaim::Account account
-    Gaim::BuddyList::Group group
+purple_account_remove_group(account, group)
+    Purple::Account account
+    Purple::BuddyList::Group group
 
-MODULE = Gaim::Account  PACKAGE = Gaim::Accounts  PREFIX = gaim_accounts_
+MODULE = Purple::Account  PACKAGE = Purple::Accounts  PREFIX = purple_accounts_
 PROTOTYPES: ENABLE
 
 void
-gaim_accounts_add(account)
-    Gaim::Account account
+purple_accounts_add(account)
+    Purple::Account account
 
 void
-gaim_accounts_remove(account)
-    Gaim::Account account
+purple_accounts_remove(account)
+    Purple::Account account
 
 void
-gaim_accounts_delete(account)
-    Gaim::Account account
+purple_accounts_delete(account)
+    Purple::Account account
 
 void
-gaim_accounts_reorder(account, new_index)
-    Gaim::Account account
+purple_accounts_reorder(account, new_index)
+    Purple::Account account
     size_t new_index
 
 void
-gaim_accounts_get_all()
+purple_accounts_get_all()
 PREINIT:
     GList *l;
 PPCODE:
-    for (l = gaim_accounts_get_all(); l != NULL; l = l->next) {
-        XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Account")));
+    for (l = purple_accounts_get_all(); l != NULL; l = l->next) {
+        XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Account")));
     }
 
 void
-gaim_accounts_get_all_active()
+purple_accounts_get_all_active()
 PREINIT:
     GList *list, *iter;
 PPCODE:
-    list = gaim_accounts_get_all_active();
+    list = purple_accounts_get_all_active();
     for (iter = list; iter != NULL; iter = iter->next) {
-        XPUSHs(sv_2mortal(gaim_perl_bless_object(iter->data, "Gaim::Account")));
+        XPUSHs(sv_2mortal(purple_perl_bless_object(iter->data, "Purple::Account")));
     }
     g_list_free(list);
 
-Gaim::Account
-gaim_accounts_find(name, protocol)
+Purple::Account
+purple_accounts_find(name, protocol)
     const char * name
     const char * protocol
 
 void
-gaim_accounts_set_ui_ops(ops)
-    Gaim::Account::UiOps ops
+purple_accounts_set_ui_ops(ops)
+    Purple::Account::UiOps ops
 
-Gaim::Account::UiOps
-gaim_accounts_get_ui_ops()
+Purple::Account::UiOps
+purple_accounts_get_ui_ops()
 
-Gaim::Handle
-gaim_accounts_get_handle()
+Purple::Handle
+purple_accounts_get_handle()
 
 void
-gaim_accounts_init()
+purple_accounts_init()
 
 void
-gaim_accounts_uninit()
+purple_accounts_uninit()
diff --git a/libpurple/plugins/perl/common/AccountOpts.xs b/libpurple/plugins/perl/common/AccountOpts.xs
index a9a4eee9e0..87c54f89e1 100644
--- a/libpurple/plugins/perl/common/AccountOpts.xs
+++ b/libpurple/plugins/perl/common/AccountOpts.xs
@@ -1,39 +1,39 @@
 #include "module.h"
 
-MODULE = Gaim::Account::Option  PACKAGE = Gaim::Account::Option  PREFIX = gaim_account_option_
+MODULE = Purple::Account::Option  PACKAGE = Purple::Account::Option  PREFIX = purple_account_option_
 PROTOTYPES: ENABLE
 
 void
-gaim_account_option_destroy(option)
-	Gaim::Account::Option option
+purple_account_option_destroy(option)
+	Purple::Account::Option option
 
 const char *
-gaim_account_option_get_default_string(option)
-	Gaim::Account::Option option
+purple_account_option_get_default_string(option)
+	Purple::Account::Option option
 
 void
-gaim_account_option_add_list_item(option, key, value)
-	Gaim::Account::Option option
+purple_account_option_add_list_item(option, key, value)
+	Purple::Account::Option option
 	const char * key
 	const char * value
 
 void
-gaim_account_option_set_default_string(option, value);
-	Gaim::Account::Option option
+purple_account_option_set_default_string(option, value);
+	Purple::Account::Option option
 	const char * value
 
 void
-gaim_account_option_set_default_int(option, value);
-	Gaim::Account::Option option
+purple_account_option_set_default_int(option, value);
+	Purple::Account::Option option
 	int value
 
 void
-gaim_account_option_set_default_bool(option, value);
-	Gaim::Account::Option option
+purple_account_option_set_default_bool(option, value);
+	Purple::Account::Option option
 	gboolean value
 
-Gaim::Account::Option
-gaim_account_option_list_new(class, text, pref_name, values)
+Purple::Account::Option
+purple_account_option_list_new(class, text, pref_name, values)
 	const char * text
 	const char * pref_name
 	SV * values
@@ -48,83 +48,83 @@ CODE:
 		STRLEN t_sl;
 		t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(values), i, 0), t_sl));
 	}
-	RETVAL  = gaim_account_option_list_new(text, pref_name, t_GL);
+	RETVAL  = purple_account_option_list_new(text, pref_name, t_GL);
 OUTPUT:
 	RETVAL
 
-Gaim::Account::Option
-gaim_account_option_string_new(class, text, pref_name, default_value)
+Purple::Account::Option
+purple_account_option_string_new(class, text, pref_name, default_value)
 	const char * text
 	const char * pref_name
 	const char * default_value
     C_ARGS:
 	text, pref_name, default_value
 
-Gaim::Account::Option
-gaim_account_option_int_new(class, text, pref_name, default_value)
+Purple::Account::Option
+purple_account_option_int_new(class, text, pref_name, default_value)
 	const char * text
 	const char * pref_name
 	gboolean default_value
     C_ARGS:
 	text, pref_name, default_value
 
-Gaim::Account::Option
-gaim_account_option_bool_new(class, text, pref_name, default_value)
+Purple::Account::Option
+purple_account_option_bool_new(class, text, pref_name, default_value)
 	const char * text
 	const char * pref_name
 	gboolean default_value
     C_ARGS:
 	text, pref_name, default_value
 
-Gaim::Account::Option
-gaim_account_option_new(class, type, text, pref_name)
-	Gaim::PrefType type
+Purple::Account::Option
+purple_account_option_new(class, type, text, pref_name)
+	Purple::PrefType type
 	const char * text
 	const char * pref_name
     C_ARGS:
 	type, text, pref_name
 
 void
-gaim_account_option_get_list(option)
-	Gaim::Account::Option option
+purple_account_option_get_list(option)
+	Purple::Account::Option option
 PREINIT:
 	const GList *l;
 PPCODE:
-	for (l = gaim_account_option_get_list(option); l != NULL; l = l->next) {
-		/* XXX These are actually GaimKeyValuePairs but we don't have a
+	for (l = purple_account_option_get_list(option); l != NULL; l = l->next) {
+		/* XXX These are actually PurpleKeyValuePairs but we don't have a
 		 * type for that and even if we did I don't think there's
 		 * anything perl could do with them, so I'm just going to
-		 * leave this as a Gaim::ListEntry for now. */
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListEntry")));
+		 * leave this as a Purple::ListEntry for now. */
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListEntry")));
 	}
 
-Gaim::PrefType
-gaim_account_option_get_type(option)
-	Gaim::Account::Option option
+Purple::PrefType
+purple_account_option_get_type(option)
+	Purple::Account::Option option
 
 gboolean
-gaim_account_option_get_masked(option)
-	Gaim::Account::Option option
+purple_account_option_get_masked(option)
+	Purple::Account::Option option
 
 int
-gaim_account_option_get_default_int(option)
-	Gaim::Account::Option option;
+purple_account_option_get_default_int(option)
+	Purple::Account::Option option;
 
 gboolean
-gaim_account_option_get_default_bool(option)
-	Gaim::Account::Option option;
+purple_account_option_get_default_bool(option)
+	Purple::Account::Option option;
 
 const char *
-gaim_account_option_get_setting(option)
-	Gaim::Account::Option option
+purple_account_option_get_setting(option)
+	Purple::Account::Option option
 
 const char *
-gaim_account_option_get_text(option)
-	Gaim::Account::Option option
+purple_account_option_get_text(option)
+	Purple::Account::Option option
 
 void
-gaim_account_option_set_list(option, values)
-	Gaim::Account::Option option
+purple_account_option_set_list(option, values)
+	Purple::Account::Option option
 	SV * values
 PREINIT:
 	GList *t_GL;
@@ -137,18 +137,18 @@ PPCODE:
 		STRLEN t_sl;
 		t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(values), i, 0), t_sl));
 	}
-	gaim_account_option_set_list(option, t_GL);
+	purple_account_option_set_list(option, t_GL);
 
 void
-gaim_account_option_set_masked(option, masked)
-	Gaim::Account::Option option
+purple_account_option_set_masked(option, masked)
+	Purple::Account::Option option
 	gboolean masked
 
-MODULE = Gaim::Account::Option  PACKAGE = Gaim::Account::UserSplit  PREFIX = gaim_account_user_split_
+MODULE = Purple::Account::Option  PACKAGE = Purple::Account::UserSplit  PREFIX = purple_account_user_split_
 PROTOTYPES: ENABLE
 
-Gaim::Account::UserSplit
-gaim_account_user_split_new(class, text, default_value, sep)
+Purple::Account::UserSplit
+purple_account_user_split_new(class, text, default_value, sep)
 	const char * text
 	const char * default_value
 	char sep
@@ -156,13 +156,13 @@ gaim_account_user_split_new(class, text, default_value, sep)
 	text, default_value, sep
 
 char
-gaim_account_user_split_get_separator(split)
-	Gaim::Account::UserSplit split
+purple_account_user_split_get_separator(split)
+	Purple::Account::UserSplit split
 
 const char *
-gaim_account_user_split_get_text(split)
-	Gaim::Account::UserSplit split
+purple_account_user_split_get_text(split)
+	Purple::Account::UserSplit split
 
 void
-gaim_account_user_split_destroy(split)
-	Gaim::Account::UserSplit split
+purple_account_user_split_destroy(split)
+	Purple::Account::UserSplit split
diff --git a/libpurple/plugins/perl/common/BuddyIcon.xs b/libpurple/plugins/perl/common/BuddyIcon.xs
index e109631b73..a5c3c4b820 100644
--- a/libpurple/plugins/perl/common/BuddyIcon.xs
+++ b/libpurple/plugins/perl/common/BuddyIcon.xs
@@ -1,90 +1,90 @@
 #include "module.h"
 
-MODULE = Gaim::Buddy::Icon PACKAGE = Gaim::Buddy::Icon   PREFIX = gaim_buddy_icon_
+MODULE = Purple::Buddy::Icon PACKAGE = Purple::Buddy::Icon   PREFIX = purple_buddy_icon_
 PROTOTYPES: ENABLE
 
 void
-gaim_buddy_icon_destroy(icon)
-	Gaim::Buddy::Icon icon
+purple_buddy_icon_destroy(icon)
+	Purple::Buddy::Icon icon
 
-Gaim::Buddy::Icon
-gaim_buddy_icon_ref(icon)
-	Gaim::Buddy::Icon icon
+Purple::Buddy::Icon
+purple_buddy_icon_ref(icon)
+	Purple::Buddy::Icon icon
 
-Gaim::Buddy::Icon
-gaim_buddy_icon_unref(icon)
-	Gaim::Buddy::Icon icon
+Purple::Buddy::Icon
+purple_buddy_icon_unref(icon)
+	Purple::Buddy::Icon icon
 
 void
-gaim_buddy_icon_update(icon)
-	Gaim::Buddy::Icon icon
+purple_buddy_icon_update(icon)
+	Purple::Buddy::Icon icon
 
 void
-gaim_buddy_icon_cache(icon, buddy)
-	Gaim::Buddy::Icon icon
-	Gaim::BuddyList::Buddy buddy
+purple_buddy_icon_cache(icon, buddy)
+	Purple::Buddy::Icon icon
+	Purple::BuddyList::Buddy buddy
 
 void
-gaim_buddy_icon_set_account(icon, account)
-	Gaim::Buddy::Icon icon
-	Gaim::Account account
+purple_buddy_icon_set_account(icon, account)
+	Purple::Buddy::Icon icon
+	Purple::Account account
 
 void
-gaim_buddy_icon_set_username(icon, username)
-	Gaim::Buddy::Icon icon
+purple_buddy_icon_set_username(icon, username)
+	Purple::Buddy::Icon icon
 	const char * username
 
 void
-gaim_buddy_icon_set_data(icon, data, len)
-	Gaim::Buddy::Icon icon
+purple_buddy_icon_set_data(icon, data, len)
+	Purple::Buddy::Icon icon
 	void * data
 	size_t len
 
-Gaim::Account
-gaim_buddy_icon_get_account(icon)
-	Gaim::Buddy::Icon icon
+Purple::Account
+purple_buddy_icon_get_account(icon)
+	Purple::Buddy::Icon icon
 
 const char *
-gaim_buddy_icon_get_username(icon)
-	Gaim::Buddy::Icon icon
+purple_buddy_icon_get_username(icon)
+	Purple::Buddy::Icon icon
 
 const void *
-gaim_buddy_icon_get_data(icon, len)
-	Gaim::Buddy::Icon icon
+purple_buddy_icon_get_data(icon, len)
+	Purple::Buddy::Icon icon
 	size_t &len
 
 const char *
-gaim_buddy_icon_get_type(icon)
-	Gaim::Buddy::Icon icon
+purple_buddy_icon_get_type(icon)
+	Purple::Buddy::Icon icon
 
 void
-gaim_buddy_icon_get_scale_size(spec, width, height)
-	Gaim::Buddy::Icon::Spec spec
+purple_buddy_icon_get_scale_size(spec, width, height)
+	Purple::Buddy::Icon::Spec spec
 	int *width
 	int *height
 
-MODULE = Gaim::Buddy::Icon PACKAGE = Gaim::Buddy::Icons   PREFIX = gaim_buddy_icons_
+MODULE = Purple::Buddy::Icon PACKAGE = Purple::Buddy::Icons   PREFIX = purple_buddy_icons_
 PROTOTYPES: ENABLE
 
 void
-gaim_buddy_icons_set_caching(caching)
+purple_buddy_icons_set_caching(caching)
 	gboolean caching
 
 gboolean
-gaim_buddy_icons_is_caching()
+purple_buddy_icons_is_caching()
 
 void
-gaim_buddy_icons_set_cache_dir(cache_dir)
+purple_buddy_icons_set_cache_dir(cache_dir)
 	const char *cache_dir
 
 const char *
-gaim_buddy_icons_get_cache_dir();
+purple_buddy_icons_get_cache_dir();
 
-Gaim::Handle
-gaim_buddy_icons_get_handle();
+Purple::Handle
+purple_buddy_icons_get_handle();
 
 void
-gaim_buddy_icons_init();
+purple_buddy_icons_init();
 
 void
-gaim_buddy_icons_uninit()
+purple_buddy_icons_uninit()
diff --git a/libpurple/plugins/perl/common/BuddyList.xs b/libpurple/plugins/perl/common/BuddyList.xs
index c4091743c3..d3dfa0ab3f 100644
--- a/libpurple/plugins/perl/common/BuddyList.xs
+++ b/libpurple/plugins/perl/common/BuddyList.xs
@@ -1,304 +1,304 @@
 #include "module.h"
 #include "../perl-handlers.h"
 
-MODULE = Gaim::BuddyList  PACKAGE = Gaim  PREFIX = gaim_
+MODULE = Purple::BuddyList  PACKAGE = Purple  PREFIX = purple_
 PROTOTYPES: ENABLE
 
-Gaim::BuddyList
-gaim_get_blist()
+Purple::BuddyList
+purple_get_blist()
 
 void
-gaim_set_blist(blist)
-	Gaim::BuddyList blist
+purple_set_blist(blist)
+	Purple::BuddyList blist
 
-MODULE = Gaim::BuddyList  PACKAGE = Gaim::Find  PREFIX = gaim_find_
+MODULE = Purple::BuddyList  PACKAGE = Purple::Find  PREFIX = purple_find_
 PROTOTYPES: ENABLE
 
-Gaim::BuddyList::Buddy
-gaim_find_buddy(account, name)
-	Gaim::Account account
+Purple::BuddyList::Buddy
+purple_find_buddy(account, name)
+	Purple::Account account
 	const char * name
 
 void
-gaim_find_buddies(account, name)
-	Gaim::Account account
+purple_find_buddies(account, name)
+	Purple::Account account
 	const char * name
 PREINIT:
 	GSList *l;
 PPCODE:
-	for (l = gaim_find_buddies(account, name); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::BuddyList::Buddy")));
+	for (l = purple_find_buddies(account, name); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::BuddyList::Buddy")));
 	}
 
 gboolean
-gaim_group_on_account(group, account)
-	Gaim::BuddyList::Group  group
-	Gaim::Account account
+purple_group_on_account(group, account)
+	Purple::BuddyList::Group  group
+	Purple::Account account
 
-Gaim::BuddyList::Group
-gaim_find_group(name)
+Purple::BuddyList::Group
+purple_find_group(name)
 	const char *name
 
-MODULE = Gaim::BuddyList  PACKAGE = Gaim::BuddyList::Contact  PREFIX = gaim_contact_
+MODULE = Purple::BuddyList  PACKAGE = Purple::BuddyList::Contact  PREFIX = purple_contact_
 PROTOTYPES: ENABLE
 
-Gaim::BuddyList::Contact
-gaim_contact_new();
+Purple::BuddyList::Contact
+purple_contact_new();
 
-Gaim::BuddyList::Buddy
-gaim_contact_get_priority_buddy(contact)
-	Gaim::BuddyList::Contact contact
+Purple::BuddyList::Buddy
+purple_contact_get_priority_buddy(contact)
+	Purple::BuddyList::Contact contact
 
 void
-gaim_contact_set_alias(contact, alias)
-	Gaim::BuddyList::Contact contact
+purple_contact_set_alias(contact, alias)
+	Purple::BuddyList::Contact contact
 	const char * alias
 
 const char *
-gaim_contact_get_alias(contact)
-	Gaim::BuddyList::Contact contact
+purple_contact_get_alias(contact)
+	Purple::BuddyList::Contact contact
 
 gboolean
-gaim_contact_on_account(contact, account)
-	Gaim::BuddyList::Contact contact
-	Gaim::Account account
+purple_contact_on_account(contact, account)
+	Purple::BuddyList::Contact contact
+	Purple::Account account
 
 void
-gaim_contact_invalidate_priority_buddy(contact)
-	Gaim::BuddyList::Contact contact
+purple_contact_invalidate_priority_buddy(contact)
+	Purple::BuddyList::Contact contact
 
-MODULE = Gaim::BuddyList  PACKAGE = Gaim::BuddyList::Group  PREFIX = gaim_group_
+MODULE = Purple::BuddyList  PACKAGE = Purple::BuddyList::Group  PREFIX = purple_group_
 PROTOTYPES: ENABLE
 
-Gaim::BuddyList::Group
-gaim_group_new(name)
+Purple::BuddyList::Group
+purple_group_new(name)
 	const char *name
 
 void
-gaim_group_get_accounts(group)
-	Gaim::BuddyList::Group  group
+purple_group_get_accounts(group)
+	Purple::BuddyList::Group  group
 PREINIT:
 	GSList *l;
 PPCODE:
-	for (l = gaim_group_get_accounts(group); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Account")));
+	for (l = purple_group_get_accounts(group); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Account")));
 	}
 
 gboolean
-gaim_group_on_account(group, account)
-	Gaim::BuddyList::Group  group
-	Gaim::Account account
+purple_group_on_account(group, account)
+	Purple::BuddyList::Group  group
+	Purple::Account account
 
-MODULE = Gaim::BuddyList  PACKAGE = Gaim::BuddyList  PREFIX = gaim_blist_
+MODULE = Purple::BuddyList  PACKAGE = Purple::BuddyList  PREFIX = purple_blist_
 PROTOTYPES: ENABLE
 
 void
-gaim_blist_add_contact(contact, group, node)
-	Gaim::BuddyList::Contact contact
-	Gaim::BuddyList::Group  group
-	Gaim::BuddyList::Node node
+purple_blist_add_contact(contact, group, node)
+	Purple::BuddyList::Contact contact
+	Purple::BuddyList::Group  group
+	Purple::BuddyList::Node node
 
 void
-gaim_blist_merge_contact(source, node)
-	Gaim::BuddyList::Contact source
-	Gaim::BuddyList::Node node
+purple_blist_merge_contact(source, node)
+	Purple::BuddyList::Contact source
+	Purple::BuddyList::Node node
 
 void
-gaim_blist_add_group(group, node)
-	Gaim::BuddyList::Group  group
-	Gaim::BuddyList::Node node
+purple_blist_add_group(group, node)
+	Purple::BuddyList::Group  group
+	Purple::BuddyList::Node node
 
 void
-gaim_blist_add_buddy(buddy, contact, group, node)
-	Gaim::BuddyList::Buddy buddy
-	Gaim::BuddyList::Contact contact
-	Gaim::BuddyList::Group  group
-	Gaim::BuddyList::Node node
+purple_blist_add_buddy(buddy, contact, group, node)
+	Purple::BuddyList::Buddy buddy
+	Purple::BuddyList::Contact contact
+	Purple::BuddyList::Group  group
+	Purple::BuddyList::Node node
 
 void
-gaim_blist_remove_buddy(buddy)
-	Gaim::BuddyList::Buddy buddy
+purple_blist_remove_buddy(buddy)
+	Purple::BuddyList::Buddy buddy
 
 void
-gaim_blist_remove_contact(contact)
-	Gaim::BuddyList::Contact contact
+purple_blist_remove_contact(contact)
+	Purple::BuddyList::Contact contact
 
 void
-gaim_blist_remove_chat(chat)
-	Gaim::BuddyList::Chat chat
+purple_blist_remove_chat(chat)
+	Purple::BuddyList::Chat chat
 
 void
-gaim_blist_remove_group(group)
-	Gaim::BuddyList::Group  group
+purple_blist_remove_group(group)
+	Purple::BuddyList::Group  group
 
-Gaim::BuddyList::Chat
-gaim_blist_find_chat(account, name)
-	Gaim::Account account
+Purple::BuddyList::Chat
+purple_blist_find_chat(account, name)
+	Purple::Account account
 	const char *name
 
 void
-gaim_blist_add_chat(chat, group, node)
-	Gaim::BuddyList::Chat chat
-	Gaim::BuddyList::Group  group
-	Gaim::BuddyList::Node node
+purple_blist_add_chat(chat, group, node)
+	Purple::BuddyList::Chat chat
+	Purple::BuddyList::Group  group
+	Purple::BuddyList::Node node
 
-Gaim::BuddyList
-gaim_blist_new()
+Purple::BuddyList
+purple_blist_new()
 
 void
-gaim_blist_show()
+purple_blist_show()
 
 void
-gaim_blist_destroy();
+purple_blist_destroy();
 
 void
-gaim_blist_set_visible(show)
+purple_blist_set_visible(show)
 	gboolean show
 
 void
-gaim_blist_update_buddy_status(buddy, old_status)
-	Gaim::BuddyList::Buddy buddy
-	Gaim::Status old_status
+purple_blist_update_buddy_status(buddy, old_status)
+	Purple::BuddyList::Buddy buddy
+	Purple::Status old_status
 
 void
-gaim_blist_update_buddy_icon(buddy)
-	Gaim::BuddyList::Buddy buddy
+purple_blist_update_buddy_icon(buddy)
+	Purple::BuddyList::Buddy buddy
 
 void
-gaim_blist_rename_buddy(buddy, name)
-	Gaim::BuddyList::Buddy buddy
+purple_blist_rename_buddy(buddy, name)
+	Purple::BuddyList::Buddy buddy
 	const char * name
 
 void
-gaim_blist_alias_buddy(buddy, alias)
-	Gaim::BuddyList::Buddy buddy
+purple_blist_alias_buddy(buddy, alias)
+	Purple::BuddyList::Buddy buddy
 	const char * alias
 
 void
-gaim_blist_server_alias_buddy(buddy, alias)
-	Gaim::BuddyList::Buddy buddy
+purple_blist_server_alias_buddy(buddy, alias)
+	Purple::BuddyList::Buddy buddy
 	const char * alias
 
 void
-gaim_blist_alias_chat(chat, alias)
-	Gaim::BuddyList::Chat chat
+purple_blist_alias_chat(chat, alias)
+	Purple::BuddyList::Chat chat
 	const char * alias
 
 void
-gaim_blist_rename_group(group, name)
-	Gaim::BuddyList::Group  group
+purple_blist_rename_group(group, name)
+	Purple::BuddyList::Group  group
 	const char * name
 
 void
-gaim_blist_add_account(account)
-	Gaim::Account account
+purple_blist_add_account(account)
+	Purple::Account account
 
 void
-gaim_blist_remove_account(account)
-	Gaim::Account account
+purple_blist_remove_account(account)
+	Purple::Account account
 
 int
-gaim_blist_get_group_size(group, offline)
-	Gaim::BuddyList::Group  group
+purple_blist_get_group_size(group, offline)
+	Purple::BuddyList::Group  group
 	gboolean offline
 
 int
-gaim_blist_get_group_online_count(group)
-	Gaim::BuddyList::Group  group
+purple_blist_get_group_online_count(group)
+	Purple::BuddyList::Group  group
 
 void
-gaim_blist_load()
+purple_blist_load()
 
 void
-gaim_blist_schedule_save()
+purple_blist_schedule_save()
 
 void
-gaim_blist_request_add_group()
+purple_blist_request_add_group()
 
 void
-gaim_blist_set_ui_ops(ops)
-	Gaim::BuddyList::UiOps ops
+purple_blist_set_ui_ops(ops)
+	Purple::BuddyList::UiOps ops
 
-Gaim::BuddyList::UiOps
-gaim_blist_get_ui_ops()
+Purple::BuddyList::UiOps
+purple_blist_get_ui_ops()
 
-Gaim::Handle
-gaim_blist_get_handle()
+Purple::Handle
+purple_blist_get_handle()
 
 void
-gaim_blist_init()
+purple_blist_init()
 
 void
-gaim_blist_uninit()
+purple_blist_uninit()
 
-MODULE = Gaim::BuddyList  PACKAGE = Gaim::BuddyList::Node  PREFIX = gaim_blist_node_
+MODULE = Purple::BuddyList  PACKAGE = Purple::BuddyList::Node  PREFIX = purple_blist_node_
 PROTOTYPES: ENABLE
 
 void
-gaim_blist_node_get_extended_menu(node)
-	Gaim::BuddyList::Node node
+purple_blist_node_get_extended_menu(node)
+	Purple::BuddyList::Node node
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_blist_node_get_extended_menu(node); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Menu::Action")));
+	for (l = purple_blist_node_get_extended_menu(node); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Menu::Action")));
 	}
 
 void
-gaim_blist_node_set_bool(node, key, value)
-	Gaim::BuddyList::Node node
+purple_blist_node_set_bool(node, key, value)
+	Purple::BuddyList::Node node
 	const char * key
 	gboolean value
 
 gboolean
-gaim_blist_node_get_bool(node, key)
-	Gaim::BuddyList::Node node
+purple_blist_node_get_bool(node, key)
+	Purple::BuddyList::Node node
 	const char * key
 
 void
-gaim_blist_node_set_int(node, key, value)
-	Gaim::BuddyList::Node node
+purple_blist_node_set_int(node, key, value)
+	Purple::BuddyList::Node node
 	const char * key
 	int value
 
 int
-gaim_blist_node_get_int(node, key)
-	Gaim::BuddyList::Node node
+purple_blist_node_get_int(node, key)
+	Purple::BuddyList::Node node
 	const char * key
 
 const char *
-gaim_blist_node_get_string(node, key)
-	Gaim::BuddyList::Node node
+purple_blist_node_get_string(node, key)
+	Purple::BuddyList::Node node
 	const char * key
 
 void
-gaim_blist_node_remove_setting(node, key)
-	Gaim::BuddyList::Node node
+purple_blist_node_remove_setting(node, key)
+	Purple::BuddyList::Node node
 	const char * key
 
 void
-gaim_blist_node_set_flags(node, flags)
-	Gaim::BuddyList::Node node
-	Gaim::BuddyList::NodeFlags flags
+purple_blist_node_set_flags(node, flags)
+	Purple::BuddyList::Node node
+	Purple::BuddyList::NodeFlags flags
 
-Gaim::BuddyList::NodeFlags
-gaim_blist_node_get_flags(node)
-	Gaim::BuddyList::Node node
+Purple::BuddyList::NodeFlags
+purple_blist_node_get_flags(node)
+	Purple::BuddyList::Node node
 
-MODULE = Gaim::BuddyList  PACKAGE = Gaim::BuddyList::Chat  PREFIX = gaim_chat_
+MODULE = Purple::BuddyList  PACKAGE = Purple::BuddyList::Chat  PREFIX = purple_chat_
 PROTOTYPES: ENABLE
 
-Gaim::BuddyList::Group
-gaim_chat_get_group(chat)
-	Gaim::BuddyList::Chat chat
+Purple::BuddyList::Group
+purple_chat_get_group(chat)
+	Purple::BuddyList::Chat chat
 
 const char *
-gaim_chat_get_name(chat)
-	Gaim::BuddyList::Chat chat
+purple_chat_get_name(chat)
+	Purple::BuddyList::Chat chat
 
-Gaim::BuddyList::Chat
-gaim_chat_new(account, alias, components)
-	Gaim::Account account
+Purple::BuddyList::Chat
+purple_chat_new(account, alias, components)
+	Purple::Account account
 	const char * alias
 	SV * components
 INIT:
@@ -320,64 +320,64 @@ CODE:
 		g_hash_table_insert(t_GHash, t_key, t_value);
 	}
 
-	RETVAL = gaim_chat_new(account, alias, t_GHash);
+	RETVAL = purple_chat_new(account, alias, t_GHash);
 OUTPUT:
 	RETVAL
 
-MODULE = Gaim::BuddyList  PACKAGE = Gaim::BuddyList::Buddy  PREFIX = gaim_buddy_
+MODULE = Purple::BuddyList  PACKAGE = Purple::BuddyList::Buddy  PREFIX = purple_buddy_
 PROTOTYPES: ENABLE
 
-Gaim::BuddyList::Buddy
-gaim_buddy_new(account, screenname, alias)
-	Gaim::Account account
+Purple::BuddyList::Buddy
+purple_buddy_new(account, screenname, alias)
+	Purple::Account account
 	const char *screenname
 	const char *alias
 
 const char *
-gaim_buddy_get_server_alias(buddy)
-    Gaim::BuddyList::Buddy buddy
+purple_buddy_get_server_alias(buddy)
+    Purple::BuddyList::Buddy buddy
 
 void
-gaim_buddy_set_icon(buddy, icon)
-	Gaim::BuddyList::Buddy buddy
-	Gaim::Buddy::Icon icon
+purple_buddy_set_icon(buddy, icon)
+	Purple::BuddyList::Buddy buddy
+	Purple::Buddy::Icon icon
 
-Gaim::Account
-gaim_buddy_get_account(buddy)
-	Gaim::BuddyList::Buddy buddy
+Purple::Account
+purple_buddy_get_account(buddy)
+	Purple::BuddyList::Buddy buddy
 
-Gaim::BuddyList::Group
-gaim_buddy_get_group(buddy)
-	Gaim::BuddyList::Buddy buddy
+Purple::BuddyList::Group
+purple_buddy_get_group(buddy)
+	Purple::BuddyList::Buddy buddy
 
 const char *
-gaim_buddy_get_name(buddy)
-	Gaim::BuddyList::Buddy buddy
+purple_buddy_get_name(buddy)
+	Purple::BuddyList::Buddy buddy
 
-Gaim::Buddy::Icon
-gaim_buddy_get_icon(buddy)
-	Gaim::BuddyList::Buddy buddy
+Purple::Buddy::Icon
+purple_buddy_get_icon(buddy)
+	Purple::BuddyList::Buddy buddy
 
-Gaim::BuddyList::Contact
-gaim_buddy_get_contact(buddy)
-	Gaim::BuddyList::Buddy buddy
+Purple::BuddyList::Contact
+purple_buddy_get_contact(buddy)
+	Purple::BuddyList::Buddy buddy
 
-Gaim::Presence
-gaim_buddy_get_presence(buddy)
-	Gaim::BuddyList::Buddy buddy
+Purple::Presence
+purple_buddy_get_presence(buddy)
+	Purple::BuddyList::Buddy buddy
 
 const char *
-gaim_buddy_get_alias_only(buddy)
-	Gaim::BuddyList::Buddy buddy
+purple_buddy_get_alias_only(buddy)
+	Purple::BuddyList::Buddy buddy
 
 const char *
-gaim_buddy_get_contact_alias(buddy)
-	Gaim::BuddyList::Buddy buddy
+purple_buddy_get_contact_alias(buddy)
+	Purple::BuddyList::Buddy buddy
 
 const char *
-gaim_buddy_get_local_alias(buddy)
-	Gaim::BuddyList::Buddy buddy
+purple_buddy_get_local_alias(buddy)
+	Purple::BuddyList::Buddy buddy
 
 const char *
-gaim_buddy_get_alias(buddy)
-	Gaim::BuddyList::Buddy buddy
+purple_buddy_get_alias(buddy)
+	Purple::BuddyList::Buddy buddy
diff --git a/libpurple/plugins/perl/common/Cipher.xs b/libpurple/plugins/perl/common/Cipher.xs
index 64f0a1e59d..27ae45992f 100644
--- a/libpurple/plugins/perl/common/Cipher.xs
+++ b/libpurple/plugins/perl/common/Cipher.xs
@@ -1,18 +1,18 @@
 #include "module.h"
 
-MODULE = Gaim::Cipher  PACKAGE = Gaim::Cipher  PREFIX = gaim_cipher_
+MODULE = Purple::Cipher  PACKAGE = Purple::Cipher  PREFIX = purple_cipher_
 PROTOTYPES: ENABLE
 
 const gchar *
-gaim_cipher_get_name(cipher)
-	Gaim::Cipher cipher
+purple_cipher_get_name(cipher)
+	Purple::Cipher cipher
 
 guint
-gaim_cipher_get_capabilities(cipher)
-	Gaim::Cipher cipher
+purple_cipher_get_capabilities(cipher)
+	Purple::Cipher cipher
 
 gboolean
-gaim_cipher_digest_region(name, data, data_len, in_len, digest, out_len)
+purple_cipher_digest_region(name, data, data_len, in_len, digest, out_len)
 	const gchar * name
 	const guchar * data
 	size_t data_len
@@ -20,138 +20,138 @@ gaim_cipher_digest_region(name, data, data_len, in_len, digest, out_len)
 	guchar &digest
 	size_t * out_len
 
-MODULE = Gaim::Cipher  PACKAGE = Gaim::Ciphers  PREFIX = gaim_ciphers_
+MODULE = Purple::Cipher  PACKAGE = Purple::Ciphers  PREFIX = purple_ciphers_
 PROTOTYPES: ENABLE
 
-Gaim::Cipher
-gaim_ciphers_find_cipher(name)
+Purple::Cipher
+purple_ciphers_find_cipher(name)
 	gchar * name
 
-Gaim::Cipher
-gaim_ciphers_register_cipher(name, ops)
+Purple::Cipher
+purple_ciphers_register_cipher(name, ops)
 	gchar * name
-	Gaim::Cipher::Ops ops
+	Purple::Cipher::Ops ops
 
 gboolean
-gaim_ciphers_unregister_cipher(cipher)
-	Gaim::Cipher cipher
+purple_ciphers_unregister_cipher(cipher)
+	Purple::Cipher cipher
 
 void
-gaim_ciphers_get_ciphers()
+purple_ciphers_get_ciphers()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_ciphers_get_ciphers(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Cipher")));
+	for (l = purple_ciphers_get_ciphers(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Cipher")));
 	}
 
-Gaim::Handle
-gaim_ciphers_get_handle()
+Purple::Handle
+purple_ciphers_get_handle()
 
 void
-gaim_ciphers_init()
+purple_ciphers_init()
 
 void
-gaim_ciphers_uninit()
+purple_ciphers_uninit()
 
-MODULE = Gaim::Cipher  PACKAGE = Gaim::Cipher::Context  PREFIX = gaim_cipher_context_
+MODULE = Purple::Cipher  PACKAGE = Purple::Cipher::Context  PREFIX = purple_cipher_context_
 PROTOTYPES: ENABLE
 
 void
-gaim_cipher_context_set_option(context, name, value)
-	Gaim::Cipher::Context context
+purple_cipher_context_set_option(context, name, value)
+	Purple::Cipher::Context context
 	gchar *name
 	gpointer value
 
 gpointer
-gaim_cipher_context_get_option(context, name)
-	Gaim::Cipher::Context context
+purple_cipher_context_get_option(context, name)
+	Purple::Cipher::Context context
 	gchar *name
 
-Gaim::Cipher::Context
-gaim_cipher_context_new(cipher, extra)
-	Gaim::Cipher cipher
+Purple::Cipher::Context
+purple_cipher_context_new(cipher, extra)
+	Purple::Cipher cipher
 	void *extra
 
-Gaim::Cipher::Context
-gaim_cipher_context_new_by_name(name, extra)
+Purple::Cipher::Context
+purple_cipher_context_new_by_name(name, extra)
 	gchar *name
 	void *extra
 
 void
-gaim_cipher_context_reset(context, extra)
-	Gaim::Cipher::Context context
+purple_cipher_context_reset(context, extra)
+	Purple::Cipher::Context context
 	gpointer extra
 
 void
-gaim_cipher_context_destroy(context)
-	Gaim::Cipher::Context context
+purple_cipher_context_destroy(context)
+	Purple::Cipher::Context context
 
 void
-gaim_cipher_context_set_iv(context, iv, len)
-	Gaim::Cipher::Context context
+purple_cipher_context_set_iv(context, iv, len)
+	Purple::Cipher::Context context
 	guchar * iv
 	size_t len
 
 void
-gaim_cipher_context_append(context, data, len)
-	Gaim::Cipher::Context context
+purple_cipher_context_append(context, data, len)
+	Purple::Cipher::Context context
 	guchar * data
 	size_t len
 
 gboolean
-gaim_cipher_context_digest(context, in_len, digest, out_len)
-	Gaim::Cipher::Context context
+purple_cipher_context_digest(context, in_len, digest, out_len)
+	Purple::Cipher::Context context
 	size_t in_len
 	guchar &digest
 	size_t &out_len
 
 gboolean
-gaim_cipher_context_digest_to_str(context, in_len, digest_s, out_len)
-	Gaim::Cipher::Context context
+purple_cipher_context_digest_to_str(context, in_len, digest_s, out_len)
+	Purple::Cipher::Context context
 	size_t in_len
 	gchar &digest_s
 	size_t &out_len
 
 gint
-gaim_cipher_context_encrypt(context, data, len, output, outlen)
-	Gaim::Cipher::Context context
+purple_cipher_context_encrypt(context, data, len, output, outlen)
+	Purple::Cipher::Context context
 	guchar &data
 	size_t len
 	guchar &output
 	size_t &outlen
 
 gint
-gaim_cipher_context_decrypt(context, data, len, output, outlen)
-	Gaim::Cipher::Context context
+purple_cipher_context_decrypt(context, data, len, output, outlen)
+	Purple::Cipher::Context context
 	guchar &data
 	size_t len
 	guchar &output
 	size_t &outlen
 
 void
-gaim_cipher_context_set_salt(context, salt)
-	Gaim::Cipher::Context context
+purple_cipher_context_set_salt(context, salt)
+	Purple::Cipher::Context context
 	guchar *salt
 
 size_t
-gaim_cipher_context_get_salt_size(context)
-	Gaim::Cipher::Context context
+purple_cipher_context_get_salt_size(context)
+	Purple::Cipher::Context context
 
 void
-gaim_cipher_context_set_key(context, key)
-	Gaim::Cipher::Context context
+purple_cipher_context_set_key(context, key)
+	Purple::Cipher::Context context
 	guchar *key
 
 size_t
-gaim_cipher_context_get_key_size(context)
-	Gaim::Cipher::Context context
+purple_cipher_context_get_key_size(context)
+	Purple::Cipher::Context context
 
 void
-gaim_cipher_context_set_data(context, data)
-	Gaim::Cipher::Context context
+purple_cipher_context_set_data(context, data)
+	Purple::Cipher::Context context
 	gpointer data
 
 gpointer
-gaim_cipher_context_get_data(context)
-	Gaim::Cipher::Context context
+purple_cipher_context_get_data(context)
+	Purple::Cipher::Context context
diff --git a/libpurple/plugins/perl/common/Cmds.xs b/libpurple/plugins/perl/common/Cmds.xs
index 0aa87f6060..f01e7e2818 100644
--- a/libpurple/plugins/perl/common/Cmds.xs
+++ b/libpurple/plugins/perl/common/Cmds.xs
@@ -1,49 +1,49 @@
 #include "module.h"
 #include "../perl-handlers.h"
 
-MODULE = Gaim::Cmd  PACKAGE = Gaim::Cmd  PREFIX = gaim_cmd_
+MODULE = Purple::Cmd  PACKAGE = Purple::Cmd  PREFIX = purple_cmd_
 PROTOTYPES: ENABLE
 
 void
-gaim_cmd_help(conv, command)
-	Gaim::Conversation conv
+purple_cmd_help(conv, command)
+	Purple::Conversation conv
 	const gchar *command
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_cmd_help(conv, command); l != NULL; l = l->next) {
+	for (l = purple_cmd_help(conv, command); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(newSVpv(l->data, 0)));
 	}
 
 void
-gaim_cmd_list(conv)
-	Gaim::Conversation conv
+purple_cmd_list(conv)
+	Purple::Conversation conv
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_cmd_list(conv); l != NULL; l = l->next) {
+	for (l = purple_cmd_list(conv); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(newSVpv(l->data, 0)));
 	}
 
-Gaim::Cmd::Id
-gaim_cmd_register(plugin, command, args, priority, flag, prpl_id, func, helpstr, data = 0)
-	Gaim::Plugin plugin
+Purple::Cmd::Id
+purple_cmd_register(plugin, command, args, priority, flag, prpl_id, func, helpstr, data = 0)
+	Purple::Plugin plugin
 	const gchar *command
 	const gchar *args
-	Gaim::Cmd::Priority priority
-	Gaim::Cmd::Flag flag
+	Purple::Cmd::Priority priority
+	Purple::Cmd::Flag flag
 	const gchar *prpl_id
 	SV *func
 	const gchar *helpstr
 	SV *data
 CODE:
-	RETVAL = gaim_perl_cmd_register(plugin, command, args, priority, flag,
+	RETVAL = purple_perl_cmd_register(plugin, command, args, priority, flag,
 	                                prpl_id, func, helpstr, data);
 OUTPUT:
 	RETVAL
 
 void
-gaim_cmd_unregister(id)
-	Gaim::Cmd::Id id
+purple_cmd_unregister(id)
+	Purple::Cmd::Id id
 CODE:
-	gaim_perl_cmd_unregister(id);
+	purple_perl_cmd_unregister(id);
diff --git a/libpurple/plugins/perl/common/Connection.xs b/libpurple/plugins/perl/common/Connection.xs
index bae0d030dc..6e0f1d2bdc 100644
--- a/libpurple/plugins/perl/common/Connection.xs
+++ b/libpurple/plugins/perl/common/Connection.xs
@@ -1,89 +1,89 @@
 #include "module.h"
 
-MODULE = Gaim::Connection  PACKAGE = Gaim::Connection  PREFIX = gaim_connection_
+MODULE = Purple::Connection  PACKAGE = Purple::Connection  PREFIX = purple_connection_
 PROTOTYPES: ENABLE
 
-Gaim::Account
-gaim_connection_get_account(gc)
-	Gaim::Connection gc
+Purple::Account
+purple_connection_get_account(gc)
+	Purple::Connection gc
 
 const char *
-gaim_connection_get_password(gc)
-	Gaim::Connection gc
+purple_connection_get_password(gc)
+	Purple::Connection gc
 
 const char *
-gaim_connection_get_display_name(gc)
-	Gaim::Connection gc
+purple_connection_get_display_name(gc)
+	Purple::Connection gc
 
 void
-gaim_connection_notice(gc, text)
-	Gaim::Connection gc
+purple_connection_notice(gc, text)
+	Purple::Connection gc
 	const char *text
 
 void
-gaim_connection_error(gc, reason)
-	Gaim::Connection gc
+purple_connection_error(gc, reason)
+	Purple::Connection gc
 	const char *reason
 
 void
-gaim_connection_destroy(gc)
-	Gaim::Connection gc
+purple_connection_destroy(gc)
+	Purple::Connection gc
 
 void
-gaim_connection_set_state(gc, state)
-	Gaim::Connection gc
-	Gaim::ConnectionState state
+purple_connection_set_state(gc, state)
+	Purple::Connection gc
+	Purple::ConnectionState state
 
 void
-gaim_connection_set_account(gc, account)
-	Gaim::Connection gc
-	Gaim::Account account
+purple_connection_set_account(gc, account)
+	Purple::Connection gc
+	Purple::Account account
 
 void
-gaim_connection_set_display_name(gc, name)
-	Gaim::Connection gc
+purple_connection_set_display_name(gc, name)
+	Purple::Connection gc
 	const char *name
 
-Gaim::ConnectionState
-gaim_connection_get_state(gc)
-	Gaim::Connection gc
+Purple::ConnectionState
+purple_connection_get_state(gc)
+	Purple::Connection gc
 
-MODULE = Gaim::Connection  PACKAGE = Gaim::Connections  PREFIX = gaim_connections_
+MODULE = Purple::Connection  PACKAGE = Purple::Connections  PREFIX = purple_connections_
 PROTOTYPES: ENABLE
 
 void
-gaim_connections_disconnect_all()
+purple_connections_disconnect_all()
 
 void
-gaim_connections_get_all()
+purple_connections_get_all()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_connections_get_all(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Connection")));
+	for (l = purple_connections_get_all(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Connection")));
 	}
 
 void
-gaim_connections_get_connecting()
+purple_connections_get_connecting()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_connections_get_connecting(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Connection")));
+	for (l = purple_connections_get_connecting(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Connection")));
 	}
 
 void
-gaim_connections_set_ui_ops(ops)
-	Gaim::Connection::UiOps ops
+purple_connections_set_ui_ops(ops)
+	Purple::Connection::UiOps ops
 
-Gaim::Connection::UiOps
-gaim_connections_get_ui_ops()
+Purple::Connection::UiOps
+purple_connections_get_ui_ops()
 
 void
-gaim_connections_init()
+purple_connections_init()
 
 void
-gaim_connections_uninit()
+purple_connections_uninit()
 
-Gaim::Handle
-gaim_connections_get_handle()
+Purple::Handle
+purple_connections_get_handle()
diff --git a/libpurple/plugins/perl/common/Conversation.xs b/libpurple/plugins/perl/common/Conversation.xs
index 7c2ef3187c..96c5fc6a6b 100644
--- a/libpurple/plugins/perl/common/Conversation.xs
+++ b/libpurple/plugins/perl/common/Conversation.xs
@@ -1,236 +1,236 @@
 #include "module.h"
 
-MODULE = Gaim::Conversation  PACKAGE = Gaim  PREFIX = gaim_
+MODULE = Purple::Conversation  PACKAGE = Purple  PREFIX = purple_
 PROTOTYPES: ENABLE
 
 void
-gaim_get_ims()
+purple_get_ims()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_get_ims(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Conversation")));
+	for (l = purple_get_ims(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Conversation")));
 	}
 
 void
-gaim_get_conversations()
+purple_get_conversations()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_get_conversations(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Conversation")));
+	for (l = purple_get_conversations(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Conversation")));
 	}
 
 void
-gaim_get_chats()
+purple_get_chats()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_get_chats(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Conversation")));
+	for (l = purple_get_chats(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Conversation")));
 	}
 
-MODULE = Gaim::Conversation  PACKAGE = Gaim::Conversations  PREFIX = gaim_conversations_
+MODULE = Purple::Conversation  PACKAGE = Purple::Conversations  PREFIX = purple_conversations_
 PROTOTYPES: ENABLE
 
-Gaim::Handle
-gaim_conversations_get_handle()
+Purple::Handle
+purple_conversations_get_handle()
 
 void
-gaim_conversations_init()
+purple_conversations_init()
 
 void
-gaim_conversations_uninit()
+purple_conversations_uninit()
 
-MODULE = Gaim::Conversation  PACKAGE = Gaim::Conversation  PREFIX = gaim_conversation_
+MODULE = Purple::Conversation  PACKAGE = Purple::Conversation  PREFIX = purple_conversation_
 PROTOTYPES: ENABLE
 
 void
-gaim_conversation_destroy(conv)
-	Gaim::Conversation conv
+purple_conversation_destroy(conv)
+	Purple::Conversation conv
 
-Gaim::ConversationType
-gaim_conversation_get_type(conv)
-	Gaim::Conversation conv
+Purple::ConversationType
+purple_conversation_get_type(conv)
+	Purple::Conversation conv
 
-Gaim::Account
-gaim_conversation_get_account(conv)
-	Gaim::Conversation conv
+Purple::Account
+purple_conversation_get_account(conv)
+	Purple::Conversation conv
 
-Gaim::Connection
-gaim_conversation_get_gc(conv)
-	Gaim::Conversation conv
+Purple::Connection
+purple_conversation_get_gc(conv)
+	Purple::Conversation conv
 
 void
-gaim_conversation_set_title(conv, title);
-	Gaim::Conversation conv
+purple_conversation_set_title(conv, title);
+	Purple::Conversation conv
 	const char * title
 
 const char *
-gaim_conversation_get_title(conv)
-	Gaim::Conversation conv
+purple_conversation_get_title(conv)
+	Purple::Conversation conv
 
 void
-gaim_conversation_autoset_title(conv)
-	Gaim::Conversation conv
+purple_conversation_autoset_title(conv)
+	Purple::Conversation conv
 
 void
-gaim_conversation_set_name(conv, name)
-	Gaim::Conversation conv
+purple_conversation_set_name(conv, name)
+	Purple::Conversation conv
 	const char *name
 
 const char *
-gaim_conversation_get_name(conv)
-	Gaim::Conversation conv
+purple_conversation_get_name(conv)
+	Purple::Conversation conv
 
 void
-gaim_conversation_set_logging(conv, log)
-	Gaim::Conversation conv
+purple_conversation_set_logging(conv, log)
+	Purple::Conversation conv
 	gboolean log
 
 gboolean
-gaim_conversation_is_logging(conv)
-	Gaim::Conversation conv
+purple_conversation_is_logging(conv)
+	Purple::Conversation conv
 
-Gaim::Conversation::IM
-gaim_conversation_get_im_data(conv)
-	Gaim::Conversation conv
+Purple::Conversation::IM
+purple_conversation_get_im_data(conv)
+	Purple::Conversation conv
 
-Gaim::Conversation::Chat
-gaim_conversation_get_chat_data(conv)
-	Gaim::Conversation conv
+Purple::Conversation::Chat
+purple_conversation_get_chat_data(conv)
+	Purple::Conversation conv
 
 gpointer
-gaim_conversation_get_data(conv, key)
-	Gaim::Conversation conv
+purple_conversation_get_data(conv, key)
+	Purple::Conversation conv
 	const char * key
 
-Gaim::ConnectionFlags
-gaim_conversation_get_features(conv)
-	Gaim::Conversation conv
+Purple::ConnectionFlags
+purple_conversation_get_features(conv)
+	Purple::Conversation conv
 
 gboolean
-gaim_conversation_has_focus(conv)
-	Gaim::Conversation conv
+purple_conversation_has_focus(conv)
+	Purple::Conversation conv
 
 void
-gaim_conversation_update(conv, type)
-	Gaim::Conversation conv
-	Gaim::ConvUpdateType type
+purple_conversation_update(conv, type)
+	Purple::Conversation conv
+	Purple::ConvUpdateType type
 
-Gaim::Conversation
-gaim_conversation_new(class, type, account, name)
-	Gaim::ConversationType type
-	Gaim::Account account
+Purple::Conversation
+purple_conversation_new(class, type, account, name)
+	Purple::ConversationType type
+	Purple::Account account
 	const char *name
     C_ARGS:
 	type, account, name
 
 void
-gaim_conversation_set_account(conv, account);
-	Gaim::Conversation conv
-	Gaim::Account account
+purple_conversation_set_account(conv, account);
+	Purple::Conversation conv
+	Purple::Account account
 
-MODULE = Gaim::Conversation  PACKAGE = Gaim::Conversation::IM  PREFIX = gaim_conv_im_
+MODULE = Purple::Conversation  PACKAGE = Purple::Conversation::IM  PREFIX = purple_conv_im_
 PROTOTYPES: ENABLE
 
-Gaim::Conversation
-gaim_conv_im_get_conversation(im)
-	Gaim::Conversation::IM im
+Purple::Conversation
+purple_conv_im_get_conversation(im)
+	Purple::Conversation::IM im
 
 void
-gaim_conv_im_set_icon(im, icon)
-	Gaim::Conversation::IM im
-	Gaim::Buddy::Icon icon
+purple_conv_im_set_icon(im, icon)
+	Purple::Conversation::IM im
+	Purple::Buddy::Icon icon
 
-Gaim::Buddy::Icon
-gaim_conv_im_get_icon(im)
-	Gaim::Conversation::IM im
+Purple::Buddy::Icon
+purple_conv_im_get_icon(im)
+	Purple::Conversation::IM im
 
 void
-gaim_conv_im_set_typing_state(im, state)
-	Gaim::Conversation::IM im
-	Gaim::TypingState state
+purple_conv_im_set_typing_state(im, state)
+	Purple::Conversation::IM im
+	Purple::TypingState state
 
-Gaim::TypingState
-gaim_conv_im_get_typing_state(im)
-	Gaim::Conversation::IM im
+Purple::TypingState
+purple_conv_im_get_typing_state(im)
+	Purple::Conversation::IM im
 
 void
-gaim_conv_im_start_typing_timeout(im, timeout)
-	Gaim::Conversation::IM im
+purple_conv_im_start_typing_timeout(im, timeout)
+	Purple::Conversation::IM im
 	int timeout
 
 void
-gaim_conv_im_stop_typing_timeout(im)
-	Gaim::Conversation::IM im
+purple_conv_im_stop_typing_timeout(im)
+	Purple::Conversation::IM im
 
 guint
-gaim_conv_im_get_typing_timeout(im)
-	Gaim::Conversation::IM im
+purple_conv_im_get_typing_timeout(im)
+	Purple::Conversation::IM im
 
 void
-gaim_conv_im_set_type_again(im, val)
-	Gaim::Conversation::IM im
+purple_conv_im_set_type_again(im, val)
+	Purple::Conversation::IM im
 	time_t val
 
 time_t
-gaim_conv_im_get_type_again(im)
-	Gaim::Conversation::IM im
+purple_conv_im_get_type_again(im)
+	Purple::Conversation::IM im
 
 void
-gaim_conv_im_start_send_typed_timeout(im)
-	Gaim::Conversation::IM im
+purple_conv_im_start_send_typed_timeout(im)
+	Purple::Conversation::IM im
 
 void
-gaim_conv_im_stop_send_typed_timeout(im)
-	Gaim::Conversation::IM im
+purple_conv_im_stop_send_typed_timeout(im)
+	Purple::Conversation::IM im
 
 guint
-gaim_conv_im_get_send_typed_timeout(im)
-	Gaim::Conversation::IM im
+purple_conv_im_get_send_typed_timeout(im)
+	Purple::Conversation::IM im
 
 void
-gaim_conv_im_update_typing(im)
-	Gaim::Conversation::IM im
+purple_conv_im_update_typing(im)
+	Purple::Conversation::IM im
 
 void
-gaim_conv_im_send(im, message)
-	Gaim::Conversation::IM im
+purple_conv_im_send(im, message)
+	Purple::Conversation::IM im
 	const char *message
 
 void
-gaim_conv_im_write(im, who, message, flags, mtime)
-	Gaim::Conversation::IM im
+purple_conv_im_write(im, who, message, flags, mtime)
+	Purple::Conversation::IM im
 	const char *who
 	const char *message
-	Gaim::MessageFlags flags
+	Purple::MessageFlags flags
 	time_t mtime
 
-MODULE = Gaim::Conversation  PACKAGE = Gaim::Conversation  PREFIX = gaim_conv_
+MODULE = Purple::Conversation  PACKAGE = Purple::Conversation  PREFIX = purple_conv_
 PROTOTYPES: ENABLE
 
 gboolean
-gaim_conv_present_error(who, account, what)
+purple_conv_present_error(who, account, what)
 	const char *who
-	Gaim::Account account
+	Purple::Account account
 	const char *what
 
 void
-gaim_conv_custom_smiley_close(conv, smile)
-	Gaim::Conversation conv
+purple_conv_custom_smiley_close(conv, smile)
+	Purple::Conversation conv
 	const char *smile
 
-MODULE = Gaim::Conversation  PACKAGE = Gaim::Conversation::Chat  PREFIX = gaim_conv_chat_
+MODULE = Purple::Conversation  PACKAGE = Purple::Conversation::Chat  PREFIX = purple_conv_chat_
 PROTOTYPES: ENABLE
 
-Gaim::Conversation
-gaim_conv_chat_get_conversation(chat)
-	Gaim::Conversation::Chat chat
+Purple::Conversation
+purple_conv_chat_get_conversation(chat)
+	Purple::Conversation::Chat chat
 
 void
-gaim_conv_chat_set_users(chat, users)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_set_users(chat, users)
+	Purple::Conversation::Chat chat
 	SV * users
 PREINIT:
 	GList *l, *t_GL;
@@ -244,33 +244,33 @@ PPCODE:
 		t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(users), i, 0), t_sl));
 	}
 
-	for (l = gaim_conv_chat_set_users(chat, t_GL); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListEntry")));
+	for (l = purple_conv_chat_set_users(chat, t_GL); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListEntry")));
 	}
 
 void
-gaim_conv_chat_get_users(chat)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_get_users(chat)
+	Purple::Conversation::Chat chat
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_conv_chat_get_users(chat); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListEntry")));
+	for (l = purple_conv_chat_get_users(chat); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListEntry")));
 	}
 
 void
-gaim_conv_chat_ignore(chat, name)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_ignore(chat, name)
+	Purple::Conversation::Chat chat
 	const char *name
 
 void
-gaim_conv_chat_unignore(chat, name)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_unignore(chat, name)
+	Purple::Conversation::Chat chat
 	const char *name
 
 void
-gaim_conv_chat_set_ignored(chat, ignored)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_set_ignored(chat, ignored)
+	Purple::Conversation::Chat chat
 	SV * ignored
 PREINIT:
 	GList *l, *t_GL;
@@ -284,49 +284,49 @@ PPCODE:
 		t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(ignored), i, 0), t_sl));
 	}
 
-	for (l = gaim_conv_chat_set_ignored(chat, t_GL); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListEntry")));
+	for (l = purple_conv_chat_set_ignored(chat, t_GL); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListEntry")));
 	}
 
 void
-gaim_conv_chat_get_ignored(chat)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_get_ignored(chat)
+	Purple::Conversation::Chat chat
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_conv_chat_get_ignored(chat); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListEntry")));
+	for (l = purple_conv_chat_get_ignored(chat); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListEntry")));
 	}
 
 const char *
-gaim_conv_chat_get_topic(chat)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_get_topic(chat)
+	Purple::Conversation::Chat chat
 
 void
-gaim_conv_chat_set_id(chat, id)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_set_id(chat, id)
+	Purple::Conversation::Chat chat
 	int id
 
 int
-gaim_conv_chat_get_id(chat)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_get_id(chat)
+	Purple::Conversation::Chat chat
 
 void
-gaim_conv_chat_send(chat, message)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_send(chat, message)
+	Purple::Conversation::Chat chat
 	const char * message
 
 void
-gaim_conv_chat_write(chat, who, message, flags, mtime)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_write(chat, who, message, flags, mtime)
+	Purple::Conversation::Chat chat
 	const char *who
 	const char *message
-	Gaim::MessageFlags flags
+	Purple::MessageFlags flags
 	time_t mtime
 
 void
-gaim_conv_chat_add_users(chat, users, extra_msgs, flags, new_arrivals)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_add_users(chat, users, extra_msgs, flags, new_arrivals)
+	Purple::Conversation::Chat chat
 	SV * users
 	SV * extra_msgs
 	SV * flags
@@ -359,44 +359,44 @@ PPCODE:
 		t_GL_extra_msgs = g_list_append(t_GL_extra_msgs, SvPV(*av_fetch((AV *)SvRV(extra_msgs), i, 0), t_sl));
 	}
 
-	gaim_conv_chat_add_users(chat, t_GL_users, t_GL_extra_msgs, t_GL_flags, new_arrivals);
+	purple_conv_chat_add_users(chat, t_GL_users, t_GL_extra_msgs, t_GL_flags, new_arrivals);
 
 gboolean
-gaim_conv_chat_find_user(chat, user)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_find_user(chat, user)
+	Purple::Conversation::Chat chat
 	const char * user
 
-void gaim_conv_chat_clear_users(chat)
-	Gaim::Conversation::Chat chat
+void purple_conv_chat_clear_users(chat)
+	Purple::Conversation::Chat chat
 
-void gaim_conv_chat_set_nick(chat, nick)
-	Gaim::Conversation::Chat chat
+void purple_conv_chat_set_nick(chat, nick)
+	Purple::Conversation::Chat chat
 	const char * nick
 
 const char *
-gaim_conv_chat_get_nick(chat)
-	Gaim::Conversation::Chat chat
+purple_conv_chat_get_nick(chat)
+	Purple::Conversation::Chat chat
 
-Gaim::Conversation
-gaim_find_chat(gc, id)
-	Gaim::Connection gc
+Purple::Conversation
+purple_find_chat(gc, id)
+	Purple::Connection gc
 	int id
 
-void gaim_conv_chat_left(chat)
-	Gaim::Conversation::Chat chat
+void purple_conv_chat_left(chat)
+	Purple::Conversation::Chat chat
 
-gboolean gaim_conv_chat_has_left(chat)
-	Gaim::Conversation::Chat chat
+gboolean purple_conv_chat_has_left(chat)
+	Purple::Conversation::Chat chat
 
-Gaim::Conversation::ChatBuddy
-gaim_conv_chat_cb_find(chat, name)
-	Gaim::Conversation::Chat chat
+Purple::Conversation::ChatBuddy
+purple_conv_chat_cb_find(chat, name)
+	Purple::Conversation::Chat chat
 	const char *name
 
 const char *
-gaim_conv_chat_cb_get_name(cb)
-	Gaim::Conversation::ChatBuddy cb
+purple_conv_chat_cb_get_name(cb)
+	Purple::Conversation::ChatBuddy cb
 
 void
-gaim_conv_chat_cb_destroy(cb);
-	Gaim::Conversation::ChatBuddy cb
+purple_conv_chat_cb_destroy(cb);
+	Purple::Conversation::ChatBuddy cb
diff --git a/libpurple/plugins/perl/common/Core.xs b/libpurple/plugins/perl/common/Core.xs
index 15db1632a2..3406499174 100644
--- a/libpurple/plugins/perl/common/Core.xs
+++ b/libpurple/plugins/perl/common/Core.xs
@@ -1,28 +1,28 @@
 #include "module.h"
 
-MODULE = Gaim::Core  PACKAGE = Gaim::Core  PREFIX = gaim_core_
+MODULE = Purple::Core  PACKAGE = Purple::Core  PREFIX = purple_core_
 PROTOTYPES: ENABLE
 
 gboolean 
-gaim_core_quit_cb()
+purple_core_quit_cb()
 PPCODE:
-	/* The argument to gaim_core_quit_cb is not used,
+	/* The argument to purple_core_quit_cb is not used,
 	 * so there's little point in requiring it on the
 	 * Perl side. */
-	RETVAL = gaim_core_quit_cb(NULL);
+	RETVAL = purple_core_quit_cb(NULL);
 	ST(0) = boolSV(RETVAL);
 	sv_2mortal(ST(0));
 
 const char *
-gaim_core_get_version()
+purple_core_get_version()
 
 const char *
-gaim_core_get_ui()
+purple_core_get_ui()
 
 void
-gaim_core_set_ui_ops(ops)
-    Gaim::Core::UiOps ops
+purple_core_set_ui_ops(ops)
+    Purple::Core::UiOps ops
 
-Gaim::Core::UiOps
-gaim_core_get_ui_ops()
+Purple::Core::UiOps
+purple_core_get_ui_ops()
 
diff --git a/libpurple/plugins/perl/common/Debug.xs b/libpurple/plugins/perl/common/Debug.xs
index d73e55f9e3..28465c8f05 100644
--- a/libpurple/plugins/perl/common/Debug.xs
+++ b/libpurple/plugins/perl/common/Debug.xs
@@ -1,54 +1,54 @@
 #include "module.h"
 
-MODULE = Gaim::Debug  PACKAGE = Gaim::Debug  PREFIX = gaim_debug_
+MODULE = Purple::Debug  PACKAGE = Purple::Debug  PREFIX = purple_debug_
 PROTOTYPES: ENABLE
 
 void
-gaim_debug(level, category, string)
-	Gaim::DebugLevel level
+purple_debug(level, category, string)
+	Purple::DebugLevel level
 	const char *category
 	const char *string
 CODE:
-	gaim_debug(level, category, "%s", string);
+	purple_debug(level, category, "%s", string);
 
 void
-gaim_debug_misc(category, string)
+purple_debug_misc(category, string)
 	const char *category
 	const char *string
 CODE:
-	gaim_debug_misc(category, "%s", string);
+	purple_debug_misc(category, "%s", string);
 
 void
-gaim_debug_info(category, string)
+purple_debug_info(category, string)
 	const char *category
 	const char *string
 CODE:
-	gaim_debug_info(category, "%s", string);
+	purple_debug_info(category, "%s", string);
 
 void
-gaim_debug_warning(category, string)
+purple_debug_warning(category, string)
 	const char *category
 	const char *string
 CODE:
-	gaim_debug_warning(category, "%s", string);
+	purple_debug_warning(category, "%s", string);
 
 void
-gaim_debug_error(category, string)
+purple_debug_error(category, string)
 	const char *category
 	const char *string
 CODE:
-	gaim_debug_error(category, "%s", string);
+	purple_debug_error(category, "%s", string);
 
 void
-gaim_debug_fatal(category, string)
+purple_debug_fatal(category, string)
 	const char *category
 	const char *string
 CODE:
-	gaim_debug_fatal(category, "%s", string);
+	purple_debug_fatal(category, "%s", string);
 
 void
-gaim_debug_set_enabled(enabled)
+purple_debug_set_enabled(enabled)
 	gboolean enabled
 
 gboolean
-gaim_debug_is_enabled()
+purple_debug_is_enabled()
diff --git a/libpurple/plugins/perl/common/FT.xs b/libpurple/plugins/perl/common/FT.xs
index c4232fbcc8..c7e6b1ff96 100644
--- a/libpurple/plugins/perl/common/FT.xs
+++ b/libpurple/plugins/perl/common/FT.xs
@@ -1,168 +1,168 @@
 #include "module.h"
 
-MODULE = Gaim::Xfer  PACKAGE = Gaim::Xfer  PREFIX = gaim_xfer_
+MODULE = Purple::Xfer  PACKAGE = Purple::Xfer  PREFIX = purple_xfer_
 PROTOTYPES: ENABLE
 
-Gaim::Xfer
-gaim_xfer_new(class, account, type, who)
-	Gaim::Account account
-	Gaim::XferType type
+Purple::Xfer
+purple_xfer_new(class, account, type, who)
+	Purple::Account account
+	Purple::XferType type
 	const char *who
     C_ARGS:
 	account, type, who
 
 void 
-gaim_xfer_add(xfer)
-	Gaim::Xfer xfer
+purple_xfer_add(xfer)
+	Purple::Xfer xfer
 
 void 
-gaim_xfer_cancel_local(xfer)
-	Gaim::Xfer xfer
+purple_xfer_cancel_local(xfer)
+	Purple::Xfer xfer
 
 void 
-gaim_xfer_cancel_remote(xfer)
-	Gaim::Xfer xfer
+purple_xfer_cancel_remote(xfer)
+	Purple::Xfer xfer
 
 void 
-gaim_xfer_end(xfer)
-	Gaim::Xfer xfer
+purple_xfer_end(xfer)
+	Purple::Xfer xfer
 
 void 
-gaim_xfer_error(type, account, who, msg)
-	Gaim::XferType type
-	Gaim::Account account
+purple_xfer_error(type, account, who, msg)
+	Purple::XferType type
+	Purple::Account account
 	const char *who
 	const char *msg
 
-Gaim::Account
-gaim_xfer_get_account(xfer)
-	Gaim::Xfer xfer
+Purple::Account
+purple_xfer_get_account(xfer)
+	Purple::Xfer xfer
 
 size_t 
-gaim_xfer_get_bytes_remaining(xfer)
-	Gaim::Xfer xfer
+purple_xfer_get_bytes_remaining(xfer)
+	Purple::Xfer xfer
 
 size_t 
-gaim_xfer_get_bytes_sent(xfer)
-	Gaim::Xfer xfer
+purple_xfer_get_bytes_sent(xfer)
+	Purple::Xfer xfer
 
 const char *
-gaim_xfer_get_filename(xfer)
-	Gaim::Xfer xfer
+purple_xfer_get_filename(xfer)
+	Purple::Xfer xfer
 
 const char *
-gaim_xfer_get_local_filename(xfer)
-	Gaim::Xfer xfer
+purple_xfer_get_local_filename(xfer)
+	Purple::Xfer xfer
 
 unsigned int 
-gaim_xfer_get_local_port(xfer)
-	Gaim::Xfer xfer
+purple_xfer_get_local_port(xfer)
+	Purple::Xfer xfer
 
 double 
-gaim_xfer_get_progress(xfer)
-	Gaim::Xfer xfer
+purple_xfer_get_progress(xfer)
+	Purple::Xfer xfer
 
 const char *
-gaim_xfer_get_remote_ip(xfer)
-	Gaim::Xfer xfer
+purple_xfer_get_remote_ip(xfer)
+	Purple::Xfer xfer
 
 unsigned int 
-gaim_xfer_get_remote_port(xfer)
-	Gaim::Xfer xfer
+purple_xfer_get_remote_port(xfer)
+	Purple::Xfer xfer
 
 size_t 
-gaim_xfer_get_size(xfer)
-	Gaim::Xfer xfer
+purple_xfer_get_size(xfer)
+	Purple::Xfer xfer
 
-Gaim::XferStatusType
-gaim_xfer_get_status(xfer)
-	Gaim::Xfer xfer
+Purple::XferStatusType
+purple_xfer_get_status(xfer)
+	Purple::Xfer xfer
 
-Gaim::XferType
-gaim_xfer_get_type(xfer)
-	Gaim::Xfer xfer
+Purple::XferType
+purple_xfer_get_type(xfer)
+	Purple::Xfer xfer
 
-Gaim::XferUiOps
-gaim_xfer_get_ui_ops(xfer)
-	Gaim::Xfer xfer
+Purple::XferUiOps
+purple_xfer_get_ui_ops(xfer)
+	Purple::Xfer xfer
 
 gboolean 
-gaim_xfer_is_canceled(xfer)
-	Gaim::Xfer xfer
+purple_xfer_is_canceled(xfer)
+	Purple::Xfer xfer
 
 gboolean 
-gaim_xfer_is_completed(xfer)
-	Gaim::Xfer xfer
+purple_xfer_is_completed(xfer)
+	Purple::Xfer xfer
 
 ssize_t 
-gaim_xfer_read(xfer, buffer)
-	Gaim::Xfer xfer
+purple_xfer_read(xfer, buffer)
+	Purple::Xfer xfer
 	guchar **buffer
 
 void 
-gaim_xfer_ref(xfer)
-	Gaim::Xfer xfer
+purple_xfer_ref(xfer)
+	Purple::Xfer xfer
 
 void 
-gaim_xfer_request(xfer)
-	Gaim::Xfer xfer
+purple_xfer_request(xfer)
+	Purple::Xfer xfer
 
 void 
-gaim_xfer_request_accepted(xfer, filename)
-	Gaim::Xfer xfer
+purple_xfer_request_accepted(xfer, filename)
+	Purple::Xfer xfer
 	const char *filename
 
 void 
-gaim_xfer_request_denied(xfer)
-	Gaim::Xfer xfer
+purple_xfer_request_denied(xfer)
+	Purple::Xfer xfer
 
 void 
-gaim_xfer_set_completed(xfer, completed)
-	Gaim::Xfer xfer
+purple_xfer_set_completed(xfer, completed)
+	Purple::Xfer xfer
 	gboolean completed
 
 void 
-gaim_xfer_set_filename(xfer, filename)
-	Gaim::Xfer xfer
+purple_xfer_set_filename(xfer, filename)
+	Purple::Xfer xfer
 	const char *filename
 
 void 
-gaim_xfer_set_local_filename(xfer, filename)
-	Gaim::Xfer xfer
+purple_xfer_set_local_filename(xfer, filename)
+	Purple::Xfer xfer
 	const char *filename
 
 void 
-gaim_xfer_set_message(xfer, message)
-	Gaim::Xfer xfer
+purple_xfer_set_message(xfer, message)
+	Purple::Xfer xfer
 	const char *message
 
 void 
-gaim_xfer_set_size(xfer, size)
-	Gaim::Xfer xfer
+purple_xfer_set_size(xfer, size)
+	Purple::Xfer xfer
 	size_t size
 
 void 
-gaim_xfer_unref(xfer)
-	Gaim::Xfer xfer
+purple_xfer_unref(xfer)
+	Purple::Xfer xfer
 
 void 
-gaim_xfer_update_progress(xfer)
-	Gaim::Xfer xfer
+purple_xfer_update_progress(xfer)
+	Purple::Xfer xfer
 
 ssize_t 
-gaim_xfer_write(xfer, buffer, size)
-	Gaim::Xfer xfer
+purple_xfer_write(xfer, buffer, size)
+	Purple::Xfer xfer
 	const guchar *buffer
 	size_t size
 
-MODULE = Gaim::Xfer  PACKAGE = Gaim::Xfers  PREFIX = gaim_xfers_
+MODULE = Purple::Xfer  PACKAGE = Purple::Xfers  PREFIX = purple_xfers_
 PROTOTYPES: ENABLE
 
-Gaim::XferUiOps
-gaim_xfers_get_ui_ops()
+Purple::XferUiOps
+purple_xfers_get_ui_ops()
  
 
 void 
-gaim_xfers_set_ui_ops(ops)
-	Gaim::XferUiOps ops
+purple_xfers_set_ui_ops(ops)
+	Purple::XferUiOps ops
 
diff --git a/libpurple/plugins/perl/common/Gaim.xs b/libpurple/plugins/perl/common/Gaim.xs
deleted file mode 100644
index 49a0f6b9a1..0000000000
--- a/libpurple/plugins/perl/common/Gaim.xs
+++ /dev/null
@@ -1,99 +0,0 @@
-#include "module.h"
-#include "../perl-handlers.h"
-#include "const-c.inc"
-
-/* Prototypes for the BOOT section below. */
-GAIM_PERL_BOOT_PROTO(Account);
-GAIM_PERL_BOOT_PROTO(Account__Option);
-GAIM_PERL_BOOT_PROTO(Buddy__Icon);
-GAIM_PERL_BOOT_PROTO(BuddyList);
-GAIM_PERL_BOOT_PROTO(Cipher);
-GAIM_PERL_BOOT_PROTO(Cmd);
-GAIM_PERL_BOOT_PROTO(Connection);
-GAIM_PERL_BOOT_PROTO(Conversation);
-GAIM_PERL_BOOT_PROTO(Core);
-GAIM_PERL_BOOT_PROTO(Debug);
-GAIM_PERL_BOOT_PROTO(Xfer);
-GAIM_PERL_BOOT_PROTO(ImgStore);
-GAIM_PERL_BOOT_PROTO(Log);
-GAIM_PERL_BOOT_PROTO(Network);
-GAIM_PERL_BOOT_PROTO(Notify);
-GAIM_PERL_BOOT_PROTO(Plugin);
-GAIM_PERL_BOOT_PROTO(PluginPref);
-GAIM_PERL_BOOT_PROTO(Pounce);
-GAIM_PERL_BOOT_PROTO(Prefs);
-GAIM_PERL_BOOT_PROTO(Privacy);
-GAIM_PERL_BOOT_PROTO(Proxy);
-GAIM_PERL_BOOT_PROTO(Prpl);
-GAIM_PERL_BOOT_PROTO(Request);
-GAIM_PERL_BOOT_PROTO(Roomlist);
-GAIM_PERL_BOOT_PROTO(SSL);
-GAIM_PERL_BOOT_PROTO(SavedStatus);
-GAIM_PERL_BOOT_PROTO(Serv);
-GAIM_PERL_BOOT_PROTO(Signal);
-GAIM_PERL_BOOT_PROTO(Sound);
-GAIM_PERL_BOOT_PROTO(Status);
-GAIM_PERL_BOOT_PROTO(Stringref);
-GAIM_PERL_BOOT_PROTO(Util);
-GAIM_PERL_BOOT_PROTO(XMLNode);
-
-MODULE = Gaim  PACKAGE = Gaim  PREFIX = gaim_
-PROTOTYPES: ENABLE
-
-INCLUDE: const-xs.inc
-
-BOOT:
-	GAIM_PERL_BOOT(Account);
-	GAIM_PERL_BOOT(Account__Option);
-	GAIM_PERL_BOOT(Buddy__Icon);
-	GAIM_PERL_BOOT(BuddyList);
-	GAIM_PERL_BOOT(Cipher);
-	GAIM_PERL_BOOT(Cmd);
-	GAIM_PERL_BOOT(Connection);
-	GAIM_PERL_BOOT(Conversation);
-	GAIM_PERL_BOOT(Core);
-	GAIM_PERL_BOOT(Debug);
-	GAIM_PERL_BOOT(Xfer);
-	GAIM_PERL_BOOT(ImgStore);
-	GAIM_PERL_BOOT(Log);
-	GAIM_PERL_BOOT(Network);
-	GAIM_PERL_BOOT(Notify);
-	GAIM_PERL_BOOT(Plugin);
-	GAIM_PERL_BOOT(PluginPref);
-	GAIM_PERL_BOOT(Pounce);
-	GAIM_PERL_BOOT(Prefs);
-	GAIM_PERL_BOOT(Privacy);
-	GAIM_PERL_BOOT(Proxy);
-	GAIM_PERL_BOOT(Prpl);
-	GAIM_PERL_BOOT(Request);
-	GAIM_PERL_BOOT(Roomlist);
-	GAIM_PERL_BOOT(SSL);
-	GAIM_PERL_BOOT(SavedStatus);
-	GAIM_PERL_BOOT(Serv);
-	GAIM_PERL_BOOT(Signal);
-	GAIM_PERL_BOOT(Sound);
-	GAIM_PERL_BOOT(Status);
-	GAIM_PERL_BOOT(Stringref);
-	GAIM_PERL_BOOT(Util);
-	GAIM_PERL_BOOT(XMLNode);
-
-void
-timeout_add(plugin, seconds, callback, data = 0)
-	Gaim::Plugin plugin
-	int seconds
-	SV *callback
-	SV *data
-CODE:
-	gaim_perl_timeout_add(plugin, seconds, callback, data);
-
-void
-deinit()
-CODE:
-	gaim_perl_timeout_clear();
-
-
-MODULE = Gaim  PACKAGE = Gaim  PREFIX = gaim_
-PROTOTYPES: ENABLE
-
-Gaim::Core
-gaim_get_core()
diff --git a/libpurple/plugins/perl/common/ImgStore.xs b/libpurple/plugins/perl/common/ImgStore.xs
index 17fba026a7..7bcdd23f12 100644
--- a/libpurple/plugins/perl/common/ImgStore.xs
+++ b/libpurple/plugins/perl/common/ImgStore.xs
@@ -1,35 +1,35 @@
 #include "module.h"
 
-MODULE = Gaim::ImgStore  PACKAGE = Gaim::ImgStore  PREFIX = gaim_imgstore_
+MODULE = Purple::ImgStore  PACKAGE = Purple::ImgStore  PREFIX = purple_imgstore_
 PROTOTYPES: ENABLE
 
 int 
-gaim_imgstore_add(data, size, filename)
+purple_imgstore_add(data, size, filename)
 	void *data
 	size_t size
 	const char *filename
 
-Gaim::StoredImage
-gaim_imgstore_get(id)
+Purple::StoredImage
+purple_imgstore_get(id)
 	int id
 
 gpointer 
-gaim_imgstore_get_data(i)
-	Gaim::StoredImage i
+purple_imgstore_get_data(i)
+	Purple::StoredImage i
 
 const char *
-gaim_imgstore_get_filename(i)
-	Gaim::StoredImage i
+purple_imgstore_get_filename(i)
+	Purple::StoredImage i
 
 size_t 
-gaim_imgstore_get_size(i)
-	Gaim::StoredImage i
+purple_imgstore_get_size(i)
+	Purple::StoredImage i
 
 void 
-gaim_imgstore_ref(id)
+purple_imgstore_ref(id)
 	int id
 
 void 
-gaim_imgstore_unref(id)
+purple_imgstore_unref(id)
 	int id
 
diff --git a/libpurple/plugins/perl/common/Log.xs b/libpurple/plugins/perl/common/Log.xs
index decc4b085f..ac875eb07e 100644
--- a/libpurple/plugins/perl/common/Log.xs
+++ b/libpurple/plugins/perl/common/Log.xs
@@ -1,94 +1,94 @@
 #include "module.h"
 
-MODULE = Gaim::Log  PACKAGE = Gaim::Log  PREFIX = gaim_log_
+MODULE = Purple::Log  PACKAGE = Purple::Log  PREFIX = purple_log_
 PROTOTYPES: ENABLE
 
 int
-gaim_log_common_sizer(log)
-	Gaim::Log log
+purple_log_common_sizer(log)
+	Purple::Log log
 
 void
-gaim_log_common_writer(log, ext)
-	Gaim::Log log
+purple_log_common_writer(log, ext)
+	Purple::Log log
 	const char *ext
 
 gint
-gaim_log_compare(y, z)
+purple_log_compare(y, z)
 	gconstpointer y
 	gconstpointer z
 
 void
-gaim_log_free(log)
-	Gaim::Log log
+purple_log_free(log)
+	Purple::Log log
 
 gchar_own *
-gaim_log_get_log_dir(type, name, account)
-	Gaim::LogType type
+purple_log_get_log_dir(type, name, account)
+	Purple::LogType type
 	const char *name
-	Gaim::Account account
+	Purple::Account account
 
 void
-gaim_log_get_log_sets()
+purple_log_get_log_sets()
 PREINIT:
 	GHashTable *l;
 PPCODE:
-	l = gaim_log_get_log_sets();
-	XPUSHs(sv_2mortal(gaim_perl_bless_object(l, "GHashTable")));
+	l = purple_log_get_log_sets();
+	XPUSHs(sv_2mortal(purple_perl_bless_object(l, "GHashTable")));
 
 void
-gaim_log_get_logs(type, name, account)
-	Gaim::LogType type
+purple_log_get_logs(type, name, account)
+	Purple::LogType type
 	const char *name
-	Gaim::Account account
+	Purple::Account account
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_log_get_logs(type, name, account); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListEntry")));
+	for (l = purple_log_get_logs(type, name, account); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListEntry")));
 	}
 
 int
-gaim_log_get_size(log)
-	Gaim::Log log
+purple_log_get_size(log)
+	Purple::Log log
 
 void
-gaim_log_get_system_logs(account)
-	Gaim::Account account
+purple_log_get_system_logs(account)
+	Purple::Account account
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_log_get_system_logs(account); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListEntry")));
+	for (l = purple_log_get_system_logs(account); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListEntry")));
 	}
 
 int
-gaim_log_get_total_size(type, name, account)
-	Gaim::LogType type
+purple_log_get_total_size(type, name, account)
+	Purple::LogType type
 	const char *name
-	Gaim::Account account
+	Purple::Account account
 
 void
-gaim_log_init()
+purple_log_init()
 
 void
-gaim_log_logger_free(logger)
-	Gaim::Log::Logger logger
+purple_log_logger_free(logger)
+	Purple::Log::Logger logger
 
 void
-gaim_log_logger_get_options()
+purple_log_logger_get_options()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_log_logger_get_options(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListEntry")));
+	for (l = purple_log_logger_get_options(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListEntry")));
 	}
 
 gchar_own *
-gaim_log_read(log, flags)
-	Gaim::Log log
-	Gaim::Log::ReadFlags flags
+purple_log_read(log, flags)
+	Purple::Log log
+	Purple::Log::ReadFlags flags
 
 gint
-gaim_log_set_compare(y, z)
+purple_log_set_compare(y, z)
 	gconstpointer y
 	gconstpointer z
diff --git a/libpurple/plugins/perl/common/MANIFEST b/libpurple/plugins/perl/common/MANIFEST
index 2ed457d68b..c00b32c4e9 100644
--- a/libpurple/plugins/perl/common/MANIFEST
+++ b/libpurple/plugins/perl/common/MANIFEST
@@ -8,8 +8,8 @@ Connection.xs
 Conversation.xs
 Debug.xs
 FT.xs
-Gaim.pm
-Gaim.xs
+Pidgin.pm
+Pidgin.xs
 ImgStore.xs
 Log.xs
 Makefile.PL
diff --git a/libpurple/plugins/perl/common/Makefile.PL.in b/libpurple/plugins/perl/common/Makefile.PL.in
index 27f161f600..97e0ce37a3 100644
--- a/libpurple/plugins/perl/common/Makefile.PL.in
+++ b/libpurple/plugins/perl/common/Makefile.PL.in
@@ -3,12 +3,12 @@ use ExtUtils::MakeMaker;
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
 # the contents of the Makefile that is written.
 WriteMakefile(
-    'NAME'		=> 'Gaim',
-    'VERSION_FROM'	=> '@srcdir@/Gaim.pm', # finds $VERSION
+    'NAME'		=> 'Purple',
+    'VERSION_FROM'	=> '@srcdir@/Purple.pm', # finds $VERSION
     'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
-      (ABSTRACT_FROM => '@srcdir@/Gaim.pm', # retrieve abstract from module
-       AUTHOR     => 'Gaim <http://gaim.sourceforge.net/>') : ()),
+      (ABSTRACT_FROM => '@srcdir@/Purple.pm', # retrieve abstract from module
+       AUTHOR     => 'Purple <http://pidgin.im/>') : ()),
     'LIBS'		=> [''], # e.g., '-lm'
     'DEFINE'		=> '@DEBUG_CFLAGS@', # e.g., '-DHAVE_SOMETHING'
     'INC'		=> '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple @GLIB_CFLAGS@', # e.g., '-I. -I/usr/include/other'
@@ -16,13 +16,13 @@ WriteMakefile(
 );
 
 if (eval {require ExtUtils::Constant; 1}) {
-	foreach (qw(GAIM_DEBUG_ALL GAIM_DEBUG_MISC GAIM_DEBUG_INFO
-	            GAIM_DEBUG_WARNING GAIM_DEBUG_ERROR GAIM_DEBUG_FATAL)) {
+	foreach (qw(PURPLE_DEBUG_ALL PURPLE_DEBUG_MISC PURPLE_DEBUG_INFO
+	            PURPLE_DEBUG_WARNING PURPLE_DEBUG_ERROR PURPLE_DEBUG_FATAL)) {
 		push @names, {name => $_, type => "IV", macro => 1};
 	}
 
 	ExtUtils::Constant::WriteConstants(
-		NAME    => 'Gaim::DebugLevel',
+		NAME    => 'Purple::DebugLevel',
 		NAMES   => \@names,
 		C_FILE  => 'const-c.inc',
 		XS_FILE => 'const-xs.inc'
diff --git a/libpurple/plugins/perl/common/Makefile.mingw b/libpurple/plugins/perl/common/Makefile.mingw
index ed8224cd70..fbc7a1a622 100644
--- a/libpurple/plugins/perl/common/Makefile.mingw
+++ b/libpurple/plugins/perl/common/Makefile.mingw
@@ -1,14 +1,14 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for Gaim perl module.
+# Description: Makefile for Purple perl module.
 #
 
 GAIM_TOP := ../../../..
 include $(GAIM_TOP)/libpurple/win32/global.mak
 
-TARGET = Gaim
-AUTOSPLIT = lib/auto/Gaim/autosplit.ix
+TARGET = Purple
+AUTOSPLIT = lib/auto/Purple/autosplit.ix
 EXTUTILS ?= C:/perl/lib/ExtUtils
 PERL_PLUGIN_TOP := ..
 
@@ -44,7 +44,7 @@ XS_FILES =		Account.xs \
 				Core.xs \
 				Debug.xs \
 				FT.xs \
-				Gaim.xs \
+				Pidgin.xs \
 				ImgStore.xs \
 				Log.xs \
 				Network.xs \
@@ -91,7 +91,7 @@ include $(GAIM_COMMON_RULES)
 .PHONY: all install clean
 
 all: $(TARGET).dll $(AUTOSPLIT)
-	
+
 install: all
 	rm -rf $(GAIM_INSTALL_PERLMOD_DIR)
 	cp -R lib $(GAIM_INSTALL_PERLMOD_DIR)
@@ -101,8 +101,8 @@ $(C_FILES): $(GAIM_CONFIG_H)
 
 $(AUTOSPLIT):
 	mkdir -p ./lib/auto
-	cp Gaim.pm ./lib
-	$(PERL) -MAutoSplit -e 'autosplit("lib/Gaim.pm")'
+	cp Purple.pm ./lib
+	$(PERL) -MAutoSplit -e 'autosplit("lib/Purple.pm")'
 
 $(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_LIBGAIM_PERL_DLL).a $(FALLBACKS) $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) -o $(TARGET).dll
diff --git a/libpurple/plugins/perl/common/Network.xs b/libpurple/plugins/perl/common/Network.xs
index c4cdc3daa8..e4f6dc9adc 100644
--- a/libpurple/plugins/perl/common/Network.xs
+++ b/libpurple/plugins/perl/common/Network.xs
@@ -1,45 +1,45 @@
 #include "module.h"
 
-MODULE = Gaim::Network  PACKAGE = Gaim::Network  PREFIX = gaim_network_
+MODULE = Purple::Network  PACKAGE = Purple::Network  PREFIX = purple_network_
 PROTOTYPES: ENABLE
 
 const char *
-gaim_network_get_local_system_ip(fd)
+purple_network_get_local_system_ip(fd)
 	int fd
 
 const char *
-gaim_network_get_my_ip(fd)
+purple_network_get_my_ip(fd)
 	int fd
 
 unsigned short
-gaim_network_get_port_from_fd(fd)
+purple_network_get_port_from_fd(fd)
 	int fd
 
 const char *
-gaim_network_get_public_ip()
+purple_network_get_public_ip()
 
 void
-gaim_network_init()
+purple_network_init()
 
 const unsigned char *
-gaim_network_ip_atoi(ip)
+purple_network_ip_atoi(ip)
 	const char *ip
 
-Gaim::NetworkListenData
-gaim_network_listen(port, socket_type, cb, cb_data)
+Purple::NetworkListenData
+purple_network_listen(port, socket_type, cb, cb_data)
 	unsigned short port
 	int socket_type
-	Gaim::NetworkListenCallback cb
+	Purple::NetworkListenCallback cb
 	gpointer cb_data
 
-Gaim::NetworkListenData
-gaim_network_listen_range(start, end, socket_type, cb, cb_data)
+Purple::NetworkListenData
+purple_network_listen_range(start, end, socket_type, cb, cb_data)
 	unsigned short start
 	unsigned short end
 	int socket_type
-	Gaim::NetworkListenCallback cb
+	Purple::NetworkListenCallback cb
 	gpointer cb_data
 
 void
-gaim_network_set_public_ip(ip)
+purple_network_set_public_ip(ip)
 	const char *ip
diff --git a/libpurple/plugins/perl/common/Notify.xs b/libpurple/plugins/perl/common/Notify.xs
index 967ee30e84..25129ee1b7 100644
--- a/libpurple/plugins/perl/common/Notify.xs
+++ b/libpurple/plugins/perl/common/Notify.xs
@@ -1,29 +1,29 @@
 #include "module.h"
 
-MODULE = Gaim::Notify  PACKAGE = Gaim::Notify  PREFIX = gaim_notify_
+MODULE = Purple::Notify  PACKAGE = Purple::Notify  PREFIX = purple_notify_
 PROTOTYPES: ENABLE
 
 void
-gaim_notify_close(type, ui_handle)
-	Gaim::NotifyType type
+purple_notify_close(type, ui_handle)
+	Purple::NotifyType type
 	void * ui_handle
 
 void
-gaim_notify_close_with_handle(handle)
+purple_notify_close_with_handle(handle)
 	void * handle
 
 void *
-gaim_notify_email(handle, subject, from, to, url, cb, user_data)
+purple_notify_email(handle, subject, from, to, url, cb, user_data)
 	void * handle
 	const char *subject
 	const char *from
 	const char *to
 	const char *url
-	Gaim::NotifyCloseCallback cb
+	Purple::NotifyCloseCallback cb
 	gpointer user_data
 
 void *
-gaim_notify_emails(handle, count, detailed, subjects, froms, tos, urls, cb, user_data)
+purple_notify_emails(handle, count, detailed, subjects, froms, tos, urls, cb, user_data)
 	void * handle
 	size_t count
 	gboolean detailed
@@ -31,108 +31,108 @@ gaim_notify_emails(handle, count, detailed, subjects, froms, tos, urls, cb, user
 	const char **froms
 	const char **tos
 	const char **urls
-	Gaim::NotifyCloseCallback cb
+	Purple::NotifyCloseCallback cb
 	gpointer user_data
 
 void *
-gaim_notify_formatted(handle, title, primary, secondary, text, cb, user_data)
+purple_notify_formatted(handle, title, primary, secondary, text, cb, user_data)
 	void * handle
 	const char *title
 	const char *primary
 	const char *secondary
 	const char *text
-	Gaim::NotifyCloseCallback cb
+	Purple::NotifyCloseCallback cb
 	gpointer user_data
 
 void *
-gaim_notify_userinfo(gc, who, user_info, cb, user_data)
-	Gaim::Connection gc
+purple_notify_userinfo(gc, who, user_info, cb, user_data)
+	Purple::Connection gc
 	const char *who
-	Gaim::NotifyUserInfo user_info
-	Gaim::NotifyCloseCallback cb
+	Purple::NotifyUserInfo user_info
+	Purple::NotifyCloseCallback cb
 	gpointer user_data
 
-Gaim::NotifyUserInfo
-gaim_notify_user_info_new()
+Purple::NotifyUserInfo
+purple_notify_user_info_new()
 
 void
-gaim_notify_user_info_destroy(user_info)
-	Gaim::NotifyUserInfo user_info
+purple_notify_user_info_destroy(user_info)
+	Purple::NotifyUserInfo user_info
 
 void
-gaim_notify_user_info_get_entries(user_info)
-	Gaim::NotifyUserInfo user_info
+purple_notify_user_info_get_entries(user_info)
+	Purple::NotifyUserInfo user_info
 PREINIT:
 	const GList *l;
 PPCODE:
-	l = gaim_notify_user_info_get_entries(user_info);
+	l = purple_notify_user_info_get_entries(user_info);
 	for (; l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::NotifyUserInfoEntry")));
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::NotifyUserInfoEntry")));
 	}
 
 gchar_own *
-gaim_notify_user_info_get_text_with_newline(user_info, newline)
-	Gaim::NotifyUserInfo user_info
+purple_notify_user_info_get_text_with_newline(user_info, newline)
+	Purple::NotifyUserInfo user_info
 	const char *newline
 
-void gaim_notify_user_info_add_pair(user_info, label, value)
-	Gaim::NotifyUserInfo user_info
+void purple_notify_user_info_add_pair(user_info, label, value)
+	Purple::NotifyUserInfo user_info
 	const char *label
 	const char *value
 
-void gaim_notify_user_info_prepend_pair(user_info, label, value)
-	Gaim::NotifyUserInfo user_info
+void purple_notify_user_info_prepend_pair(user_info, label, value)
+	Purple::NotifyUserInfo user_info
 	const char *label
 	const char *value
 
-void gaim_notify_user_info_add_section_break(user_info)
-	Gaim::NotifyUserInfo user_info
+void purple_notify_user_info_add_section_break(user_info)
+	Purple::NotifyUserInfo user_info
 
-void gaim_notify_user_info_add_section_header(user_info, label)
-	Gaim::NotifyUserInfo user_info
+void purple_notify_user_info_add_section_header(user_info, label)
+	Purple::NotifyUserInfo user_info
 	const char *label
 
-void gaim_notify_user_info_remove_last_item(user_info)
-	Gaim::NotifyUserInfo user_info
+void purple_notify_user_info_remove_last_item(user_info)
+	Purple::NotifyUserInfo user_info
 
 gchar *
-gaim_notify_user_info_entry_get_label(user_info_entry)
-	Gaim::NotifyUserInfoEntry user_info_entry
+purple_notify_user_info_entry_get_label(user_info_entry)
+	Purple::NotifyUserInfoEntry user_info_entry
 
 gchar *
-gaim_notify_user_info_entry_get_value(user_info_entry)
-	Gaim::NotifyUserInfoEntry user_info_entry
+purple_notify_user_info_entry_get_value(user_info_entry)
+	Purple::NotifyUserInfoEntry user_info_entry
 
-Gaim::NotifyUiOps
-gaim_notify_get_ui_ops()
+Purple::NotifyUiOps
+purple_notify_get_ui_ops()
 
 
 void *
-gaim_notify_message(handle, type, title, primary, secondary, cb, user_data)
+purple_notify_message(handle, type, title, primary, secondary, cb, user_data)
 	void * handle
-	Gaim::NotifyMsgType type
+	Purple::NotifyMsgType type
 	const char *title
 	const char *primary
 	const char *secondary
-	Gaim::NotifyCloseCallback cb
+	Purple::NotifyCloseCallback cb
 	gpointer user_data
 
 void *
-gaim_notify_searchresults(gc, title, primary, secondary, results, cb, user_data)
-	Gaim::Connection gc
+purple_notify_searchresults(gc, title, primary, secondary, results, cb, user_data)
+	Purple::Connection gc
 	const char *title
 	const char *primary
 	const char *secondary
-	Gaim::NotifySearchResults results
-	Gaim::NotifyCloseCallback cb
+	Purple::NotifySearchResults results
+	Purple::NotifyCloseCallback cb
 	gpointer user_data
 
 void
-gaim_notify_set_ui_ops(ops)
-	Gaim::NotifyUiOps ops
+purple_notify_set_ui_ops(ops)
+	Purple::NotifyUiOps ops
 
 void *
-gaim_notify_uri(handle, uri)
+purple_notify_uri(handle, uri)
 	void * handle
 	const char *uri
 
diff --git a/libpurple/plugins/perl/common/Pidgin.xs b/libpurple/plugins/perl/common/Pidgin.xs
new file mode 100644
index 0000000000..abc8d07bf9
--- /dev/null
+++ b/libpurple/plugins/perl/common/Pidgin.xs
@@ -0,0 +1,99 @@
+#include "module.h"
+#include "../perl-handlers.h"
+#include "const-c.inc"
+
+/* Prototypes for the BOOT section below. */
+PURPLE_PERL_BOOT_PROTO(Account);
+PURPLE_PERL_BOOT_PROTO(Account__Option);
+PURPLE_PERL_BOOT_PROTO(Buddy__Icon);
+PURPLE_PERL_BOOT_PROTO(BuddyList);
+PURPLE_PERL_BOOT_PROTO(Cipher);
+PURPLE_PERL_BOOT_PROTO(Cmd);
+PURPLE_PERL_BOOT_PROTO(Connection);
+PURPLE_PERL_BOOT_PROTO(Conversation);
+PURPLE_PERL_BOOT_PROTO(Core);
+PURPLE_PERL_BOOT_PROTO(Debug);
+PURPLE_PERL_BOOT_PROTO(Xfer);
+PURPLE_PERL_BOOT_PROTO(ImgStore);
+PURPLE_PERL_BOOT_PROTO(Log);
+PURPLE_PERL_BOOT_PROTO(Network);
+PURPLE_PERL_BOOT_PROTO(Notify);
+PURPLE_PERL_BOOT_PROTO(Plugin);
+PURPLE_PERL_BOOT_PROTO(PluginPref);
+PURPLE_PERL_BOOT_PROTO(Pounce);
+PURPLE_PERL_BOOT_PROTO(Prefs);
+PURPLE_PERL_BOOT_PROTO(Privacy);
+PURPLE_PERL_BOOT_PROTO(Proxy);
+PURPLE_PERL_BOOT_PROTO(Prpl);
+PURPLE_PERL_BOOT_PROTO(Request);
+PURPLE_PERL_BOOT_PROTO(Roomlist);
+PURPLE_PERL_BOOT_PROTO(SSL);
+PURPLE_PERL_BOOT_PROTO(SavedStatus);
+PURPLE_PERL_BOOT_PROTO(Serv);
+PURPLE_PERL_BOOT_PROTO(Signal);
+PURPLE_PERL_BOOT_PROTO(Sound);
+PURPLE_PERL_BOOT_PROTO(Status);
+PURPLE_PERL_BOOT_PROTO(Stringref);
+PURPLE_PERL_BOOT_PROTO(Util);
+PURPLE_PERL_BOOT_PROTO(XMLNode);
+
+MODULE = Purple PACKAGE = Purple PREFIX = purple_
+PROTOTYPES: ENABLE
+
+INCLUDE: const-xs.inc
+
+BOOT:
+	PURPLE_PERL_BOOT(Account);
+	PURPLE_PERL_BOOT(Account__Option);
+	PURPLE_PERL_BOOT(Buddy__Icon);
+	PURPLE_PERL_BOOT(BuddyList);
+	PURPLE_PERL_BOOT(Cipher);
+	PURPLE_PERL_BOOT(Cmd);
+	PURPLE_PERL_BOOT(Connection);
+	PURPLE_PERL_BOOT(Conversation);
+	PURPLE_PERL_BOOT(Core);
+	PURPLE_PERL_BOOT(Debug);
+	PURPLE_PERL_BOOT(Xfer);
+	PURPLE_PERL_BOOT(ImgStore);
+	PURPLE_PERL_BOOT(Log);
+	PURPLE_PERL_BOOT(Network);
+	PURPLE_PERL_BOOT(Notify);
+	PURPLE_PERL_BOOT(Plugin);
+	PURPLE_PERL_BOOT(PluginPref);
+	PURPLE_PERL_BOOT(Pounce);
+	PURPLE_PERL_BOOT(Prefs);
+	PURPLE_PERL_BOOT(Privacy);
+	PURPLE_PERL_BOOT(Proxy);
+	PURPLE_PERL_BOOT(Prpl);
+	PURPLE_PERL_BOOT(Request);
+	PURPLE_PERL_BOOT(Roomlist);
+	PURPLE_PERL_BOOT(SSL);
+	PURPLE_PERL_BOOT(SavedStatus);
+	PURPLE_PERL_BOOT(Serv);
+	PURPLE_PERL_BOOT(Signal);
+	PURPLE_PERL_BOOT(Sound);
+	PURPLE_PERL_BOOT(Status);
+	PURPLE_PERL_BOOT(Stringref);
+	PURPLE_PERL_BOOT(Util);
+	PURPLE_PERL_BOOT(XMLNode);
+
+void
+timeout_add(plugin, seconds, callback, data = 0)
+	Purple::Plugin plugin
+	int seconds
+	SV *callback
+	SV *data
+CODE:
+	purple_perl_timeout_add(plugin, seconds, callback, data);
+
+void
+deinit()
+CODE:
+	purple_perl_timeout_clear();
+
+
+MODULE = Purple PACKAGE = Purple PREFIX = purple_
+PROTOTYPES: ENABLE
+
+Purple::Core
+purple_get_core()
diff --git a/libpurple/plugins/perl/common/Plugin.xs b/libpurple/plugins/perl/common/Plugin.xs
index 35affa902d..3a82a98975 100644
--- a/libpurple/plugins/perl/common/Plugin.xs
+++ b/libpurple/plugins/perl/common/Plugin.xs
@@ -1,156 +1,156 @@
 #include "module.h"
 
-MODULE = Gaim::Plugin  PACKAGE = Gaim::Plugin  PREFIX = gaim_plugin_
+MODULE = Purple::Plugin  PACKAGE = Purple::Plugin  PREFIX = purple_plugin_
 PROTOTYPES: ENABLE
 
-Gaim::Plugin
-gaim_plugin_new(native, path)
+Purple::Plugin
+purple_plugin_new(native, path)
 	gboolean native
 	const char *path
 
-Gaim::Plugin
-gaim_plugin_probe(filename)
+Purple::Plugin
+purple_plugin_probe(filename)
 	const char *filename
 
 gboolean
-gaim_plugin_register(plugin)
-	Gaim::Plugin plugin
+purple_plugin_register(plugin)
+	Purple::Plugin plugin
 
 gboolean
-gaim_plugin_load(plugin)
-	Gaim::Plugin plugin
+purple_plugin_load(plugin)
+	Purple::Plugin plugin
 
 gboolean
-gaim_plugin_unload(plugin)
-	Gaim::Plugin plugin
+purple_plugin_unload(plugin)
+	Purple::Plugin plugin
 
 gboolean
-gaim_plugin_reload(plugin)
-	Gaim::Plugin plugin
+purple_plugin_reload(plugin)
+	Purple::Plugin plugin
 
 void
-gaim_plugin_destroy(plugin)
-	Gaim::Plugin plugin
+purple_plugin_destroy(plugin)
+	Purple::Plugin plugin
 
 gboolean
-gaim_plugin_is_loaded(plugin)
-	Gaim::Plugin plugin
+purple_plugin_is_loaded(plugin)
+	Purple::Plugin plugin
 
 gboolean
-gaim_plugin_is_unloadable(plugin)
-	Gaim::Plugin plugin
+purple_plugin_is_unloadable(plugin)
+	Purple::Plugin plugin
 
 const gchar *
-gaim_plugin_get_id(plugin)
-	Gaim::Plugin plugin
+purple_plugin_get_id(plugin)
+	Purple::Plugin plugin
 
 const gchar *
-gaim_plugin_get_name(plugin)
-	Gaim::Plugin plugin
+purple_plugin_get_name(plugin)
+	Purple::Plugin plugin
 
 const gchar *
-gaim_plugin_get_version(plugin)
-	Gaim::Plugin plugin
+purple_plugin_get_version(plugin)
+	Purple::Plugin plugin
 
 const gchar *
-gaim_plugin_get_summary(plugin)
-	Gaim::Plugin plugin
+purple_plugin_get_summary(plugin)
+	Purple::Plugin plugin
 
 const gchar *
-gaim_plugin_get_description(plugin)
-	Gaim::Plugin plugin
+purple_plugin_get_description(plugin)
+	Purple::Plugin plugin
 
 const gchar *
-gaim_plugin_get_author(plugin)
-	Gaim::Plugin plugin
+purple_plugin_get_author(plugin)
+	Purple::Plugin plugin
 
 const gchar *
-gaim_plugin_get_homepage(plugin)
-	Gaim::Plugin plugin
+purple_plugin_get_homepage(plugin)
+	Purple::Plugin plugin
 
-MODULE = Gaim::Plugin  PACKAGE = Gaim::Plugin::IPC  PREFIX = gaim_plugin_ipc_
+MODULE = Purple::Plugin  PACKAGE = Purple::Plugin::IPC  PREFIX = purple_plugin_ipc_
 
 void
-gaim_plugin_ipc_unregister(plugin, command)
-	Gaim::Plugin plugin
+purple_plugin_ipc_unregister(plugin, command)
+	Purple::Plugin plugin
 	const char *command
 
 void
-gaim_plugin_ipc_unregister_all(plugin)
-	Gaim::Plugin plugin
+purple_plugin_ipc_unregister_all(plugin)
+	Purple::Plugin plugin
 
-MODULE = Gaim::Plugin  PACKAGE = Gaim::Plugins  PREFIX = gaim_plugins_
+MODULE = Purple::Plugin  PACKAGE = Purple::Plugins  PREFIX = purple_plugins_
 PROTOTYPES: ENABLE
 
 void
-gaim_plugins_add_search_path(path)
+purple_plugins_add_search_path(path)
 	const char *path
 
 void
-gaim_plugins_unload_all()
+purple_plugins_unload_all()
 
 void
-gaim_plugins_destroy_all()
+purple_plugins_destroy_all()
 
 void
-gaim_plugins_load_saved(key)
+purple_plugins_load_saved(key)
 	const char *key
 
 void
-gaim_plugins_probe(ext)
+purple_plugins_probe(ext)
 	const char *ext
 
 gboolean
-gaim_plugins_enabled()
+purple_plugins_enabled()
 
-Gaim::Plugin
-gaim_plugins_find_with_name(name)
+Purple::Plugin
+purple_plugins_find_with_name(name)
 	const char *name
 
-Gaim::Plugin
-gaim_plugins_find_with_filename(filename)
+Purple::Plugin
+purple_plugins_find_with_filename(filename)
 	const char *filename
 
-Gaim::Plugin
-gaim_plugins_find_with_basename(basename)
+Purple::Plugin
+purple_plugins_find_with_basename(basename)
 	const char *basename
 
-Gaim::Plugin
-gaim_plugins_find_with_id(id)
+Purple::Plugin
+purple_plugins_find_with_id(id)
 	const char *id
 
 void
-gaim_plugins_get_loaded()
+purple_plugins_get_loaded()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_plugins_get_loaded(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Plugin")));
+	for (l = purple_plugins_get_loaded(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Plugin")));
 	}
 
 void
-gaim_plugins_get_protocols()
+purple_plugins_get_protocols()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_plugins_get_protocols(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Plugin")));
+	for (l = purple_plugins_get_protocols(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Plugin")));
 	}
 
 void
-gaim_plugins_get_all()
+purple_plugins_get_all()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_plugins_get_all(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Plugin")));
+	for (l = purple_plugins_get_all(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Plugin")));
 	}
 
-Gaim::Handle
-gaim_plugins_get_handle()
+Purple::Handle
+purple_plugins_get_handle()
 
 void
-gaim_plugins_init()
+purple_plugins_init()
 
 void
-gaim_plugins_uninit()
+purple_plugins_uninit()
diff --git a/libpurple/plugins/perl/common/PluginPref.xs b/libpurple/plugins/perl/common/PluginPref.xs
index ac42b4a69d..4b8d0a99be 100644
--- a/libpurple/plugins/perl/common/PluginPref.xs
+++ b/libpurple/plugins/perl/common/PluginPref.xs
@@ -1,144 +1,144 @@
 #include "module.h"
 
-MODULE = Gaim::PluginPref  PACKAGE = Gaim::PluginPref::Frame  PREFIX = gaim_plugin_pref_frame_
+MODULE = Purple::PluginPref  PACKAGE = Purple::PluginPref::Frame  PREFIX = purple_plugin_pref_frame_
 PROTOTYPES: ENABLE
 
 void
-gaim_plugin_pref_frame_add(frame, pref)
-	Gaim::PluginPref::Frame frame
-	Gaim::PluginPref pref
+purple_plugin_pref_frame_add(frame, pref)
+	Purple::PluginPref::Frame frame
+	Purple::PluginPref pref
 
 void
-gaim_plugin_pref_frame_destroy(frame)
-	Gaim::PluginPref::Frame frame
+purple_plugin_pref_frame_destroy(frame)
+	Purple::PluginPref::Frame frame
 
 void
-gaim_plugin_pref_frame_get_prefs(frame)
-	Gaim::PluginPref::Frame frame
+purple_plugin_pref_frame_get_prefs(frame)
+	Purple::PluginPref::Frame frame
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_plugin_pref_frame_get_prefs(frame); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::PluginPref")));
+	for (l = purple_plugin_pref_frame_get_prefs(frame); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::PluginPref")));
 	}
 
-Gaim::PluginPref::Frame
-gaim_plugin_pref_frame_new(class)
+Purple::PluginPref::Frame
+purple_plugin_pref_frame_new(class)
     C_ARGS: /* void */
 
-MODULE = Gaim::PluginPref  PACKAGE = Gaim::PluginPref  PREFIX = gaim_plugin_pref_
+MODULE = Purple::PluginPref  PACKAGE = Purple::PluginPref  PREFIX = purple_plugin_pref_
 PROTOTYPES: ENABLE
 
 void
-gaim_plugin_pref_add_choice(pref, label, choice)
-	Gaim::PluginPref pref
+purple_plugin_pref_add_choice(pref, label, choice)
+	Purple::PluginPref pref
 	const char *label
 # Do the appropriate conversion based on the perl type specified.
 # Currently only Strings and Ints will work.
 	gpointer choice = (SvPOKp($arg) ? SvPV($arg, PL_na) : (SvIOKp($arg) ? GINT_TO_POINTER(SvIV($arg)) : NULL));
 
 void
-gaim_plugin_pref_destroy(pref)
-	Gaim::PluginPref pref
+purple_plugin_pref_destroy(pref)
+	Purple::PluginPref pref
 
 
 void
-gaim_plugin_pref_get_bounds(pref, min, max)
-	Gaim::PluginPref pref
+purple_plugin_pref_get_bounds(pref, min, max)
+	Purple::PluginPref pref
 	int *min
 	int *max
 
 void
-gaim_plugin_pref_get_choices(pref)
-	Gaim::PluginPref pref
+purple_plugin_pref_get_choices(pref)
+	Purple::PluginPref pref
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_plugin_pref_get_choices(pref); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::ListItem")));
+	for (l = purple_plugin_pref_get_choices(pref); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListItem")));
 	}
 
 const char *
-gaim_plugin_pref_get_label(pref)
-	Gaim::PluginPref pref
+purple_plugin_pref_get_label(pref)
+	Purple::PluginPref pref
 
 gboolean
-gaim_plugin_pref_get_masked(pref)
-	Gaim::PluginPref pref
+purple_plugin_pref_get_masked(pref)
+	Purple::PluginPref pref
 
 unsigned int
-gaim_plugin_pref_get_max_length(pref)
-	Gaim::PluginPref pref
+purple_plugin_pref_get_max_length(pref)
+	Purple::PluginPref pref
 
 const char *
-gaim_plugin_pref_get_name(pref)
-	Gaim::PluginPref pref
+purple_plugin_pref_get_name(pref)
+	Purple::PluginPref pref
 
-Gaim::PluginPrefType
-gaim_plugin_pref_get_type(pref)
-	Gaim::PluginPref pref
+Purple::PluginPrefType
+purple_plugin_pref_get_type(pref)
+	Purple::PluginPref pref
 
-Gaim::PluginPref
-gaim_plugin_pref_new(class)
+Purple::PluginPref
+purple_plugin_pref_new(class)
     C_ARGS: /* void */
 
-Gaim::PluginPref
-gaim_plugin_pref_new_with_label(class, label)
+Purple::PluginPref
+purple_plugin_pref_new_with_label(class, label)
 	const char *label
     C_ARGS:
 	label
 
-Gaim::PluginPref
-gaim_plugin_pref_new_with_name(class, name)
+Purple::PluginPref
+purple_plugin_pref_new_with_name(class, name)
 	const char *name
     C_ARGS:
 	name
 
-Gaim::PluginPref
-gaim_plugin_pref_new_with_name_and_label(class, name, label)
+Purple::PluginPref
+purple_plugin_pref_new_with_name_and_label(class, name, label)
 	const char *name
 	const char *label
     C_ARGS:
 	name, label
 
 void
-gaim_plugin_pref_set_bounds(pref, min, max)
-	Gaim::PluginPref pref
+purple_plugin_pref_set_bounds(pref, min, max)
+	Purple::PluginPref pref
 	int min
 	int max
 
 void
-gaim_plugin_pref_set_label(pref, label)
-	Gaim::PluginPref pref
+purple_plugin_pref_set_label(pref, label)
+	Purple::PluginPref pref
 	const char *label
 
 void
-gaim_plugin_pref_set_masked(pref, mask)
-	Gaim::PluginPref pref
+purple_plugin_pref_set_masked(pref, mask)
+	Purple::PluginPref pref
 	gboolean mask
 
 void
-gaim_plugin_pref_set_max_length(pref, max_length)
-	Gaim::PluginPref pref
+purple_plugin_pref_set_max_length(pref, max_length)
+	Purple::PluginPref pref
 	unsigned int max_length
 
 void
-gaim_plugin_pref_set_name(pref, name)
-	Gaim::PluginPref pref
+purple_plugin_pref_set_name(pref, name)
+	Purple::PluginPref pref
 	const char *name
 
 void
-gaim_plugin_pref_set_type(pref, type)
-	Gaim::PluginPref pref
-	Gaim::PluginPrefType type
+purple_plugin_pref_set_type(pref, type)
+	Purple::PluginPref pref
+	Purple::PluginPrefType type
 PREINIT:
-	GaimPluginPrefType gpp_type;
+	PurplePluginPrefType gpp_type;
 CODE:
-	gpp_type = GAIM_PLUGIN_PREF_NONE;
+	gpp_type = PURPLE_PLUGIN_PREF_NONE;
 
 	if (type == 1) {
-		gpp_type = GAIM_PLUGIN_PREF_CHOICE;
+		gpp_type = PURPLE_PLUGIN_PREF_CHOICE;
 	} else if (type == 2) {
-		gpp_type = GAIM_PLUGIN_PREF_INFO;
+		gpp_type = PURPLE_PLUGIN_PREF_INFO;
 	}
-	gaim_plugin_pref_set_type(pref, gpp_type);
+	purple_plugin_pref_set_type(pref, gpp_type);
diff --git a/libpurple/plugins/perl/common/Pounce.xs b/libpurple/plugins/perl/common/Pounce.xs
index d9ab8960ae..18f3358e13 100644
--- a/libpurple/plugins/perl/common/Pounce.xs
+++ b/libpurple/plugins/perl/common/Pounce.xs
@@ -1,90 +1,90 @@
 #include "module.h"
 
-MODULE = Gaim::Pounce  PACKAGE = Gaim::Pounce  PREFIX = gaim_pounce_
+MODULE = Purple::Pounce  PACKAGE = Purple::Pounce  PREFIX = purple_pounce_
 PROTOTYPES: ENABLE
 
 void
-gaim_pounce_action_register(pounce, name)
-	Gaim::Pounce pounce
+purple_pounce_action_register(pounce, name)
+	Purple::Pounce pounce
 	const char *name
 
 void
-gaim_pounce_destroy(pounce)
-	Gaim::Pounce pounce
+purple_pounce_destroy(pounce)
+	Purple::Pounce pounce
 
 void
-gaim_pounce_destroy_all_by_account(account)
-	Gaim::Account account
+purple_pounce_destroy_all_by_account(account)
+	Purple::Account account
 
 void *
-gaim_pounce_get_data(pounce)
-	Gaim::Pounce pounce
+purple_pounce_get_data(pounce)
+	Purple::Pounce pounce
 
-Gaim::PounceEvent
-gaim_pounce_get_events(pounce)
-	Gaim::Pounce pounce
+Purple::PounceEvent
+purple_pounce_get_events(pounce)
+	Purple::Pounce pounce
 
 const char *
-gaim_pounce_get_pouncee(pounce)
-	Gaim::Pounce pounce
+purple_pounce_get_pouncee(pounce)
+	Purple::Pounce pounce
 
-Gaim::Account
-gaim_pounce_get_pouncer(pounce)
-	Gaim::Pounce pounce
+Purple::Account
+purple_pounce_get_pouncer(pounce)
+	Purple::Pounce pounce
 
 gboolean
-gaim_pounce_get_save(pounce)
-	Gaim::Pounce pounce
+purple_pounce_get_save(pounce)
+	Purple::Pounce pounce
 
 void
-gaim_pounce_set_data(pounce, data)
-	Gaim::Pounce pounce
+purple_pounce_set_data(pounce, data)
+	Purple::Pounce pounce
 	void * data
 
 void
-gaim_pounce_set_events(pounce, events)
-	Gaim::Pounce pounce
-	Gaim::PounceEvent events
+purple_pounce_set_events(pounce, events)
+	Purple::Pounce pounce
+	Purple::PounceEvent events
 
 void
-gaim_pounce_set_pouncee(pounce, pouncee)
-	Gaim::Pounce pounce
+purple_pounce_set_pouncee(pounce, pouncee)
+	Purple::Pounce pounce
 	const char *pouncee
 
 void
-gaim_pounce_set_pouncer(pounce, pouncer)
-	Gaim::Pounce pounce
-	Gaim::Account pouncer
+purple_pounce_set_pouncer(pounce, pouncer)
+	Purple::Pounce pounce
+	Purple::Account pouncer
 
 void
-gaim_pounce_set_save(pounce, save)
-	Gaim::Pounce pounce
+purple_pounce_set_save(pounce, save)
+	Purple::Pounce pounce
 	gboolean save
 
-MODULE = Gaim::Pounce  PACKAGE = Gaim::Pounces  PREFIX = gaim_pounces_
+MODULE = Purple::Pounce  PACKAGE = Purple::Pounces  PREFIX = purple_pounces_
 PROTOTYPES: ENABLE
 
 void
-gaim_pounces_get_all()
+purple_pounces_get_all()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_pounces_get_all(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Pounce")));
+	for (l = purple_pounces_get_all(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Pounce")));
 	}
 
-Gaim::Handle
-gaim_pounces_get_handle()
+Purple::Handle
+purple_pounces_get_handle()
 
 void
-gaim_pounces_init()
+purple_pounces_init()
 
 gboolean
-gaim_pounces_load()
+purple_pounces_load()
 
 void
-gaim_pounces_uninit()
+purple_pounces_uninit()
 
 void
-gaim_pounces_unregister_handler(ui)
+purple_pounces_unregister_handler(ui)
 	const char *ui
diff --git a/libpurple/plugins/perl/common/Prefs.xs b/libpurple/plugins/perl/common/Prefs.xs
index 5e169b12f7..dc7360d9bd 100644
--- a/libpurple/plugins/perl/common/Prefs.xs
+++ b/libpurple/plugins/perl/common/Prefs.xs
@@ -1,29 +1,29 @@
 #include "module.h"
 
-MODULE = Gaim::Prefs  PACKAGE = Gaim::Prefs  PREFIX = gaim_prefs_
+MODULE = Purple::Prefs  PACKAGE = Purple::Prefs  PREFIX = purple_prefs_
 PROTOTYPES: ENABLE
 
 void
-gaim_prefs_add_bool(name, value)
+purple_prefs_add_bool(name, value)
 	const char *name
 	gboolean value
 
 void
-gaim_prefs_add_int(name, value)
+purple_prefs_add_int(name, value)
 	const char *name
 	int value
 
 void
-gaim_prefs_add_none(name)
+purple_prefs_add_none(name)
 	const char *name
 
 void
-gaim_prefs_add_string(name, value)
+purple_prefs_add_string(name, value)
 	const char *name
 	const char *value
 
 void
-gaim_prefs_add_string_list(name, value)
+purple_prefs_add_string_list(name, value)
 	const char *name
 	SV *value
 PREINIT:
@@ -37,94 +37,94 @@ PPCODE:
 		STRLEN t_sl;
 		t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(value), i, 0), t_sl));
 	}
-	gaim_prefs_add_string_list(name, t_GL);
+	purple_prefs_add_string_list(name, t_GL);
 
 void
-gaim_prefs_destroy()
+purple_prefs_destroy()
 
 void
-gaim_prefs_disconnect_by_handle(handle)
+purple_prefs_disconnect_by_handle(handle)
 	void * handle
 
 void
-gaim_prefs_disconnect_callback(callback_id)
+purple_prefs_disconnect_callback(callback_id)
 	guint callback_id
 
 gboolean
-gaim_prefs_exists(name)
+purple_prefs_exists(name)
 	const char *name
 
 gboolean
-gaim_prefs_get_bool(name)
+purple_prefs_get_bool(name)
 	const char *name
 
-Gaim::Handle
-gaim_prefs_get_handle()
+Purple::Handle
+purple_prefs_get_handle()
 
 int
-gaim_prefs_get_int(name)
+purple_prefs_get_int(name)
 	const char *name
 
 const char *
-gaim_prefs_get_string(name)
+purple_prefs_get_string(name)
 	const char *name
 
 void
-gaim_prefs_get_string_list(name)
+purple_prefs_get_string_list(name)
 	const char *name
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_prefs_get_string_list(name); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::PrefValue")));
+	for (l = purple_prefs_get_string_list(name); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::PrefValue")));
 	}
 
-Gaim::PrefType
-gaim_prefs_get_type(name)
+Purple::PrefType
+purple_prefs_get_type(name)
 	const char *name
 
 void
-gaim_prefs_init()
+purple_prefs_init()
 
 gboolean
-gaim_prefs_load()
+purple_prefs_load()
 
 void
-gaim_prefs_remove(name)
+purple_prefs_remove(name)
 	const char *name
 
 void
-gaim_prefs_rename(oldname, newname)
+purple_prefs_rename(oldname, newname)
 	const char *oldname
 	const char *newname
 
 void
-gaim_prefs_rename_boolean_toggle(oldname, newname)
+purple_prefs_rename_boolean_toggle(oldname, newname)
 	const char *oldname
 	const char *newname
 
 void
-gaim_prefs_set_bool(name, value)
+purple_prefs_set_bool(name, value)
 	const char *name
 	gboolean value
 
 void
-gaim_prefs_set_generic(name, value)
+purple_prefs_set_generic(name, value)
 	const char *name
 	gpointer value
 
 void
-gaim_prefs_set_int(name, value)
+purple_prefs_set_int(name, value)
 	const char *name
 	int value
 
 void
-gaim_prefs_set_string(name, value)
+purple_prefs_set_string(name, value)
 	const char *name
 	const char *value
 
 void
-gaim_prefs_set_string_list(name, value)
+purple_prefs_set_string_list(name, value)
 	const char *name
 	SV *value
 PREINIT:
@@ -138,14 +138,14 @@ PPCODE:
 		STRLEN t_sl;
 		t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(value), i, 0), t_sl));
 	}
-	gaim_prefs_set_string_list(name, t_GL);
+	purple_prefs_set_string_list(name, t_GL);
 
 void
-gaim_prefs_trigger_callback(name)
+purple_prefs_trigger_callback(name)
 	const char *name
 
 void
-gaim_prefs_uninit()
+purple_prefs_uninit()
 
 void
-gaim_prefs_update_old()
+purple_prefs_update_old()
diff --git a/libpurple/plugins/perl/common/Privacy.xs b/libpurple/plugins/perl/common/Privacy.xs
index 601fe08d4a..58ab5b07a9 100644
--- a/libpurple/plugins/perl/common/Privacy.xs
+++ b/libpurple/plugins/perl/common/Privacy.xs
@@ -1,43 +1,43 @@
 #include "module.h"
 
-MODULE = Gaim::Privacy  PACKAGE = Gaim::Privacy  PREFIX = gaim_privacy_
+MODULE = Purple::Privacy  PACKAGE = Purple::Privacy  PREFIX = purple_privacy_
 PROTOTYPES: ENABLE
 
-Gaim::Privacy::UiOps
-gaim_privacy_get_ui_ops()
+Purple::Privacy::UiOps
+purple_privacy_get_ui_ops()
 
 void
-gaim_privacy_init()
+purple_privacy_init()
 
 void
-gaim_privacy_set_ui_ops(ops)
-	Gaim::Privacy::UiOps ops
+purple_privacy_set_ui_ops(ops)
+	Purple::Privacy::UiOps ops
 
 gboolean
-gaim_privacy_permit_add(account, name, local_only)
-	Gaim::Account account
+purple_privacy_permit_add(account, name, local_only)
+	Purple::Account account
 	const char * name
 	gboolean local_only
 
 gboolean
-gaim_privacy_permit_remove(account, name, local_only)
-	Gaim::Account account
+purple_privacy_permit_remove(account, name, local_only)
+	Purple::Account account
 	const char * name
 	gboolean local_only
 
 gboolean
-gaim_privacy_deny_add(account, name, local_only)
-	Gaim::Account account
+purple_privacy_deny_add(account, name, local_only)
+	Purple::Account account
 	const char * name
 	gboolean local_only
 
 gboolean
-gaim_privacy_deny_remove(account, name, local_only)
-	Gaim::Account account
+purple_privacy_deny_remove(account, name, local_only)
+	Purple::Account account
 	const char * name
 	gboolean local_only
 
 gboolean
-gaim_privacy_check(account, who)
-	Gaim::Account account
+purple_privacy_check(account, who)
+	Purple::Account account
 	const char * who
diff --git a/libpurple/plugins/perl/common/Proxy.xs b/libpurple/plugins/perl/common/Proxy.xs
index f21e737431..cb5184cc02 100644
--- a/libpurple/plugins/perl/common/Proxy.xs
+++ b/libpurple/plugins/perl/common/Proxy.xs
@@ -1,65 +1,65 @@
 #include "module.h"
 
-MODULE = Gaim::Proxy  PACKAGE = Gaim::Proxy  PREFIX = gaim_proxy_
+MODULE = Purple::Proxy  PACKAGE = Purple::Proxy  PREFIX = purple_proxy_
 PROTOTYPES: ENABLE
 
-Gaim::ProxyInfo
-gaim_global_proxy_get_info()
+Purple::ProxyInfo
+purple_global_proxy_get_info()
 
-Gaim::Handle
-gaim_proxy_get_handle()
+Purple::Handle
+purple_proxy_get_handle()
 
 void
-gaim_proxy_info_destroy(info)
-	Gaim::ProxyInfo info
+purple_proxy_info_destroy(info)
+	Purple::ProxyInfo info
 
 const char *
-gaim_proxy_info_get_host(info)
-	Gaim::ProxyInfo info
+purple_proxy_info_get_host(info)
+	Purple::ProxyInfo info
 
 const char *
-gaim_proxy_info_get_password(info)
-	Gaim::ProxyInfo info
+purple_proxy_info_get_password(info)
+	Purple::ProxyInfo info
 
 int
-gaim_proxy_info_get_port(info)
-	Gaim::ProxyInfo info
+purple_proxy_info_get_port(info)
+	Purple::ProxyInfo info
 
-Gaim::ProxyType
-gaim_proxy_info_get_type(info)
-	Gaim::ProxyInfo info
+Purple::ProxyType
+purple_proxy_info_get_type(info)
+	Purple::ProxyInfo info
 
 const char *
-gaim_proxy_info_get_username(info)
-	Gaim::ProxyInfo info
+purple_proxy_info_get_username(info)
+	Purple::ProxyInfo info
 
-Gaim::ProxyInfo
-gaim_proxy_info_new()
+Purple::ProxyInfo
+purple_proxy_info_new()
 
 void
-gaim_proxy_info_set_host(info, host)
-	Gaim::ProxyInfo info
+purple_proxy_info_set_host(info, host)
+	Purple::ProxyInfo info
 	const char *host
 
 void
-gaim_proxy_info_set_password(info, password)
-	Gaim::ProxyInfo info
+purple_proxy_info_set_password(info, password)
+	Purple::ProxyInfo info
 	const char *password
 
 void
-gaim_proxy_info_set_port(info, port)
-	Gaim::ProxyInfo info
+purple_proxy_info_set_port(info, port)
+	Purple::ProxyInfo info
 	int port
 
 void
-gaim_proxy_info_set_type(info, type)
-	Gaim::ProxyInfo info
-	Gaim::ProxyType type
+purple_proxy_info_set_type(info, type)
+	Purple::ProxyInfo info
+	Purple::ProxyType type
 
 void
-gaim_proxy_info_set_username(info, username)
-	Gaim::ProxyInfo info
+purple_proxy_info_set_username(info, username)
+	Purple::ProxyInfo info
 	const char *username
 
 void
-gaim_proxy_init()
+purple_proxy_init()
diff --git a/libpurple/plugins/perl/common/Prpl.xs b/libpurple/plugins/perl/common/Prpl.xs
index 757d4161cb..b3e9c74e52 100644
--- a/libpurple/plugins/perl/common/Prpl.xs
+++ b/libpurple/plugins/perl/common/Prpl.xs
@@ -1,54 +1,54 @@
 #include "module.h"
 
-MODULE = Gaim::Prpl  PACKAGE = Gaim::Find  PREFIX = gaim_find_
+MODULE = Purple::Prpl  PACKAGE = Purple::Find  PREFIX = purple_find_
 PROTOTYPES: ENABLE
 
-Gaim::Plugin
-gaim_find_prpl(id)
+Purple::Plugin
+purple_find_prpl(id)
 	const char *id
 
-MODULE = Gaim::Prpl  PACKAGE = Gaim::Prpl  PREFIX = gaim_prpl_
+MODULE = Purple::Prpl  PACKAGE = Purple::Prpl  PREFIX = purple_prpl_
 PROTOTYPES: ENABLE
 
 void
-gaim_prpl_change_account_status(account, old_status, new_status)
-	Gaim::Account account
-	Gaim::Status old_status
-	Gaim::Status new_status
+purple_prpl_change_account_status(account, old_status, new_status)
+	Purple::Account account
+	Purple::Status old_status
+	Purple::Status new_status
 
 void
-gaim_prpl_get_statuses(account, presence)
-	Gaim::Account account
-	Gaim::Presence presence
+purple_prpl_get_statuses(account, presence)
+	Purple::Account account
+	Purple::Presence presence
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_prpl_get_statuses(account,presence); l != NULL; l = l->next) {
+	for (l = purple_prpl_get_statuses(account,presence); l != NULL; l = l->next) {
 		/* XXX Someone please test and make sure this is the right
 		 * type for these things. */
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Status")));
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Status")));
 	}
 
 void
-gaim_prpl_got_account_idle(account, idle, idle_time)
-	Gaim::Account account
+purple_prpl_got_account_idle(account, idle, idle_time)
+	Purple::Account account
 	gboolean idle
 	time_t idle_time
 
 void
-gaim_prpl_got_account_login_time(account, login_time)
-	Gaim::Account account
+purple_prpl_got_account_login_time(account, login_time)
+	Purple::Account account
 	time_t login_time
 
 void
-gaim_prpl_got_user_idle(account, name, idle, idle_time)
-	Gaim::Account account
+purple_prpl_got_user_idle(account, name, idle, idle_time)
+	Purple::Account account
 	const char *name
 	gboolean idle
 	time_t idle_time
 
 void
-gaim_prpl_got_user_login_time(account, name, login_time)
-	Gaim::Account account
+purple_prpl_got_user_login_time(account, name, login_time)
+	Purple::Account account
 	const char *name
 	time_t login_time
diff --git a/libpurple/plugins/perl/common/Gaim.pm b/libpurple/plugins/perl/common/Purple.pm
index c2ca5b85fa..b0d27e5075 100644
--- a/libpurple/plugins/perl/common/Gaim.pm
+++ b/libpurple/plugins/perl/common/Purple.pm
@@ -1,4 +1,4 @@
-package Gaim;
+package Purple;
 
 use 5.008;
 use strict;
@@ -14,7 +14,7 @@ our @ISA = qw(Exporter);
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
 
-# This allows declaration	use Gaim ':all';
+# This allows declaration	use Purple ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = ( 'all' => [ qw(
@@ -36,7 +36,7 @@ sub AUTOLOAD {
 	my $constname;
 	our $AUTOLOAD;
 	($constname = $AUTOLOAD) =~ s/.*:://;
-	croak "&Gaim::constant not defined" if $constname eq 'constant';
+	croak "&Purple::constant not defined" if $constname eq 'constant';
 	my ($error, $val) = constant($constname);
 	if ($error) { croak $error; }
 	{
@@ -49,7 +49,7 @@ sub AUTOLOAD {
 }
 
 require XSLoader;
-XSLoader::load('Gaim', $VERSION);
+XSLoader::load('Purple', $VERSION);
 
 # Preloaded methods go here.
 
@@ -58,53 +58,53 @@ __END__
 
 =head1 NAME
 
-Gaim - Perl extension the Gaim instant messenger.
+libpurple - Perl extension to the libpurple instant messenger library.
 
 =head1 SYNOPSIS
 
-  use Gaim;
+  use Purple;
 
 =head1 ABSTRACT
 
   This module provides the interface for using perl scripts as plugins
-  in Gaim.
+  in libpurple.
 
 =head1 DESCRIPTION
 
 This module provides the interface for using perl scripts as plugins
-in Gaim. With this, developers can write perl scripts that can be
-loaded in Gaim as plugins. The scripts can interact with IMs, chats,
-accounts, the buddy list, gaim signals, and more.
+in Purple. With this, developers can write perl scripts that can be
+loaded in Purple as plugins. The scripts can interact with IMs, chats,
+accounts, the buddy list, libpurple signals, and more.
 
-The API for the perl interface is very similar to that of the Gaim C
-API, which can be viewed at http://gaim.sourceforge.net/api/ or in
-the header files in the Gaim source tree.
+The API for the perl interface is very similar to that of the Purple C
+API, which can be viewed at http://developer.pidgin.im/doxygen/ or in
+the header files in the Purple source tree.
 
 =head1 FUNCTIONS
 
 =over
 
-=item @accounts = Gaim::accounts
+=item @accounts = Purple::accounts
 
 Returns a list of all accounts, online or offline.
 
-=item @chats = Gaim::chats
+=item @chats = Purple::chats
 
 Returns a list of all chats currently open.
 
-=item @connections = Gaim::connections
+=item @connections = Purple::connections
 
 Returns a list of all active connections.
 
-=item @conversations = Gaim::conversations
+=item @conversations = Purple::conversations
 
 Returns a list of all conversations, both IM and chat, currently open.
 
-=item @conv_windows = Gaim::conv_windows
+=item @conv_windows = Purple::conv_windows
 
 Returns a list of all conversation windows currently open.
 
-=item @ims = Gaim::ims
+=item @ims = Purple::ims
 
 Returns a list of all instant messages currently open.
 
@@ -112,9 +112,9 @@ Returns a list of all instant messages currently open.
 
 =head1 SEE ALSO
 
-Gaim C API documentation - http//gaim.sourceforge.net/api/
+Purple C API documentation - http://developer.pidgin.im/doxygen/
 
-Gaim website - http://gaim.sourceforge.net/
+Purple website - http://pidgin.im/
 
 =head1 AUTHOR
 
diff --git a/libpurple/plugins/perl/common/Request.xs b/libpurple/plugins/perl/common/Request.xs
index ba5369a8b4..82ecc7fab1 100644
--- a/libpurple/plugins/perl/common/Request.xs
+++ b/libpurple/plugins/perl/common/Request.xs
@@ -2,7 +2,7 @@
 
 /* This breaks on faceprint's amd64 box
 void *
-gaim_request_action_varg(handle, title, primary, secondary, default_action, user_data, action_count, actions)
+purple_request_action_varg(handle, title, primary, secondary, default_action, user_data, action_count, actions)
 	void * handle
 	const char *title
 	const char *primary
@@ -17,27 +17,27 @@ gaim_request_action_varg(handle, title, primary, secondary, default_action, user
 typedef struct {
 	char *cancel_cb;
 	char *ok_cb;
-} GaimPerlRequestData;
+} PurplePerlRequestData;
 
 /********************************************************/
 /*                                                      */
 /* Callback function that calls a perl subroutine       */
 /*                                                      */
 /* The void * field data is being used as a way to hide */
-/* the perl sub's name in a GaimPerlRequestData         */
+/* the perl sub's name in a PurplePerlRequestData         */
 /*                                                      */
 /********************************************************/
 static void
-gaim_perl_request_ok_cb(void * data, GaimRequestFields *fields)
+purple_perl_request_ok_cb(void * data, PurpleRequestFields *fields)
 {
-	GaimPerlRequestData *gpr = (GaimPerlRequestData *)data;
+	PurplePerlRequestData *gpr = (PurplePerlRequestData *)data;
 
 	dSP;
 	ENTER;
 	SAVETMPS;
 	PUSHMARK(sp);
 
-	XPUSHs(gaim_perl_bless_object(fields, "Gaim::Request::Fields"));
+	XPUSHs(purple_perl_bless_object(fields, "Purple::Request::Fields"));
 	PUTBACK;
 
 	call_pv(gpr->ok_cb, G_EVAL | G_SCALAR);
@@ -53,17 +53,17 @@ gaim_perl_request_ok_cb(void * data, GaimRequestFields *fields)
 }
 
 static void
-gaim_perl_request_cancel_cb(void * data, GaimRequestFields *fields)
+purple_perl_request_cancel_cb(void * data, PurpleRequestFields *fields)
 {
 
-	GaimPerlRequestData *gpr = (GaimPerlRequestData *)data;
+	PurplePerlRequestData *gpr = (PurplePerlRequestData *)data;
 
 	dSP;
 	ENTER;
 	SAVETMPS;
 	PUSHMARK(sp);
 
-	XPUSHs(gaim_perl_bless_object(fields, "Gaim::Request::Fields"));
+	XPUSHs(purple_perl_bless_object(fields, "Purple::Request::Fields"));
 	PUTBACK;
 	call_pv(gpr->cancel_cb, G_EVAL | G_SCALAR);
 	SPAGAIN;
@@ -77,12 +77,12 @@ gaim_perl_request_cancel_cb(void * data, GaimRequestFields *fields)
 	g_free(gpr);
 }
 
-MODULE = Gaim::Request  PACKAGE = Gaim::Request  PREFIX = gaim_request_
+MODULE = Purple::Request  PACKAGE = Purple::Request  PREFIX = purple_request_
 PROTOTYPES: ENABLE
 
 void *
-gaim_request_input(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, ok_cb, cancel_text, cancel_cb)
-	Gaim::Plugin handle
+purple_request_input(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, ok_cb, cancel_text, cancel_cb)
+	Purple::Plugin handle
 	const char * title
 	const char * primary
 	const char * secondary
@@ -95,489 +95,489 @@ gaim_request_input(handle, title, primary, secondary, default_value, multiline,
 	const char * cancel_text
 	SV * cancel_cb
 CODE:
-	GaimPerlRequestData *gpr;
+	PurplePerlRequestData *gpr;
 	STRLEN len;
 	char *basename;
 
 	basename = g_path_get_basename(handle->path);
-	gaim_perl_normalize_script_name(basename);
-	gpr = g_new(GaimPerlRequestData, 1);
-	gpr->ok_cb = g_strdup_printf("Gaim::Script::%s::%s", basename, SvPV(ok_cb, len));
-	gpr->cancel_cb = g_strdup_printf("Gaim::Script::%s::%s", basename, SvPV(cancel_cb, len));
+	purple_perl_normalize_script_name(basename);
+	gpr = g_new(PurplePerlRequestData, 1);
+	gpr->ok_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(ok_cb, len));
+	gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len));
 	g_free(basename);
 
-	RETVAL = gaim_request_input(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, G_CALLBACK(gaim_perl_request_ok_cb), cancel_text, G_CALLBACK(gaim_perl_request_cancel_cb), gpr);
+	RETVAL = purple_request_input(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), gpr);
 OUTPUT:
 	RETVAL
 
 void *
-gaim_request_file(handle, title, filename, savedialog, ok_cb, cancel_cb)
-	Gaim::Plugin handle
+purple_request_file(handle, title, filename, savedialog, ok_cb, cancel_cb)
+	Purple::Plugin handle
 	const char * title
 	const char * filename
 	gboolean savedialog
 	SV * ok_cb
 	SV * cancel_cb
 CODE:
-	GaimPerlRequestData *gpr;
+	PurplePerlRequestData *gpr;
 	STRLEN len;
 	char *basename;
 
 	basename = g_path_get_basename(handle->path);
-	gaim_perl_normalize_script_name(basename);
-	gpr = g_new(GaimPerlRequestData, 1);
-	gpr->ok_cb = g_strdup_printf("Gaim::Script::%s::%s", basename, SvPV(ok_cb, len));
-	gpr->cancel_cb = g_strdup_printf("Gaim::Script::%s::%s", basename, SvPV(cancel_cb, len));
+	purple_perl_normalize_script_name(basename);
+	gpr = g_new(PurplePerlRequestData, 1);
+	gpr->ok_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(ok_cb, len));
+	gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len));
 	g_free(basename);
 
-	RETVAL = gaim_request_file(handle, title, filename, savedialog, G_CALLBACK(gaim_perl_request_ok_cb), G_CALLBACK(gaim_perl_request_cancel_cb), gpr);
+	RETVAL = purple_request_file(handle, title, filename, savedialog, G_CALLBACK(purple_perl_request_ok_cb), G_CALLBACK(purple_perl_request_cancel_cb), gpr);
 OUTPUT:
 	RETVAL
 
 void *
-gaim_request_fields(handle, title, primary, secondary, fields, ok_text, ok_cb, cancel_text, cancel_cb)
-	Gaim::Plugin handle
+purple_request_fields(handle, title, primary, secondary, fields, ok_text, ok_cb, cancel_text, cancel_cb)
+	Purple::Plugin handle
 	const char * title
 	const char * primary
 	const char * secondary
-	Gaim::Request::Fields fields
+	Purple::Request::Fields fields
 	const char * ok_text
 	SV * ok_cb
 	const char * cancel_text
 	SV * cancel_cb
 CODE:
-	GaimPerlRequestData *gpr;
+	PurplePerlRequestData *gpr;
 	STRLEN len;
 	char *basename;
 
 	basename = g_path_get_basename(handle->path);
-	gaim_perl_normalize_script_name(basename);
-	gpr = g_new(GaimPerlRequestData, 1);
-	gpr->ok_cb = g_strdup_printf("Gaim::Script::%s::%s", basename, SvPV(ok_cb, len));
-	gpr->cancel_cb = g_strdup_printf("Gaim::Script::%s::%s", basename, SvPV(cancel_cb, len));
+	purple_perl_normalize_script_name(basename);
+	gpr = g_new(PurplePerlRequestData, 1);
+	gpr->ok_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(ok_cb, len));
+	gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len));
 	g_free(basename);
 
-	RETVAL = gaim_request_fields(handle, title, primary, secondary, fields, ok_text, G_CALLBACK(gaim_perl_request_ok_cb), cancel_text, G_CALLBACK(gaim_perl_request_cancel_cb), gpr);
+	RETVAL = purple_request_fields(handle, title, primary, secondary, fields, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), gpr);
 OUTPUT:
 	RETVAL
 
 void
-gaim_request_close(type, uihandle)
-	Gaim::RequestType type
+purple_request_close(type, uihandle)
+	Purple::RequestType type
 	void * uihandle
 
 void
-gaim_request_close_with_handle(handle)
+purple_request_close_with_handle(handle)
 	void * handle
 
-MODULE = Gaim::Request  PACKAGE = Gaim::Request::Field  PREFIX = gaim_request_field_
+MODULE = Purple::Request  PACKAGE = Purple::Request::Field  PREFIX = purple_request_field_
 PROTOTYPES: ENABLE
 
-Gaim::Account
-gaim_request_field_account_get_default_value(field)
-	Gaim::Request::Field field
+Purple::Account
+purple_request_field_account_get_default_value(field)
+	Purple::Request::Field field
 
 IV
-gaim_request_field_account_get_filter(field)
-	Gaim::Request::Field field
+purple_request_field_account_get_filter(field)
+	Purple::Request::Field field
 CODE:
-	RETVAL = PTR2IV(gaim_request_field_account_get_filter(field));
+	RETVAL = PTR2IV(purple_request_field_account_get_filter(field));
 OUTPUT:
 	RETVAL
 
 gboolean
-gaim_request_field_account_get_show_all(field)
-	Gaim::Request::Field field
+purple_request_field_account_get_show_all(field)
+	Purple::Request::Field field
 
-Gaim::Account
-gaim_request_field_account_get_value(field)
-	Gaim::Request::Field field
+Purple::Account
+purple_request_field_account_get_value(field)
+	Purple::Request::Field field
 
-Gaim::Request::Field
-gaim_request_field_account_new(id, text, account = NULL)
+Purple::Request::Field
+purple_request_field_account_new(id, text, account = NULL)
 	const char *id
 	const char *text
-	Gaim::Account account
+	Purple::Account account
 
 void
-gaim_request_field_account_set_default_value(field, default_value)
-	Gaim::Request::Field field
-	Gaim::Account default_value
+purple_request_field_account_set_default_value(field, default_value)
+	Purple::Request::Field field
+	Purple::Account default_value
 
 void
-gaim_request_field_account_set_show_all(field, show_all)
-	Gaim::Request::Field field
+purple_request_field_account_set_show_all(field, show_all)
+	Purple::Request::Field field
 	gboolean show_all
 
 void
-gaim_request_field_account_set_value(field, value)
-	Gaim::Request::Field field
-	Gaim::Account value
+purple_request_field_account_set_value(field, value)
+	Purple::Request::Field field
+	Purple::Account value
 
 gboolean
-gaim_request_field_bool_get_default_value(field)
-	Gaim::Request::Field field
+purple_request_field_bool_get_default_value(field)
+	Purple::Request::Field field
 
 gboolean
-gaim_request_field_bool_get_value(field)
-	Gaim::Request::Field field
+purple_request_field_bool_get_value(field)
+	Purple::Request::Field field
 
-Gaim::Request::Field
-gaim_request_field_bool_new(id, text, default_value = TRUE)
+Purple::Request::Field
+purple_request_field_bool_new(id, text, default_value = TRUE)
 	const char *id
 	const char *text
 	gboolean default_value
 
 void
-gaim_request_field_bool_set_default_value(field, default_value)
-	Gaim::Request::Field field
+purple_request_field_bool_set_default_value(field, default_value)
+	Purple::Request::Field field
 	gboolean default_value
 
 void
-gaim_request_field_bool_set_value(field, value)
-	Gaim::Request::Field field
+purple_request_field_bool_set_value(field, value)
+	Purple::Request::Field field
 	gboolean value
 
 void
-gaim_request_field_choice_add(field, label)
-	Gaim::Request::Field field
+purple_request_field_choice_add(field, label)
+	Purple::Request::Field field
 	const char *label
 
 int
-gaim_request_field_choice_get_default_value(field)
-	Gaim::Request::Field field
+purple_request_field_choice_get_default_value(field)
+	Purple::Request::Field field
 
 void
-gaim_request_field_choice_get_labels(field)
-	Gaim::Request::Field field
+purple_request_field_choice_get_labels(field)
+	Purple::Request::Field field
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_request_field_choice_get_labels(field); l != NULL; l = l->next) {
+	for (l = purple_request_field_choice_get_labels(field); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(newSVpv(l->data, 0)));
 	}
 
 int
-gaim_request_field_choice_get_value(field)
-	Gaim::Request::Field field
+purple_request_field_choice_get_value(field)
+	Purple::Request::Field field
 
-Gaim::Request::Field
-gaim_request_field_choice_new(id, text, default_value = 0)
+Purple::Request::Field
+purple_request_field_choice_new(id, text, default_value = 0)
 	const char *id
 	const char *text
 	int default_value
 
 void
-gaim_request_field_choice_set_default_value(field, default_value)
-	Gaim::Request::Field field
+purple_request_field_choice_set_default_value(field, default_value)
+	Purple::Request::Field field
 	int default_value
 
 void
-gaim_request_field_choice_set_value(field, value)
-	Gaim::Request::Field field
+purple_request_field_choice_set_value(field, value)
+	Purple::Request::Field field
 	int value
 
 void
-gaim_request_field_destroy(field)
-	Gaim::Request::Field field
+purple_request_field_destroy(field)
+	Purple::Request::Field field
 
 const char *
-gaim_request_field_get_id(field)
-	Gaim::Request::Field field
+purple_request_field_get_id(field)
+	Purple::Request::Field field
 
 const char *
-gaim_request_field_get_label(field)
-	Gaim::Request::Field field
+purple_request_field_get_label(field)
+	Purple::Request::Field field
 
-Gaim::RequestFieldType
-gaim_request_field_get_type(field)
-	Gaim::Request::Field field
+Purple::RequestFieldType
+purple_request_field_get_type(field)
+	Purple::Request::Field field
 
 const char *
-gaim_request_field_get_type_hint(field)
-	Gaim::Request::Field field
+purple_request_field_get_type_hint(field)
+	Purple::Request::Field field
 
 int
-gaim_request_field_int_get_default_value(field)
-	Gaim::Request::Field field
+purple_request_field_int_get_default_value(field)
+	Purple::Request::Field field
 
 int
-gaim_request_field_int_get_value(field)
-	Gaim::Request::Field field
+purple_request_field_int_get_value(field)
+	Purple::Request::Field field
 
-Gaim::Request::Field
-gaim_request_field_int_new(id, text, default_value = 0)
+Purple::Request::Field
+purple_request_field_int_new(id, text, default_value = 0)
 	const char *id
 	const char *text
 	int default_value
 
 void
-gaim_request_field_int_set_default_value(field, default_value)
-	Gaim::Request::Field field
+purple_request_field_int_set_default_value(field, default_value)
+	Purple::Request::Field field
 	int default_value
 
 void
-gaim_request_field_int_set_value(field, value)
-	Gaim::Request::Field field
+purple_request_field_int_set_value(field, value)
+	Purple::Request::Field field
 	int value
 
 gboolean
-gaim_request_field_is_required(field)
-	Gaim::Request::Field field
+purple_request_field_is_required(field)
+	Purple::Request::Field field
 
 gboolean
-gaim_request_field_is_visible(field)
-	Gaim::Request::Field field
+purple_request_field_is_visible(field)
+	Purple::Request::Field field
 
-Gaim::Request::Field
-gaim_request_field_label_new(id, text)
+Purple::Request::Field
+purple_request_field_label_new(id, text)
 	const char *id
 	const char *text
 
 void
-gaim_request_field_list_add(field, item, data)
-	Gaim::Request::Field field
+purple_request_field_list_add(field, item, data)
+	Purple::Request::Field field
 	const char *item
 	void * data
 
 void
-gaim_request_field_list_add_selected(field, item)
-	Gaim::Request::Field field
+purple_request_field_list_add_selected(field, item)
+	Purple::Request::Field field
 	const char *item
 
 void
-gaim_request_field_list_clear_selected(field)
-	Gaim::Request::Field field
+purple_request_field_list_clear_selected(field)
+	Purple::Request::Field field
 
 void *
-gaim_request_field_list_get_data(field, text)
-	Gaim::Request::Field field
+purple_request_field_list_get_data(field, text)
+	Purple::Request::Field field
 	const char *text
 
 void
-gaim_request_field_list_get_items(field)
-	Gaim::Request::Field field
+purple_request_field_list_get_items(field)
+	Purple::Request::Field field
 PREINIT:
 	const GList *l;
 PPCODE:
-	for (l = gaim_request_field_list_get_items(field); l != NULL; l = l->next) {
+	for (l = purple_request_field_list_get_items(field); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(newSVpv(l->data, 0)));
 	}
 
 gboolean
-gaim_request_field_list_get_multi_select(field)
-	Gaim::Request::Field field
+purple_request_field_list_get_multi_select(field)
+	Purple::Request::Field field
 
 void
-gaim_request_field_list_get_selected(field)
-	Gaim::Request::Field field
+purple_request_field_list_get_selected(field)
+	Purple::Request::Field field
 PREINIT:
 	const GList *l;
 PPCODE:
-	for (l = gaim_request_field_list_get_selected(field); l != NULL; l = l->next) {
+	for (l = purple_request_field_list_get_selected(field); l != NULL; l = l->next) {
 		XPUSHs(sv_2mortal(newSVpv(l->data, 0)));
 	}
 
 gboolean
-gaim_request_field_list_is_selected(field, item)
-	Gaim::Request::Field field
+purple_request_field_list_is_selected(field, item)
+	Purple::Request::Field field
 	const char *item
 
-Gaim::Request::Field
-gaim_request_field_list_new(id, text)
+Purple::Request::Field
+purple_request_field_list_new(id, text)
 	const char *id
 	const char *text
 
 void
-gaim_request_field_list_set_multi_select(field, multi_select)
-	Gaim::Request::Field field
+purple_request_field_list_set_multi_select(field, multi_select)
+	Purple::Request::Field field
 	gboolean multi_select
 
-Gaim::Request::Field
-gaim_request_field_new(id, text, type)
+Purple::Request::Field
+purple_request_field_new(id, text, type)
 	const char *id
 	const char *text
-	Gaim::RequestFieldType type
+	Purple::RequestFieldType type
 
 void
-gaim_request_field_set_label(field, label)
-	Gaim::Request::Field field
+purple_request_field_set_label(field, label)
+	Purple::Request::Field field
 	const char *label
 
 void
-gaim_request_field_set_required(field, required)
-	Gaim::Request::Field field
+purple_request_field_set_required(field, required)
+	Purple::Request::Field field
 	gboolean required
 
 void
-gaim_request_field_set_type_hint(field, type_hint)
-	Gaim::Request::Field field
+purple_request_field_set_type_hint(field, type_hint)
+	Purple::Request::Field field
 	const char *type_hint
 
 void
-gaim_request_field_set_visible(field, visible)
-	Gaim::Request::Field field
+purple_request_field_set_visible(field, visible)
+	Purple::Request::Field field
 	gboolean visible
 
 const char *
-gaim_request_field_string_get_default_value(field)
-	Gaim::Request::Field field
+purple_request_field_string_get_default_value(field)
+	Purple::Request::Field field
 
 const char *
-gaim_request_field_string_get_value(field)
-	Gaim::Request::Field field
+purple_request_field_string_get_value(field)
+	Purple::Request::Field field
 
 gboolean
-gaim_request_field_string_is_editable(field)
-	Gaim::Request::Field field
+purple_request_field_string_is_editable(field)
+	Purple::Request::Field field
 
 gboolean
-gaim_request_field_string_is_masked(field)
-	Gaim::Request::Field field
+purple_request_field_string_is_masked(field)
+	Purple::Request::Field field
 
 gboolean
-gaim_request_field_string_is_multiline(field)
-	Gaim::Request::Field field
+purple_request_field_string_is_multiline(field)
+	Purple::Request::Field field
 
-Gaim::Request::Field
-gaim_request_field_string_new(id, text, default_value, multiline)
+Purple::Request::Field
+purple_request_field_string_new(id, text, default_value, multiline)
 	const char *id
 	const char *text
 	const char *default_value
 	gboolean multiline
 
 void
-gaim_request_field_string_set_default_value(field, default_value)
-	Gaim::Request::Field field
+purple_request_field_string_set_default_value(field, default_value)
+	Purple::Request::Field field
 	const char *default_value
 
 void
-gaim_request_field_string_set_editable(field, editable)
-	Gaim::Request::Field field
+purple_request_field_string_set_editable(field, editable)
+	Purple::Request::Field field
 	gboolean editable
 
 void
-gaim_request_field_string_set_masked(field, masked)
-	Gaim::Request::Field field
+purple_request_field_string_set_masked(field, masked)
+	Purple::Request::Field field
 	gboolean masked
 
 void
-gaim_request_field_string_set_value(field, value)
-	Gaim::Request::Field field
+purple_request_field_string_set_value(field, value)
+	Purple::Request::Field field
 	const char *value
 
-Gaim::Request::UiOps
-gaim_request_get_ui_ops()
+Purple::Request::UiOps
+purple_request_get_ui_ops()
 
 void
-gaim_request_set_ui_ops(ops)
-	Gaim::Request::UiOps ops
+purple_request_set_ui_ops(ops)
+	Purple::Request::UiOps ops
 
-MODULE = Gaim::Request  PACKAGE = Gaim::Request::Field::Group  PREFIX = gaim_request_field_group_
+MODULE = Purple::Request  PACKAGE = Purple::Request::Field::Group  PREFIX = purple_request_field_group_
 PROTOTYPES: ENABLE
 
 void
-gaim_request_field_group_add_field(group, field)
-	Gaim::Request::Field::Group group
-	Gaim::Request::Field field
+purple_request_field_group_add_field(group, field)
+	Purple::Request::Field::Group group
+	Purple::Request::Field field
 
 void
-gaim_request_field_group_destroy(group)
-	Gaim::Request::Field::Group group
+purple_request_field_group_destroy(group)
+	Purple::Request::Field::Group group
 
 void
-gaim_request_field_group_get_fields(group)
-	Gaim::Request::Field::Group group
+purple_request_field_group_get_fields(group)
+	Purple::Request::Field::Group group
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_request_field_group_get_fields(group); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Request::Field")));
+	for (l = purple_request_field_group_get_fields(group); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Request::Field")));
 	}
 
 const char *
-gaim_request_field_group_get_title(group)
-	Gaim::Request::Field::Group group
+purple_request_field_group_get_title(group)
+	Purple::Request::Field::Group group
 
-Gaim::Request::Field::Group
-gaim_request_field_group_new(title)
+Purple::Request::Field::Group
+purple_request_field_group_new(title)
 	const char *title
 
-MODULE = Gaim::Request  PACKAGE = Gaim::Request::Fields  PREFIX = gaim_request_fields_
+MODULE = Purple::Request  PACKAGE = Purple::Request::Fields  PREFIX = purple_request_fields_
 PROTOTYPES: ENABLE
 
 void
-gaim_request_fields_add_group(fields, group)
-	Gaim::Request::Fields fields
-	Gaim::Request::Field::Group group
+purple_request_fields_add_group(fields, group)
+	Purple::Request::Fields fields
+	Purple::Request::Field::Group group
 
 gboolean
-gaim_request_fields_all_required_filled(fields)
-	Gaim::Request::Fields fields
+purple_request_fields_all_required_filled(fields)
+	Purple::Request::Fields fields
 
 void
-gaim_request_fields_destroy(fields)
-	Gaim::Request::Fields fields
+purple_request_fields_destroy(fields)
+	Purple::Request::Fields fields
 
 gboolean
-gaim_request_fields_exists(fields, id)
-	Gaim::Request::Fields fields
+purple_request_fields_exists(fields, id)
+	Purple::Request::Fields fields
 	const char *id
 
-Gaim::Account
-gaim_request_fields_get_account(fields, id)
-	Gaim::Request::Fields fields
+Purple::Account
+purple_request_fields_get_account(fields, id)
+	Purple::Request::Fields fields
 	const char *id
 
 gboolean
-gaim_request_fields_get_bool(fields, id)
-	Gaim::Request::Fields fields
+purple_request_fields_get_bool(fields, id)
+	Purple::Request::Fields fields
 	const char *id
 
 int
-gaim_request_fields_get_choice(fields, id)
-	Gaim::Request::Fields fields
+purple_request_fields_get_choice(fields, id)
+	Purple::Request::Fields fields
 	const char *id
 
-Gaim::Request::Field
-gaim_request_fields_get_field(fields, id)
-	Gaim::Request::Fields fields
+Purple::Request::Field
+purple_request_fields_get_field(fields, id)
+	Purple::Request::Fields fields
 	const char *id
 
 void
-gaim_request_fields_get_groups(fields)
-	Gaim::Request::Fields fields
+purple_request_fields_get_groups(fields)
+	Purple::Request::Fields fields
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_request_fields_get_groups(fields); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Request::Field::Group")));
+	for (l = purple_request_fields_get_groups(fields); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Request::Field::Group")));
 	}
 
 int
-gaim_request_fields_get_integer(fields, id)
-	Gaim::Request::Fields fields
+purple_request_fields_get_integer(fields, id)
+	Purple::Request::Fields fields
 	const char *id
 
 void
-gaim_request_fields_get_required(fields)
-	Gaim::Request::Fields fields
+purple_request_fields_get_required(fields)
+	Purple::Request::Fields fields
 PREINIT:
 	const GList *l;
 PPCODE:
-	for (l = gaim_request_fields_get_required(fields); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Request::Field")));
+	for (l = purple_request_fields_get_required(fields); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Request::Field")));
 	}
 
 const char *
-gaim_request_fields_get_string(fields, id)
-	Gaim::Request::Fields fields
+purple_request_fields_get_string(fields, id)
+	Purple::Request::Fields fields
 	const char *id
 
 gboolean
-gaim_request_fields_is_field_required(fields, id)
-	Gaim::Request::Fields fields
+purple_request_fields_is_field_required(fields, id)
+	Purple::Request::Fields fields
 	const char *id
 
-Gaim::Request::Fields
-gaim_request_fields_new()
+Purple::Request::Fields
+purple_request_fields_new()
diff --git a/libpurple/plugins/perl/common/Roomlist.xs b/libpurple/plugins/perl/common/Roomlist.xs
index eee92aee15..58e3619693 100644
--- a/libpurple/plugins/perl/common/Roomlist.xs
+++ b/libpurple/plugins/perl/common/Roomlist.xs
@@ -1,56 +1,56 @@
 #include "module.h"
 
-MODULE = Gaim::Roomlist  PACKAGE = Gaim::Roomlist  PREFIX = gaim_roomlist_
+MODULE = Purple::Roomlist  PACKAGE = Purple::Roomlist  PREFIX = purple_roomlist_
 PROTOTYPES: ENABLE
 
 void 
-gaim_roomlist_cancel_get_list(list)
-	Gaim::Roomlist list
+purple_roomlist_cancel_get_list(list)
+	Purple::Roomlist list
 
 void 
-gaim_roomlist_expand_category(list, category)
-	Gaim::Roomlist list
-	Gaim::Roomlist::Room category
+purple_roomlist_expand_category(list, category)
+	Purple::Roomlist list
+	Purple::Roomlist::Room category
 
 gboolean 
-gaim_roomlist_get_in_progress(list)
-	Gaim::Roomlist list
+purple_roomlist_get_in_progress(list)
+	Purple::Roomlist list
 
-Gaim::Roomlist
-gaim_roomlist_get_list(gc)
-	Gaim::Connection gc
+Purple::Roomlist
+purple_roomlist_get_list(gc)
+	Purple::Connection gc
 
-Gaim::Roomlist::UiOps
-gaim_roomlist_get_ui_ops()
+Purple::Roomlist::UiOps
+purple_roomlist_get_ui_ops()
  
 
-Gaim::Roomlist
-gaim_roomlist_new(account)
-	Gaim::Account account
+Purple::Roomlist
+purple_roomlist_new(account)
+	Purple::Account account
 
 void 
-gaim_roomlist_ref(list)
-	Gaim::Roomlist list
+purple_roomlist_ref(list)
+	Purple::Roomlist list
 
 void 
-gaim_roomlist_room_add(list, room)
-	Gaim::Roomlist list
-	Gaim::Roomlist::Room room
+purple_roomlist_room_add(list, room)
+	Purple::Roomlist list
+	Purple::Roomlist::Room room
 
 void 
-gaim_roomlist_room_add_field(list, room, field)
-	Gaim::Roomlist list
-	Gaim::Roomlist::Room room
+purple_roomlist_room_add_field(list, room, field)
+	Purple::Roomlist list
+	Purple::Roomlist::Room room
 	gconstpointer field
 
 void 
-gaim_roomlist_room_join(list, room)
-	Gaim::Roomlist list
-	Gaim::Roomlist::Room room
+purple_roomlist_room_join(list, room)
+	Purple::Roomlist list
+	Purple::Roomlist::Room room
 
 void 
-gaim_roomlist_set_fields(list, fields)
-	Gaim::Roomlist list
+purple_roomlist_set_fields(list, fields)
+	Purple::Roomlist list
 	SV *fields
 PREINIT:
 	GList *t_GL;
@@ -63,22 +63,22 @@ PPCODE:
 		STRLEN t_sl;
 		t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(fields), i, 0), t_sl));
 	}
-	gaim_roomlist_set_fields(list, t_GL);
+	purple_roomlist_set_fields(list, t_GL);
 
 void 
-gaim_roomlist_set_in_progress(list, in_progress)
-	Gaim::Roomlist list
+purple_roomlist_set_in_progress(list, in_progress)
+	Purple::Roomlist list
 	gboolean in_progress
 
 void 
-gaim_roomlist_set_ui_ops(ops)
-	Gaim::Roomlist::UiOps ops
+purple_roomlist_set_ui_ops(ops)
+	Purple::Roomlist::UiOps ops
 
 void 
-gaim_roomlist_show_with_account(account)
-	Gaim::Account account
+purple_roomlist_show_with_account(account)
+	Purple::Account account
 
 void 
-gaim_roomlist_unref(list)
-	Gaim::Roomlist list
+purple_roomlist_unref(list)
+	Purple::Roomlist list
 
diff --git a/libpurple/plugins/perl/common/SSLConn.xs b/libpurple/plugins/perl/common/SSLConn.xs
index 2b6e5ac00e..82fe181a89 100644
--- a/libpurple/plugins/perl/common/SSLConn.xs
+++ b/libpurple/plugins/perl/common/SSLConn.xs
@@ -3,59 +3,59 @@
 /* TODO
 
 
-Gaim::Ssl::Connection
-gaim_ssl_connect(account, host, port, func, error_func, data)
-	Gaim::Account account
+Purple::Ssl::Connection
+purple_ssl_connect(account, host, port, func, error_func, data)
+	Purple::Account account
 	const char *host
 	int port
-	GaimSslInputFunction func
-	GaimSslErrorFunction error_func
+	PurpleSslInputFunction func
+	PurpleSslErrorFunction error_func
 
 void
-gaim_ssl_input_add(gsc, func, data)
-	Gaim::Ssl::Connection gsc
-	Gaim::SslInputFunction func
+purple_ssl_input_add(gsc, func, data)
+	Purple::Ssl::Connection gsc
+	Purple::SslInputFunction func
 
-Gaim::Ssl::Connection
-gaim_ssl_connect_fd(account, fd, func, error_func, data)
-	Gaim::Account account
+Purple::Ssl::Connection
+purple_ssl_connect_fd(account, fd, func, error_func, data)
+	Purple::Account account
 	int fd
-	GaimSslInputFunction func
-	GaimSslErrorFunction error_func
+	PurpleSslInputFunction func
+	PurpleSslErrorFunction error_func
 
 */
 
-MODULE = Gaim::SSL  PACKAGE = Gaim::SSL   PREFIX = gaim_ssl_
+MODULE = Purple::SSL  PACKAGE = Purple::SSL   PREFIX = purple_ssl_
 PROTOTYPES: ENABLE
 
 void
-gaim_ssl_close(gsc)
-	Gaim::Ssl::Connection gsc
+purple_ssl_close(gsc)
+	Purple::Ssl::Connection gsc
 
-Gaim::Ssl::Ops
-gaim_ssl_get_ops()
+Purple::Ssl::Ops
+purple_ssl_get_ops()
 
 void
-gaim_ssl_init()
+purple_ssl_init()
 
 gboolean
-gaim_ssl_is_supported()
+purple_ssl_is_supported()
 
 size_t
-gaim_ssl_read(gsc, buffer, len)
-	Gaim::Ssl::Connection gsc
+purple_ssl_read(gsc, buffer, len)
+	Purple::Ssl::Connection gsc
 	void * buffer
 	size_t len
 
 void
-gaim_ssl_set_ops(ops)
-	Gaim::Ssl::Ops ops
+purple_ssl_set_ops(ops)
+	Purple::Ssl::Ops ops
 
 void
-gaim_ssl_uninit()
+purple_ssl_uninit()
 
 size_t
-gaim_ssl_write(gsc, buffer, len)
-	Gaim::Ssl::Connection gsc
+purple_ssl_write(gsc, buffer, len)
+	Purple::Ssl::Connection gsc
 	void * buffer
 	size_t len
diff --git a/libpurple/plugins/perl/common/SavedStatuses.xs b/libpurple/plugins/perl/common/SavedStatuses.xs
index 8851ed84bb..6df794270c 100644
--- a/libpurple/plugins/perl/common/SavedStatuses.xs
+++ b/libpurple/plugins/perl/common/SavedStatuses.xs
@@ -1,58 +1,58 @@
 #include "module.h"
 
-MODULE = Gaim::SavedStatus  PACKAGE = Gaim::SavedStatus  PREFIX = gaim_savedstatus_
+MODULE = Purple::SavedStatus  PACKAGE = Purple::SavedStatus  PREFIX = purple_savedstatus_
 PROTOTYPES: ENABLE
 
 gboolean
-gaim_savedstatus_delete(title)
+purple_savedstatus_delete(title)
 	const char *title
 
-Gaim::SavedStatus
-gaim_savedstatus_find(title)
+Purple::SavedStatus
+purple_savedstatus_find(title)
 	const char *title
 
 const char *
-gaim_savedstatus_get_message(saved_status)
-	Gaim::SavedStatus saved_status
+purple_savedstatus_get_message(saved_status)
+	Purple::SavedStatus saved_status
 
 const char *
-gaim_savedstatus_get_title(saved_status)
-	Gaim::SavedStatus saved_status
+purple_savedstatus_get_title(saved_status)
+	Purple::SavedStatus saved_status
 
-Gaim::StatusPrimitive
-gaim_savedstatus_get_type(saved_status)
-	Gaim::SavedStatus saved_status
+Purple::StatusPrimitive
+purple_savedstatus_get_type(saved_status)
+	Purple::SavedStatus saved_status
 
-Gaim::SavedStatus
-gaim_savedstatus_new(title, type)
+Purple::SavedStatus
+purple_savedstatus_new(title, type)
 	const char *title
-	Gaim::StatusPrimitive type
+	Purple::StatusPrimitive type
 
 void
-gaim_savedstatus_set_message(status, message)
-	Gaim::SavedStatus status
+purple_savedstatus_set_message(status, message)
+	Purple::SavedStatus status
 	const char *message
 
-Gaim::SavedStatus
-gaim_savedstatus_get_current()
+Purple::SavedStatus
+purple_savedstatus_get_current()
 
-MODULE = Gaim::SavedStatus  PACKAGE = Gaim::SavedStatuses  PREFIX = gaim_savedstatuses_
+MODULE = Purple::SavedStatus  PACKAGE = Purple::SavedStatuses  PREFIX = purple_savedstatuses_
 PROTOTYPES: ENABLE
 
 void
-gaim_savedstatuses_get_all()
+purple_savedstatuses_get_all()
 PREINIT:
 	const GList *l;
 PPCODE:
-	for (l = gaim_savedstatuses_get_all(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::SavedStatus")));
+	for (l = purple_savedstatuses_get_all(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::SavedStatus")));
 	}
 
-Gaim::Handle
-gaim_savedstatuses_get_handle()
+Purple::Handle
+purple_savedstatuses_get_handle()
 
 void
-gaim_savedstatuses_init()
+purple_savedstatuses_init()
 
 void
-gaim_savedstatuses_uninit()
+purple_savedstatuses_uninit()
diff --git a/libpurple/plugins/perl/common/Server.xs b/libpurple/plugins/perl/common/Server.xs
index e5fb5027df..fe3fc3b8b8 100644
--- a/libpurple/plugins/perl/common/Server.xs
+++ b/libpurple/plugins/perl/common/Server.xs
@@ -1,72 +1,72 @@
 #include "module.h"
 
-MODULE = Gaim::Serv  PACKAGE = Gaim::Serv  PREFIX = serv_
+MODULE = Purple::Serv  PACKAGE = Purple::Serv  PREFIX = serv_
 PROTOTYPES: ENABLE
 
 
 void 
 serv_add_deny(con, a)
-	Gaim::Connection con
+	Purple::Connection con
 	const char * a
 
 void 
 serv_add_permit(a, b)
-	Gaim::Connection a
+	Purple::Connection a
 	const char * b
 
 void 
 serv_alias_buddy(buddy)
-	Gaim::BuddyList::Buddy buddy 
+	Purple::BuddyList::Buddy buddy 
 
 void 
 serv_chat_invite(con, a, b, c)
-	Gaim::Connection con
+	Purple::Connection con
 	int a
 	const char * b
 	const char * c
 
 void 
 serv_chat_leave(a, b)
-	Gaim::Connection a
+	Purple::Connection a
 	int b
 
 int  
 serv_chat_send(con, a, b, flags)
-	Gaim::Connection con 
+	Purple::Connection con 
 	int a
 	const char * b
-	Gaim::MessageFlags flags
+	Purple::MessageFlags flags
 
 void 
 serv_chat_whisper(con, a, b, c)
-	Gaim::Connection con
+	Purple::Connection con
 	int a
 	const char * b
 	const char * c
 
 void 
 serv_get_info(con, a)
-	Gaim::Connection con 
+	Purple::Connection con 
 	const char * a
 
 void 
 serv_got_alias(gc, who, alias)
-	Gaim::Connection gc
+	Purple::Connection gc
 	const char *who
 	const char *alias
 
 void 
 serv_got_chat_in(g, id, who, chatflags, message, mtime)
-	Gaim::Connection g
+	Purple::Connection g
 	int id
 	const char *who
-	Gaim::MessageFlags chatflags
+	Purple::MessageFlags chatflags
 	const char *message
 	time_t mtime
 
 void 
 serv_got_chat_invite(gc, name, who, message, components)
-	Gaim::Connection gc
+	Purple::Connection gc
 	const char *name
 	const char *who
 	const char *message
@@ -93,38 +93,38 @@ CODE:
 
 void 
 serv_got_chat_left(g, id)
-	Gaim::Connection g
+	Purple::Connection g
 	int id
 
 void 
 serv_got_im(gc, who, msg, imflags, mtime)
-	Gaim::Connection gc
+	Purple::Connection gc
 	const char *who
 	const char *msg
-	Gaim::MessageFlags imflags
+	Purple::MessageFlags imflags
 	time_t mtime
 
-Gaim::Conversation
+Purple::Conversation
 serv_got_joined_chat(gc, id, name)
-	Gaim::Connection gc
+	Purple::Connection gc
 	int id
 	const char *name
 
 void 
 serv_got_typing(gc, name, timeout, state)
-	Gaim::Connection gc
+	Purple::Connection gc
 	const char *name
 	int timeout
-	Gaim::TypingState state
+	Purple::TypingState state
 
 void 
 serv_got_typing_stopped(gc, name)
-	Gaim::Connection gc
+	Purple::Connection gc
 	const char *name
 
 void 
 serv_join_chat(con, components)
-	Gaim::Connection con 
+	Purple::Connection con 
 	SV * components
 INIT:
 	HV * t_HV;
@@ -148,13 +148,13 @@ CODE:
 
 void 
 serv_move_buddy(buddy, group1, group2)
-	Gaim::BuddyList::Buddy buddy
-	Gaim::BuddyList::Group group1
-	Gaim::BuddyList::Group group2
+	Purple::BuddyList::Buddy buddy
+	Purple::BuddyList::Group group1
+	Purple::BuddyList::Group group2
 
 void 
 serv_reject_chat(con, components)
-	Gaim::Connection con 
+	Purple::Connection con 
 	SV * components
 INIT:
 	HV * t_HV;
@@ -178,39 +178,39 @@ CODE:
 
 void 
 serv_rem_deny(con, a)
-	Gaim::Connection con
+	Purple::Connection con
 	const char * 	a
 
 void 
 serv_rem_permit(con, a)
-	Gaim::Connection con
+	Purple::Connection con
 	const char *	a
 
 void 
 serv_send_file(gc, who, file)
-	Gaim::Connection gc
+	Purple::Connection gc
 	const char *who
 	const char *file
 
 int  
 serv_send_im(con, a, b, flags )
-	Gaim::Connection con
+	Purple::Connection con
 	const char * a
 	const char * b
-	Gaim::MessageFlags flags
+	Purple::MessageFlags flags
 
 int  
 serv_send_typing(con, a, state)
-	Gaim::Connection con
+	Purple::Connection con
 	const char * a
-	Gaim::TypingState state
+	Purple::TypingState state
 
 void 
 serv_set_info(con, a)
-	Gaim::Connection con 
+	Purple::Connection con 
 	const char * a
 
 void 
 serv_set_permit_deny(con)
-	Gaim::Connection con  
+	Purple::Connection con  
 
diff --git a/libpurple/plugins/perl/common/Signal.xs b/libpurple/plugins/perl/common/Signal.xs
index 793f1dd223..a10bc99ee2 100644
--- a/libpurple/plugins/perl/common/Signal.xs
+++ b/libpurple/plugins/perl/common/Signal.xs
@@ -1,34 +1,34 @@
 #include "module.h"
 #include "../perl-handlers.h"
 
-MODULE = Gaim::Signal  PACKAGE = Gaim::Signal  PREFIX = gaim_signal_
+MODULE = Purple::Signal  PACKAGE = Purple::Signal  PREFIX = purple_signal_
 PROTOTYPES: ENABLE
 
 void
-gaim_signal_connect_priority(instance, signal, plugin, callback, priority, data = 0)
-	Gaim::Handle instance
+purple_signal_connect_priority(instance, signal, plugin, callback, priority, data = 0)
+	Purple::Handle instance
 	const char *signal
-	Gaim::Plugin plugin
+	Purple::Plugin plugin
 	SV *callback
 	int priority
 	SV *data
 CODE:
-	gaim_perl_signal_connect(plugin, instance, signal, callback, data, priority);
+	purple_perl_signal_connect(plugin, instance, signal, callback, data, priority);
 
 void
-gaim_signal_connect(instance, signal, plugin, callback, data = 0)
-	Gaim::Handle instance
+purple_signal_connect(instance, signal, plugin, callback, data = 0)
+	Purple::Handle instance
 	const char *signal
-	Gaim::Plugin plugin
+	Purple::Plugin plugin
 	SV *callback
 	SV *data
 CODE:
-	gaim_perl_signal_connect(plugin, instance, signal, callback, data, GAIM_SIGNAL_PRIORITY_DEFAULT);
+	purple_perl_signal_connect(plugin, instance, signal, callback, data, PURPLE_SIGNAL_PRIORITY_DEFAULT);
 
 void
-gaim_signal_disconnect(instance, signal, plugin)
-	Gaim::Handle instance
+purple_signal_disconnect(instance, signal, plugin)
+	Purple::Handle instance
 	const char *signal
-	Gaim::Plugin plugin
+	Purple::Plugin plugin
 CODE:
-	gaim_perl_signal_disconnect(plugin, instance, signal);
+	purple_perl_signal_disconnect(plugin, instance, signal);
diff --git a/libpurple/plugins/perl/common/Sound.xs b/libpurple/plugins/perl/common/Sound.xs
index 0f732797c5..61554c8bcb 100644
--- a/libpurple/plugins/perl/common/Sound.xs
+++ b/libpurple/plugins/perl/common/Sound.xs
@@ -1,27 +1,27 @@
 #include "module.h"
 
-MODULE = Gaim::Sound  PACKAGE = Gaim::Sound  PREFIX = gaim_sound_
+MODULE = Purple::Sound  PACKAGE = Purple::Sound  PREFIX = purple_sound_
 PROTOTYPES: ENABLE
 
-Gaim::Sound::UiOps
-gaim_sound_get_ui_ops()
+Purple::Sound::UiOps
+purple_sound_get_ui_ops()
 
 void
-gaim_sound_init()
+purple_sound_init()
 
 void
-gaim_sound_play_event(event, account)
-	Gaim::SoundEventID event
-	Gaim::Account account
+purple_sound_play_event(event, account)
+	Purple::SoundEventID event
+	Purple::Account account
 
 void
-gaim_sound_play_file(filename, account)
+purple_sound_play_file(filename, account)
 	const char *filename
-	Gaim::Account account
+	Purple::Account account
 
 void
-gaim_sound_set_ui_ops(ops)
-	Gaim::Sound::UiOps ops
+purple_sound_set_ui_ops(ops)
+	Purple::Sound::UiOps ops
 
 void
-gaim_sound_uninit()
+purple_sound_uninit()
diff --git a/libpurple/plugins/perl/common/Status.xs b/libpurple/plugins/perl/common/Status.xs
index 02ae4b2b4b..08e07833b6 100644
--- a/libpurple/plugins/perl/common/Status.xs
+++ b/libpurple/plugins/perl/common/Status.xs
@@ -3,16 +3,16 @@
 /* TODO
 
 void
-gaim_status_type_add_attrs(status_type, id, name, value, gaim_status_type_add_attrs)
-	Gaim::StatusType status_type
+purple_status_type_add_attrs(status_type, id, name, value, purple_status_type_add_attrs)
+	Purple::StatusType status_type
 	const char *id
 	const char *name
-	Gaim::Value value
+	Purple::Value value
 	...
 
-Gaim::StatusType
-gaim_status_type_new_with_attrs(primitive, id, name, saveable, user_settable, independent, attr_id, attr_name, attr_value, gaim_status_type_new_with_attrs)
-	Gaim::StatusPrimitive primitive
+Purple::StatusType
+purple_status_type_new_with_attrs(primitive, id, name, saveable, user_settable, independent, attr_id, attr_name, attr_value, purple_status_type_new_with_attrs)
+	Purple::StatusPrimitive primitive
 	const char *id
 	const char *name
 	gboolean saveable
@@ -20,31 +20,31 @@ gaim_status_type_new_with_attrs(primitive, id, name, saveable, user_settable, in
 	gboolean independent
 	const char *attr_id
 	const char *attr_name
-	Gaim::Value attr_value
+	Purple::Value attr_value
 	...
 
 */
 
 /* These break on faceprint's amd64 box
 void
-gaim_status_type_add_attrs_vargs(status_type, args)
-	Gaim::StatusType status_type
+purple_status_type_add_attrs_vargs(status_type, args)
+	Purple::StatusType status_type
 	va_list args
 
 void
-gaim_status_set_active_with_attrs(status, active, args)
-	Gaim::Status status
+purple_status_set_active_with_attrs(status, active, args)
+	Purple::Status status
 	gboolean active
 	va_list args
 
 	*/
 
-MODULE = Gaim::Status  PACKAGE = Gaim::Presence  PREFIX = gaim_presence_
+MODULE = Purple::Status  PACKAGE = Purple::Presence  PREFIX = purple_presence_
 PROTOTYPES: ENABLE
 
 void
-gaim_presence_add_list(presence, source_list)
-	Gaim::Presence presence
+purple_presence_add_list(presence, source_list)
+	Purple::Presence presence
 	SV *source_list
 PREINIT:
 	GList *t_GL;
@@ -57,295 +57,295 @@ PPCODE:
 		STRLEN t_sl;
 		t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(source_list), i, 0), t_sl));
 	}
-	gaim_presence_add_list(presence, t_GL);
+	purple_presence_add_list(presence, t_GL);
 
 void
-gaim_presence_add_status(presence, status)
-	Gaim::Presence presence
-	Gaim::Status status
+purple_presence_add_status(presence, status)
+	Purple::Presence presence
+	Purple::Status status
 
 gint
-gaim_presence_compare(presence1, presence2)
-	Gaim::Presence presence1
-	Gaim::Presence presence2
+purple_presence_compare(presence1, presence2)
+	Purple::Presence presence1
+	Purple::Presence presence2
 
 void
-gaim_presence_destroy(presence)
-	Gaim::Presence presence
+purple_presence_destroy(presence)
+	Purple::Presence presence
 
-Gaim::Account
-gaim_presence_get_account(presence)
-	Gaim::Presence presence
+Purple::Account
+purple_presence_get_account(presence)
+	Purple::Presence presence
 
-Gaim::Status
-gaim_presence_get_active_status(presence)
-	Gaim::Presence presence
+Purple::Status
+purple_presence_get_active_status(presence)
+	Purple::Presence presence
 
 void
-gaim_presence_get_buddies(presence)
-	Gaim::Presence presence
+purple_presence_get_buddies(presence)
+	Purple::Presence presence
 PREINIT:
 	const GList *l;
 PPCODE:
-	for (l = gaim_presence_get_buddies(presence); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::BuddyList::Buddy")));
+	for (l = purple_presence_get_buddies(presence); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::BuddyList::Buddy")));
 	}
 
 const char *
-gaim_presence_get_chat_user(presence)
-	Gaim::Presence presence
+purple_presence_get_chat_user(presence)
+	Purple::Presence presence
 
-Gaim::PresenceContext
-gaim_presence_get_context(presence)
-	Gaim::Presence presence
+Purple::PresenceContext
+purple_presence_get_context(presence)
+	Purple::Presence presence
 
-Gaim::Conversation
-gaim_presence_get_conversation(presence)
-	Gaim::Presence presence
+Purple::Conversation
+purple_presence_get_conversation(presence)
+	Purple::Presence presence
 
 time_t
-gaim_presence_get_idle_time(presence)
-	Gaim::Presence presence
+purple_presence_get_idle_time(presence)
+	Purple::Presence presence
 
 time_t
-gaim_presence_get_login_time(presence)
-	Gaim::Presence presence
+purple_presence_get_login_time(presence)
+	Purple::Presence presence
 
-Gaim::Status
-gaim_presence_get_status(presence, status_id)
-	Gaim::Presence presence
+Purple::Status
+purple_presence_get_status(presence, status_id)
+	Purple::Presence presence
 	const char *status_id
 
 void
-gaim_presence_get_statuses(presence)
-	Gaim::Presence presence
+purple_presence_get_statuses(presence)
+	Purple::Presence presence
 PREINIT:
 	const GList *l;
 PPCODE:
-	for (l = gaim_presence_get_statuses(presence); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Status")));
+	for (l = purple_presence_get_statuses(presence); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Status")));
 	}
 
 gboolean
-gaim_presence_is_available(presence)
-	Gaim::Presence presence
+purple_presence_is_available(presence)
+	Purple::Presence presence
 
 gboolean
-gaim_presence_is_idle(presence)
-	Gaim::Presence presence
+purple_presence_is_idle(presence)
+	Purple::Presence presence
 
 gboolean
-gaim_presence_is_online(presence)
-	Gaim::Presence presence
+purple_presence_is_online(presence)
+	Purple::Presence presence
 
 gboolean
-gaim_presence_is_status_active(presence, status_id)
-	Gaim::Presence presence
+purple_presence_is_status_active(presence, status_id)
+	Purple::Presence presence
 	const char *status_id
 
 gboolean
-gaim_presence_is_status_primitive_active(presence, primitive)
-	Gaim::Presence presence
-	Gaim::StatusPrimitive primitive
+purple_presence_is_status_primitive_active(presence, primitive)
+	Purple::Presence presence
+	Purple::StatusPrimitive primitive
 
-Gaim::Presence
-gaim_presence_new(context)
-	Gaim::PresenceContext context
+Purple::Presence
+purple_presence_new(context)
+	Purple::PresenceContext context
 
-Gaim::Presence
-gaim_presence_new_for_account(account)
-	Gaim::Account account
+Purple::Presence
+purple_presence_new_for_account(account)
+	Purple::Account account
 
-Gaim::Presence
-gaim_presence_new_for_buddy(buddy)
-	Gaim::BuddyList::Buddy buddy
+Purple::Presence
+purple_presence_new_for_buddy(buddy)
+	Purple::BuddyList::Buddy buddy
 
-Gaim::Presence
-gaim_presence_new_for_conv(conv)
-	Gaim::Conversation conv
+Purple::Presence
+purple_presence_new_for_conv(conv)
+	Purple::Conversation conv
 
 void
-gaim_presence_remove_buddy(presence, buddy)
-	Gaim::Presence presence
-	Gaim::BuddyList::Buddy buddy
+purple_presence_remove_buddy(presence, buddy)
+	Purple::Presence presence
+	Purple::BuddyList::Buddy buddy
 
 void
-gaim_presence_set_idle(presence, idle, idle_time)
-	Gaim::Presence presence
+purple_presence_set_idle(presence, idle, idle_time)
+	Purple::Presence presence
 	gboolean idle
 	time_t idle_time
 
 void
-gaim_presence_set_login_time(presence, login_time)
-	Gaim::Presence presence
+purple_presence_set_login_time(presence, login_time)
+	Purple::Presence presence
 	time_t login_time
 
 void
-gaim_presence_set_status_active(presence, status_id, active)
-	Gaim::Presence presence
+purple_presence_set_status_active(presence, status_id, active)
+	Purple::Presence presence
 	const char *status_id
 	gboolean active
 
 void
-gaim_presence_switch_status(presence, status_id)
-	Gaim::Presence presence
+purple_presence_switch_status(presence, status_id)
+	Purple::Presence presence
 	const char *status_id
 
-MODULE = Gaim::Status  PACKAGE = Gaim::Primitive  PREFIX = gaim_primitive_
+MODULE = Purple::Status  PACKAGE = Purple::Primitive  PREFIX = purple_primitive_
 PROTOTYPES: ENABLE
 
 const char *
-gaim_primitive_get_id_from_type(type)
-	Gaim::StatusPrimitive type
+purple_primitive_get_id_from_type(type)
+	Purple::StatusPrimitive type
 
 const char *
-gaim_primitive_get_name_from_type(type)
-	Gaim::StatusPrimitive type
+purple_primitive_get_name_from_type(type)
+	Purple::StatusPrimitive type
 
-Gaim::StatusPrimitive
-gaim_primitive_get_type_from_id(id)
+Purple::StatusPrimitive
+purple_primitive_get_type_from_id(id)
 	const char *id
 
-MODULE = Gaim::Status  PACKAGE = Gaim::StatusAttr PREFIX = gaim_status_attr_
+MODULE = Purple::Status  PACKAGE = Purple::StatusAttr PREFIX = purple_status_attr_
 PROTOTYPES: ENABLE
 
 void
-gaim_status_attr_destroy(attr)
-	Gaim::StatusAttr attr
+purple_status_attr_destroy(attr)
+	Purple::StatusAttr attr
 
 const char *
-gaim_status_attr_get_id(attr)
-	Gaim::StatusAttr attr
+purple_status_attr_get_id(attr)
+	Purple::StatusAttr attr
 
 const char *
-gaim_status_attr_get_name(attr)
-	Gaim::StatusAttr attr
+purple_status_attr_get_name(attr)
+	Purple::StatusAttr attr
 
-Gaim::Value
-gaim_status_attr_get_value(attr)
-	Gaim::StatusAttr attr
+Purple::Value
+purple_status_attr_get_value(attr)
+	Purple::StatusAttr attr
 
-Gaim::StatusAttr
-gaim_status_attr_new(id, name, value_type)
+Purple::StatusAttr
+purple_status_attr_new(id, name, value_type)
 	const char *id
 	const char *name
-	Gaim::Value value_type
+	Purple::Value value_type
 
-MODULE = Gaim::Status  PACKAGE = Gaim::Status  PREFIX = gaim_status_
+MODULE = Purple::Status  PACKAGE = Purple::Status  PREFIX = purple_status_
 PROTOTYPES: ENABLE
 
 gint
-gaim_status_compare(status1, status2)
-	Gaim::Status status1
-	Gaim::Status status2
+purple_status_compare(status1, status2)
+	Purple::Status status1
+	Purple::Status status2
 
 void
-gaim_status_destroy(status)
-	Gaim::Status status
+purple_status_destroy(status)
+	Purple::Status status
 
 gboolean
-gaim_status_get_attr_boolean(status, id)
-	Gaim::Status status
+purple_status_get_attr_boolean(status, id)
+	Purple::Status status
 	const char *id
 
 int
-gaim_status_get_attr_int(status, id)
-	Gaim::Status status
+purple_status_get_attr_int(status, id)
+	Purple::Status status
 	const char *id
 
 const char *
-gaim_status_get_attr_string(status, id)
-	Gaim::Status status
+purple_status_get_attr_string(status, id)
+	Purple::Status status
 	const char *id
 
-Gaim::Value
-gaim_status_get_attr_value(status, id)
-	Gaim::Status status
+Purple::Value
+purple_status_get_attr_value(status, id)
+	Purple::Status status
 	const char *id
 
-Gaim::Handle
-gaim_status_get_handle()
+Purple::Handle
+purple_status_get_handle()
 
 const char *
-gaim_status_get_id(status)
-	Gaim::Status status
+purple_status_get_id(status)
+	Purple::Status status
 
 const char *
-gaim_status_get_name(status)
-	Gaim::Status status
+purple_status_get_name(status)
+	Purple::Status status
 
-Gaim::Presence
-gaim_status_get_presence(status)
-	Gaim::Status status
+Purple::Presence
+purple_status_get_presence(status)
+	Purple::Status status
 
-Gaim::StatusType
-gaim_status_get_type(status)
-	Gaim::Status status
+Purple::StatusType
+purple_status_get_type(status)
+	Purple::Status status
 
 gboolean
-gaim_status_is_active(status)
-	Gaim::Status status
+purple_status_is_active(status)
+	Purple::Status status
 
 gboolean
-gaim_status_is_available(status)
-	Gaim::Status status
+purple_status_is_available(status)
+	Purple::Status status
 
 gboolean
-gaim_status_is_exclusive(status)
-	Gaim::Status status
+purple_status_is_exclusive(status)
+	Purple::Status status
 
 gboolean
-gaim_status_is_independent(status)
-	Gaim::Status status
+purple_status_is_independent(status)
+	Purple::Status status
 
 gboolean
-gaim_status_is_online(status)
-	Gaim::Status status
+purple_status_is_online(status)
+	Purple::Status status
 
-Gaim::Status
-gaim_status_new(status_type, presence)
-	Gaim::StatusType status_type
-	Gaim::Presence presence
+Purple::Status
+purple_status_new(status_type, presence)
+	Purple::StatusType status_type
+	Purple::Presence presence
 
 void
-gaim_status_set_active(status, active)
-	Gaim::Status status
+purple_status_set_active(status, active)
+	Purple::Status status
 	gboolean active
 
 void
-gaim_status_set_attr_boolean(status, id, value)
-	Gaim::Status status
+purple_status_set_attr_boolean(status, id, value)
+	Purple::Status status
 	const char *id
 	gboolean value
 
 void
-gaim_status_set_attr_string(status, id, value)
-	Gaim::Status status
+purple_status_set_attr_string(status, id, value)
+	Purple::Status status
 	const char *id
 	const char *value
 
 void
-gaim_status_init()
+purple_status_init()
 
 void
-gaim_status_uninit()
+purple_status_uninit()
 
-MODULE = Gaim::Status  PACKAGE = Gaim::StatusType  PREFIX = gaim_status_type_
+MODULE = Purple::Status  PACKAGE = Purple::StatusType  PREFIX = purple_status_type_
 PROTOTYPES: ENABLE
 
 void
-gaim_status_type_add_attr(status_type, id, name, value)
-	Gaim::StatusType status_type
+purple_status_type_add_attr(status_type, id, name, value)
+	Purple::StatusType status_type
 	const char *id
 	const char *name
-	Gaim::Value value
+	Purple::Value value
 
 void
-gaim_status_type_destroy(status_type)
-	Gaim::StatusType status_type
+purple_status_type_destroy(status_type)
+	Purple::StatusType status_type
 
-Gaim::StatusType
-gaim_status_type_find_with_id(status_types, id)
+Purple::StatusType
+purple_status_type_find_with_id(status_types, id)
 	SV *status_types
 	const char *id
 PREINIT:
@@ -362,71 +362,71 @@ CODE:
 		STRLEN t_sl;
 		t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(status_types), i, 0), t_sl));
 	}
-	RETVAL = (GaimStatusType *)gaim_status_type_find_with_id(t_GL, id);
+	RETVAL = (PurpleStatusType *)purple_status_type_find_with_id(t_GL, id);
 OUTPUT:
 	RETVAL
 
-Gaim::StatusAttr
-gaim_status_type_get_attr(status_type, id)
-	Gaim::StatusType status_type
+Purple::StatusAttr
+purple_status_type_get_attr(status_type, id)
+	Purple::StatusType status_type
 	const char *id
 
 void
-gaim_status_type_get_attrs(status_type)
-	Gaim::StatusType status_type
+purple_status_type_get_attrs(status_type)
+	Purple::StatusType status_type
 PREINIT:
 	const GList *l;
 PPCODE:
-	for (l = gaim_status_type_get_attrs(status_type); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::StatusAttr")));
+	for (l = purple_status_type_get_attrs(status_type); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::StatusAttr")));
 	}
 
 const char *
-gaim_status_type_get_id(status_type)
-	Gaim::StatusType status_type
+purple_status_type_get_id(status_type)
+	Purple::StatusType status_type
 
 const char *
-gaim_status_type_get_name(status_type)
-	Gaim::StatusType status_type
+purple_status_type_get_name(status_type)
+	Purple::StatusType status_type
 
 const char *
-gaim_status_type_get_primary_attr(status_type)
-	Gaim::StatusType status_type
+purple_status_type_get_primary_attr(status_type)
+	Purple::StatusType status_type
 
-Gaim::StatusPrimitive
-gaim_status_type_get_primitive(status_type)
-	Gaim::StatusType status_type
+Purple::StatusPrimitive
+purple_status_type_get_primitive(status_type)
+	Purple::StatusType status_type
 
 gboolean
-gaim_status_type_is_available(status_type)
-	Gaim::StatusType status_type
+purple_status_type_is_available(status_type)
+	Purple::StatusType status_type
 
 gboolean
-gaim_status_type_is_exclusive(status_type)
-	Gaim::StatusType status_type
+purple_status_type_is_exclusive(status_type)
+	Purple::StatusType status_type
 
 gboolean
-gaim_status_type_is_independent(status_type)
-	Gaim::StatusType status_type
+purple_status_type_is_independent(status_type)
+	Purple::StatusType status_type
 
 gboolean
-gaim_status_type_is_saveable(status_type)
-	Gaim::StatusType status_type
+purple_status_type_is_saveable(status_type)
+	Purple::StatusType status_type
 
 gboolean
-gaim_status_type_is_user_settable(status_type)
-	Gaim::StatusType status_type
+purple_status_type_is_user_settable(status_type)
+	Purple::StatusType status_type
 
-Gaim::StatusType
-gaim_status_type_new(primitive, id, name, user_settable)
-	Gaim::StatusPrimitive primitive
+Purple::StatusType
+purple_status_type_new(primitive, id, name, user_settable)
+	Purple::StatusPrimitive primitive
 	const char *id
 	const char *name
 	gboolean user_settable
 
-Gaim::StatusType
-gaim_status_type_new_full(primitive, id, name, saveable, user_settable, independent)
-	Gaim::StatusPrimitive primitive
+Purple::StatusType
+purple_status_type_new_full(primitive, id, name, saveable, user_settable, independent)
+	Purple::StatusPrimitive primitive
 	const char *id
 	const char *name
 	gboolean saveable
@@ -434,6 +434,6 @@ gaim_status_type_new_full(primitive, id, name, saveable, user_settable, independ
 	gboolean independent
 
 void
-gaim_status_type_set_primary_attr(status_type, attr_id)
-	Gaim::StatusType status_type
+purple_status_type_set_primary_attr(status_type, attr_id)
+	Purple::StatusType status_type
 	const char *attr_id
diff --git a/libpurple/plugins/perl/common/Stringref.xs b/libpurple/plugins/perl/common/Stringref.xs
index 710cab42ec..109d132d60 100644
--- a/libpurple/plugins/perl/common/Stringref.xs
+++ b/libpurple/plugins/perl/common/Stringref.xs
@@ -1,37 +1,37 @@
 #include "module.h"
 
-MODULE = Gaim::Stringref  PACKAGE = Gaim::Stringref  PREFIX = gaim_stringref_
+MODULE = Purple::Stringref  PACKAGE = Purple::Stringref  PREFIX = purple_stringref_
 PROTOTYPES: ENABLE
 
 int
-gaim_stringref_cmp(s1, s2)
-	Gaim::Stringref s1
-	Gaim::Stringref s2
+purple_stringref_cmp(s1, s2)
+	Purple::Stringref s1
+	Purple::Stringref s2
 
 size_t
-gaim_stringref_len(stringref)
-	Gaim::Stringref stringref
+purple_stringref_len(stringref)
+	Purple::Stringref stringref
 
-Gaim::Stringref
-gaim_stringref_new(class, value)
+Purple::Stringref
+purple_stringref_new(class, value)
 	const char *value
     C_ARGS:
 	value
 
-Gaim::Stringref
-gaim_stringref_new_noref(class, value)
+Purple::Stringref
+purple_stringref_new_noref(class, value)
 	const char *value
     C_ARGS:
 	value
 
-Gaim::Stringref
-gaim_stringref_ref(stringref)
-	Gaim::Stringref stringref
+Purple::Stringref
+purple_stringref_ref(stringref)
+	Purple::Stringref stringref
 
 void
-gaim_stringref_unref(stringref)
-	Gaim::Stringref stringref
+purple_stringref_unref(stringref)
+	Purple::Stringref stringref
 
 const char *
-gaim_stringref_value(stringref)
-	Gaim::Stringref stringref
+purple_stringref_value(stringref)
+	Purple::Stringref stringref
diff --git a/libpurple/plugins/perl/common/Util.xs b/libpurple/plugins/perl/common/Util.xs
index 815507d7a8..e04cea36c2 100644
--- a/libpurple/plugins/perl/common/Util.xs
+++ b/libpurple/plugins/perl/common/Util.xs
@@ -2,10 +2,10 @@
 
 typedef struct {
 	char *cb;
-} GaimPerlUrlData;
+} PurplePerlUrlData;
 
-static void gaim_perl_util_url_cb(GaimUtilFetchUrlData *url_data, void *user_data, const gchar *url_text, size_t size, const gchar *error_message) {
-	GaimPerlUrlData *gpr = (GaimPerlUrlData *)user_data;
+static void purple_perl_util_url_cb(PurpleUtilFetchUrlData *url_data, void *user_data, const gchar *url_text, size_t size, const gchar *error_message) {
+	PurplePerlUrlData *gpr = (PurplePerlUrlData *)user_data;
 	dSP;
 	ENTER;
 	SAVETMPS;
@@ -25,67 +25,67 @@ static void gaim_perl_util_url_cb(GaimUtilFetchUrlData *url_data, void *user_dat
 	LEAVE;
 }
 
-MODULE = Gaim::Util  PACKAGE = Gaim::Util  PREFIX = gaim_
+MODULE = Purple::Util  PACKAGE = Purple::Util  PREFIX = purple_
 PROTOTYPES: ENABLE
 
 void
-gaim_util_fetch_url(handle, url, full, user_agent, http11, cb)
-	Gaim::Plugin handle
+purple_util_fetch_url(handle, url, full, user_agent, http11, cb)
+	Purple::Plugin handle
 	const char *url
 	gboolean full
 	const char *user_agent
 	gboolean http11
 	SV * cb
 CODE:
-	GaimPerlUrlData *gpr;
+	PurplePerlUrlData *gpr;
 	STRLEN len;
 	char *basename;
 
 	basename = g_path_get_basename(handle->path);
-	gaim_perl_normalize_script_name(basename);
-	gpr = g_new(GaimPerlUrlData, 1);
+	purple_perl_normalize_script_name(basename);
+	gpr = g_new(PurplePerlUrlData, 1);
 
-	gpr->cb = g_strdup_printf("Gaim::Script::%s::%s", basename, SvPV(cb, len));
+	gpr->cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cb, len));
 	g_free(basename);
-	gaim_util_fetch_url(url, full, user_agent, http11, gaim_perl_util_url_cb, gpr);
+	purple_util_fetch_url(url, full, user_agent, http11, purple_perl_util_url_cb, gpr);
 
 int
-gaim_build_dir(path, mode)
+purple_build_dir(path, mode)
 	const char *path
 	int mode
 
 const char *
-gaim_date_format_full(tm)
+purple_date_format_full(tm)
 	const struct tm *tm
 
 const char *
-gaim_date_format_long(tm)
+purple_date_format_long(tm)
 	const struct tm *tm
 
 const char *
-gaim_date_format_short(tm)
+purple_date_format_short(tm)
 	const struct tm *tm
 
 gboolean
-gaim_email_is_valid(address)
+purple_email_is_valid(address)
 	const char *address
 
 const char *
-gaim_escape_filename(str)
+purple_escape_filename(str)
 	const char *str
 
 gchar_own *
-gaim_fd_get_ip(fd)
+purple_fd_get_ip(fd)
 	int fd
 
 const gchar *
-gaim_home_dir()
+purple_home_dir()
 
 gboolean
-gaim_markup_extract_info_field(str, len, user_info, start_token, skip, end_token, check_value, no_value_token, display_name, is_link, link_prefix, format_cb)
+purple_markup_extract_info_field(str, len, user_info, start_token, skip, end_token, check_value, no_value_token, display_name, is_link, link_prefix, format_cb)
 	const char *str
 	int len
-	Gaim::NotifyUserInfo user_info
+	Purple::NotifyUserInfo user_info
 	const char *start_token
 	int skip
 	const char *end_token
@@ -94,10 +94,10 @@ gaim_markup_extract_info_field(str, len, user_info, start_token, skip, end_token
 	const char *display_name
 	gboolean is_link
 	const char *link_prefix
-	Gaim::Util::InfoFieldFormatCallback format_cb
+	Purple::Util::InfoFieldFormatCallback format_cb
 
 gboolean
-gaim_markup_find_tag(needle, haystack, start, end, attributes)
+purple_markup_find_tag(needle, haystack, start, end, attributes)
 	const char *needle
 	const char *haystack
 	const char **start
@@ -105,82 +105,82 @@ gaim_markup_find_tag(needle, haystack, start, end, attributes)
 	GData **attributes
 
 gchar_own *
-gaim_markup_get_tag_name(tag)
+purple_markup_get_tag_name(tag)
 	const char *tag
 
 void
-gaim_markup_html_to_xhtml(html, dest_xhtml, dest_plain)
+purple_markup_html_to_xhtml(html, dest_xhtml, dest_plain)
 	const char *html
 	char **dest_xhtml
 	char **dest_plain
 
 gchar_own *
-gaim_markup_linkify(str)
+purple_markup_linkify(str)
 	const char *str
 
 gchar_own *
-gaim_markup_slice(str, x, y)
+purple_markup_slice(str, x, y)
 	const char *str
 	guint x
 	guint y
 
 gchar_own *
-gaim_markup_strip_html(str)
+purple_markup_strip_html(str)
 	const char *str
 
 gboolean
-gaim_message_meify(message, len)
+purple_message_meify(message, len)
 	char *message
 	size_t len
 
 FILE *
-gaim_mkstemp(path, binary)
+purple_mkstemp(path, binary)
 	char **path
 	gboolean binary
 
 const char *
-gaim_normalize(account, str)
-	Gaim::Account account
+purple_normalize(account, str)
+	Purple::Account account
 	const char *str
 
 gboolean
-gaim_program_is_valid(program)
+purple_program_is_valid(program)
 	const char *program
 
 gchar_own *
-gaim_str_add_cr(str)
+purple_str_add_cr(str)
 	const char *str
 
 gchar_own *
-gaim_str_binary_to_ascii(binary, len)
+purple_str_binary_to_ascii(binary, len)
 	const unsigned char *binary
 	guint len
 
 gboolean
-gaim_str_has_prefix(s, p)
+purple_str_has_prefix(s, p)
 	const char *s
 	const char *p
 
 gboolean
-gaim_str_has_suffix(s, x)
+purple_str_has_suffix(s, x)
 	const char *s
 	const char *x
 
 gchar_own *
-gaim_str_seconds_to_string(sec)
+purple_str_seconds_to_string(sec)
 	guint sec
 
 gchar_own *
-gaim_str_size_to_units(size)
+purple_str_size_to_units(size)
 	size_t size
 
 void
-gaim_str_strip_char(str, thechar)
+purple_str_strip_char(str, thechar)
 	char *str
 	char thechar
 
 time_t
-gaim_str_to_time(timestamp, utc = FALSE, tm = NULL, tz_off = NULL, rest = NULL)
+purple_str_to_time(timestamp, utc = FALSE, tm = NULL, tz_off = NULL, rest = NULL)
 	const char *timestamp
 	gboolean utc
 	struct tm *tm
@@ -188,32 +188,32 @@ gaim_str_to_time(timestamp, utc = FALSE, tm = NULL, tz_off = NULL, rest = NULL)
 	const char **rest
 
 gchar_own *
-gaim_strcasereplace(string, delimiter, replacement)
+purple_strcasereplace(string, delimiter, replacement)
 	const char *string
 	const char *delimiter
 	const char *replacement
 
 const char *
-gaim_strcasestr(haystack, needle)
+purple_strcasestr(haystack, needle)
 	const char *haystack
 	const char *needle
 
 gchar_own *
-gaim_strdup_withhtml(src)
+purple_strdup_withhtml(src)
 	const gchar *src
 
 gchar_own *
-gaim_strreplace(string, delimiter, replacement)
+purple_strreplace(string, delimiter, replacement)
 	const char *string
 	const char *delimiter
 	const char *replacement
 
 gchar_own *
-gaim_text_strip_mnemonic(in)
+purple_text_strip_mnemonic(in)
 	const char *in
 
 time_t
-gaim_time_build(year, month, day, hour, min, sec)
+purple_time_build(year, month, day, hour, min, sec)
 	int year
 	int month
 	int day
@@ -222,27 +222,27 @@ gaim_time_build(year, month, day, hour, min, sec)
 	int sec
 
 const char *
-gaim_time_format(tm)
+purple_time_format(tm)
 	const struct tm *tm
 
 const char *
-gaim_unescape_filename(str)
+purple_unescape_filename(str)
 	const char *str
 
 gchar_own *
-gaim_unescape_html(html)
+purple_unescape_html(html)
 	const char *html
 
 const char *
-gaim_url_decode(str)
+purple_url_decode(str)
 	const char *str
 
 const char *
-gaim_url_encode(str)
+purple_url_encode(str)
 	const char *str
 
 gboolean
-gaim_url_parse(url, ret_host, ret_port, ret_path, ret_user, ret_passwd)
+purple_url_parse(url, ret_host, ret_port, ret_path, ret_user, ret_passwd)
 	const char *url
 	char **ret_host
 	int *ret_port
@@ -251,17 +251,17 @@ gaim_url_parse(url, ret_host, ret_port, ret_path, ret_user, ret_passwd)
 	char **ret_passwd
 
 const char *
-gaim_user_dir()
+purple_user_dir()
 
 const char *
-gaim_utf8_strftime(const char *format, const struct tm *tm);
+purple_utf8_strftime(const char *format, const struct tm *tm);
 
 void
-gaim_util_set_user_dir(dir)
+purple_util_set_user_dir(dir)
 	const char *dir
 
 gboolean
-gaim_util_write_data_to_file(filename, data, size)
+purple_util_write_data_to_file(filename, data, size)
 	const char *filename
 	const char *data
 	size_t size
diff --git a/libpurple/plugins/perl/common/XMLNode.xs b/libpurple/plugins/perl/common/XMLNode.xs
index 601b9f36a6..cc437e6e55 100644
--- a/libpurple/plugins/perl/common/XMLNode.xs
+++ b/libpurple/plugins/perl/common/XMLNode.xs
@@ -1,19 +1,19 @@
 #include "module.h"
 
-MODULE = Gaim::XMLNode  PACKAGE = Gaim::XMLNode  PREFIX = xmlnode_
+MODULE = Purple::XMLNode  PACKAGE = Purple::XMLNode  PREFIX = xmlnode_
 PROTOTYPES: ENABLE
 
-Gaim::XMLNode
+Purple::XMLNode
 xmlnode_copy(class, src)
-	Gaim::XMLNode src
+	Purple::XMLNode src
     C_ARGS:
 	src
 
 void
 xmlnode_free(node)
-	Gaim::XMLNode node
+	Purple::XMLNode node
 
-Gaim::XMLNode
+Purple::XMLNode
 xmlnode_from_str(class, str, size)
 	const char *str
 	gssize size
@@ -22,67 +22,67 @@ xmlnode_from_str(class, str, size)
 
 const char *
 xmlnode_get_attrib(node, attr)
-	Gaim::XMLNode node
+	Purple::XMLNode node
 	const char *attr
 
-Gaim::XMLNode
+Purple::XMLNode
 xmlnode_get_child(parent, name)
-	Gaim::XMLNode parent
+	Purple::XMLNode parent
 	const char *name
 
-Gaim::XMLNode
+Purple::XMLNode
 xmlnode_get_child_with_namespace(parent, name, xmlns)
-	Gaim::XMLNode parent
+	Purple::XMLNode parent
 	const char *name
 	const char *xmlns
 
 gchar_own *
 xmlnode_get_data(node)
-	Gaim::XMLNode node
+	Purple::XMLNode node
 
-Gaim::XMLNode
+Purple::XMLNode
 xmlnode_get_next_twin(node)
-	Gaim::XMLNode node
+	Purple::XMLNode node
 
 void
 xmlnode_insert_child(parent, child)
-	Gaim::XMLNode parent
-	Gaim::XMLNode child
+	Purple::XMLNode parent
+	Purple::XMLNode child
 
 void
 xmlnode_insert_data(node, data, size)
-	Gaim::XMLNode node
+	Purple::XMLNode node
 	const char *data
 	gssize size
 
-Gaim::XMLNode
+Purple::XMLNode
 xmlnode_new(class, name)
 	const char *name
     C_ARGS:
 	name
 
-Gaim::XMLNode
+Purple::XMLNode
 xmlnode_new_child(parent, name)
-	Gaim::XMLNode parent
+	Purple::XMLNode parent
 	const char *name
 
 void
 xmlnode_remove_attrib(node, attr)
-	Gaim::XMLNode node
+	Purple::XMLNode node
 	const char *attr
 
 void
 xmlnode_set_attrib(node, attr, value)
-	Gaim::XMLNode node
+	Purple::XMLNode node
 	const char *attr
 	const char *value
 
 gchar_own *
 xmlnode_to_formatted_str(node, len)
-	Gaim::XMLNode node
+	Purple::XMLNode node
 	int *len
 
 gchar_own *
 xmlnode_to_str(node, len)
-	Gaim::XMLNode node
+	Purple::XMLNode node
 	int *len
diff --git a/libpurple/plugins/perl/common/fallback/const-c.inc b/libpurple/plugins/perl/common/fallback/const-c.inc
index 4e1290d661..23c8ac29dd 100644
--- a/libpurple/plugins/perl/common/fallback/const-c.inc
+++ b/libpurple/plugins/perl/common/fallback/const-c.inc
@@ -38,45 +38,45 @@ use ExtUtils::Constant qw (constant_types C_constant XS_constant);
 
 my $types = {map {($_, 1)} qw(IV)};
 my @names = (qw(),
-            {name=>"GAIM_DEBUG_ALL", type=>"IV", macro=>"1"},
-            {name=>"GAIM_DEBUG_ERROR", type=>"IV", macro=>"1"},
-            {name=>"GAIM_DEBUG_FATAL", type=>"IV", macro=>"1"},
-            {name=>"GAIM_DEBUG_INFO", type=>"IV", macro=>"1"},
-            {name=>"GAIM_DEBUG_MISC", type=>"IV", macro=>"1"},
-            {name=>"GAIM_DEBUG_WARNING", type=>"IV", macro=>"1"});
+            {name=>"PURPLE_DEBUG_ALL", type=>"IV", macro=>"1"},
+            {name=>"PURPLE_DEBUG_ERROR", type=>"IV", macro=>"1"},
+            {name=>"PURPLE_DEBUG_FATAL", type=>"IV", macro=>"1"},
+            {name=>"PURPLE_DEBUG_INFO", type=>"IV", macro=>"1"},
+            {name=>"PURPLE_DEBUG_MISC", type=>"IV", macro=>"1"},
+            {name=>"PURPLE_DEBUG_WARNING", type=>"IV", macro=>"1"});
 
 print constant_types(); # macro defs
-foreach (C_constant ("Gaim::DebugLevel", 'constant', 'IV', $types, undef, 3, @names) ) {
+foreach (C_constant ("Purple::DebugLevel", 'constant', 'IV', $types, undef, 3, @names) ) {
     print $_, "\n"; # C constant subs
 }
 print "#### XS Section:\n";
-print XS_constant ("Gaim::DebugLevel", $types);
+print XS_constant ("Purple::DebugLevel", $types);
 __END__
    */
 
   switch (len) {
   case 14:
-    if (memEQ(name, "GAIM_DEBUG_ALL", 14)) {
-      *iv_return = GAIM_DEBUG_ALL;
+    if (memEQ(name, "PURPLE_DEBUG_ALL", 14)) {
+      *iv_return = PURPLE_DEBUG_ALL;
       return PERL_constant_ISIV;
     }
     break;
   case 15:
     /* Names all of length 15.  */
-    /* GAIM_DEBUG_INFO GAIM_DEBUG_MISC */
+    /* PURPLE_DEBUG_INFO PURPLE_DEBUG_MISC */
     /* Offset 11 gives the best switch position.  */
     switch (name[11]) {
     case 'I':
-      if (memEQ(name, "GAIM_DEBUG_INFO", 15)) {
+      if (memEQ(name, "PURPLE_DEBUG_INFO", 15)) {
       /*                          ^          */
-        *iv_return = GAIM_DEBUG_INFO;
+        *iv_return = PURPLE_DEBUG_INFO;
         return PERL_constant_ISIV;
       }
       break;
     case 'M':
-      if (memEQ(name, "GAIM_DEBUG_MISC", 15)) {
+      if (memEQ(name, "PURPLE_DEBUG_MISC", 15)) {
       /*                          ^          */
-        *iv_return = GAIM_DEBUG_MISC;
+        *iv_return = PURPLE_DEBUG_MISC;
         return PERL_constant_ISIV;
       }
       break;
@@ -84,28 +84,28 @@ __END__
     break;
   case 16:
     /* Names all of length 16.  */
-    /* GAIM_DEBUG_ERROR GAIM_DEBUG_FATAL */
+    /* PURPLE_DEBUG_ERROR PURPLE_DEBUG_FATAL */
     /* Offset 11 gives the best switch position.  */
     switch (name[11]) {
     case 'E':
-      if (memEQ(name, "GAIM_DEBUG_ERROR", 16)) {
+      if (memEQ(name, "PURPLE_DEBUG_ERROR", 16)) {
       /*                          ^           */
-        *iv_return = GAIM_DEBUG_ERROR;
+        *iv_return = PURPLE_DEBUG_ERROR;
         return PERL_constant_ISIV;
       }
       break;
     case 'F':
-      if (memEQ(name, "GAIM_DEBUG_FATAL", 16)) {
+      if (memEQ(name, "PURPLE_DEBUG_FATAL", 16)) {
       /*                          ^           */
-        *iv_return = GAIM_DEBUG_FATAL;
+        *iv_return = PURPLE_DEBUG_FATAL;
         return PERL_constant_ISIV;
       }
       break;
     }
     break;
   case 18:
-    if (memEQ(name, "GAIM_DEBUG_WARNING", 18)) {
-      *iv_return = GAIM_DEBUG_WARNING;
+    if (memEQ(name, "PURPLE_DEBUG_WARNING", 18)) {
+      *iv_return = PURPLE_DEBUG_WARNING;
       return PERL_constant_ISIV;
     }
     break;
diff --git a/libpurple/plugins/perl/common/fallback/const-xs.inc b/libpurple/plugins/perl/common/fallback/const-xs.inc
index 45384ff63b..2bc6805957 100644
--- a/libpurple/plugins/perl/common/fallback/const-xs.inc
+++ b/libpurple/plugins/perl/common/fallback/const-xs.inc
@@ -22,12 +22,12 @@ constant(sv)
            Second, if present, is found value */
         switch (type) {
         case PERL_constant_NOTFOUND:
-          sv = sv_2mortal(newSVpvf("%s is not a valid Gaim::DebugLevel macro", s));
+          sv = sv_2mortal(newSVpvf("%s is not a valid Purple::DebugLevel macro", s));
           PUSHs(sv);
           break;
         case PERL_constant_NOTDEF:
           sv = sv_2mortal(newSVpvf(
-	    "Your vendor has not defined Gaim::DebugLevel macro %s, used", s));
+	    "Your vendor has not defined Purple::DebugLevel macro %s, used", s));
           PUSHs(sv);
           break;
         case PERL_constant_ISIV:
@@ -82,7 +82,7 @@ constant(sv)
           break; */
         default:
           sv = sv_2mortal(newSVpvf(
-	    "Unexpected return type %d while processing Gaim::DebugLevel macro %s, used",
+	    "Unexpected return type %d while processing Purple::DebugLevel macro %s, used",
                type, s));
           PUSHs(sv);
         }
diff --git a/libpurple/plugins/perl/common/typemap b/libpurple/plugins/perl/common/typemap
index e1eba3412f..6c7d82b91c 100644
--- a/libpurple/plugins/perl/common/typemap
+++ b/libpurple/plugins/perl/common/typemap
@@ -8,7 +8,7 @@ guint8					T_IV
 guint8 *				T_PTR
 time_t					T_IV
 gboolean				T_BOOL
-gpointer				T_GaimObj
+gpointer				T_PurpleObj
 gconstpointer				T_PTR
 const gchar *				T_PV
 const char *				T_PV
@@ -38,134 +38,134 @@ const xmlnode *				T_PTR
 gssize					T_IV
 const void *				T_PTR
 
-Gaim::Account				T_GaimObj
-Gaim::Account::Option			T_GaimObj
-Gaim::Account::UiOps			T_GaimObj
-Gaim::Account::UserSplit		T_GaimObj
-
-Gaim::Buddy::Icon			T_GaimObj
-Gaim::Buddy::Icon::Spec			T_GaimObj
-Gaim::BuddyList				T_GaimObj
-Gaim::BuddyList::Buddy			T_GaimObj
-Gaim::BuddyList::Chat			T_GaimObj
-Gaim::BuddyList::Contact		T_GaimObj
-Gaim::BuddyList::Group			T_GaimObj
-Gaim::BuddyList::Node			T_GaimObj
-Gaim::BuddyList::NodeFlags		T_IV
-Gaim::BuddyList::UiOps			T_GaimObj
-
-Gaim::Cipher				T_GaimObj
-Gaim::CipherCaps			T_IV
-Gaim::Cipher::Ops			T_GaimObj
-Gaim::Cipher::Context			T_GaimObj
-Gaim::Cmd::Flag				T_IV
-Gaim::Cmd::Id				T_IV
-Gaim::Cmd::Priority			T_IV
-Gaim::Cmd::Ret				T_IV
-Gaim::Connection			T_GaimObj
-Gaim::Connection::UiOps			T_GaimObj
-Gaim::Conversation			T_GaimObj
-Gaim::Conversation::Chat		T_GaimObj
-Gaim::Conversation::ChatBuddy		T_GaimObj
-Gaim::Conversation::IM			T_GaimObj
-Gaim::Conversation::UiOps		T_GaimObj
-Gaim::Core				T_GaimObj
-Gaim::Core::UiOps			T_GaimObj
-
-Gaim::Desktop::Item			T_GaimObj
-Gaim::DesktopItemType			T_IV
-
-Gaim::Handle				T_GaimObj
-
-Gaim::IconScaleRules			T_IV
-
-Gaim::Log				T_GaimObj
-Gaim::LogType				T_IV
-Gaim::Log::CommonLoggerData		T_GaimObj
-Gaim::Log::Logger			T_GaimObj
-Gaim::Log::ReadFlags			T_GaimObj
-Gaim::Log::Set				T_GaimObj
-
-Gaim::Menu::Action			T_GaimObj
-
-Gaim::NetworkListenData			T_GaimObj
-Gaim::NetworkListenCallback		T_PTR
-
-Gaim::NotifyCloseCallback		T_PTR
-Gaim::NotifyMsgType			T_IV
-Gaim::NotifySearchButtonType		T_IV
-Gaim::NotifySearchResults		T_GaimObj
-Gaim::NotifySearchColumn		T_GaimObj
-Gaim::NotifySearchButton		T_GaimObj
-Gaim::NotifyType			T_IV
-Gaim::NotifyUiOps			T_GaimObj
-Gaim::NotifyUserInfo			T_GaimObj
-Gaim::NotifyUserInfoEntry		T_GaimObj
-
-Gaim::Plugin				T_GaimObj
-Gaim::PluginType			T_IV
-Gaim::PluginUiInfo			T_GaimObj
-Gaim::Plugin::Action			T_GaimObj
-Gaim::Plugin::Info			T_GaimObj
-Gaim::Plugin::Loader::Info		T_GaimObj
-Gaim::Plugin::Protocol::Info		T_GaimObj
-Gaim::PrefType				T_IV
-Gaim::PluginPref			T_GaimObj
-Gaim::PluginPrefType			T_IV
-Gaim::PluginPref::Frame			T_GaimObj
-Gaim::Pounce				T_GaimObj
-Gaim::PounceEvent			T_IV
-Gaim::Presence				T_GaimObj
-Gaim::PrivacyType			T_IV
-Gaim::Privacy::UiOps			T_GaimObj
-Gaim::ProtocolOptions			T_IV
-Gaim::ProxyInfo				T_GaimObj
-Gaim::ProxyType				T_IV
-
-Gaim::RequestFieldType			T_IV
-Gaim::RequestType			T_IV
-Gaim::Request::Field			T_GaimObj
-Gaim::Request::Fields			T_GaimObj
-Gaim::Request::Field::Group		T_GaimObj
-Gaim::Request::UiOps			T_GaimObj
-
-Gaim::Roomlist				T_GaimObj
-Gaim::Roomlist::Room			T_GaimObj
-Gaim::Roomlist::Field			T_GaimObj
-Gaim::Roomlist::UiOps			T_GaimObj
-Gaim::RoomlistFieldType			T_IV
-Gaim::RoomlistRoomType			T_IV
-
-Gaim::SavedStatus			T_GaimObj
-Gaim::SavedStatusSub			T_GaimObj
-Gaim::SoundEventID			T_IV
-Gaim::Sound::UiOps			T_GaimObj
-
-Gaim::Input::Condition			T_GaimObj
-Gaim::SslErrorType			T_IV
-Gaim::Ssl::Connection			T_GaimObj
-Gaim::Ssl::Ops				T_GaimObj
-
-Gaim::Presence				T_GaimObj
-Gaim::PresenceContext			T_IV
-Gaim::Status				T_GaimObj
-Gaim::StatusAttr			T_GaimObj
-Gaim::StatusPrimitive			T_IV
-Gaim::StatusType			T_GaimObj
-const Gaim::StatusType			T_GaimObj
-
-Gaim::StoredImage			T_GaimObj
-Gaim::Stringref				T_GaimObj
-Gaim::Util::FetchUrlData	T_PTR
-Gaim::Util::InfoFieldFormatCallback	T_PTR
-Gaim::Value				T_GaimObj
-
-Gaim::Xfer				T_GaimObj
-Gaim::XferType				T_IV
-Gaim::XferStatusType			T_IV
-Gaim::XferUiOps				T_IV
-
-Gaim::XMLNode				T_GaimObj
+Purple::Account				T_PurpleObj
+Purple::Account::Option			T_PurpleObj
+Purple::Account::UiOps			T_PurpleObj
+Purple::Account::UserSplit		T_PurpleObj
+
+Purple::Buddy::Icon			T_PurpleObj
+Purple::Buddy::Icon::Spec			T_PurpleObj
+Purple::BuddyList				T_PurpleObj
+Purple::BuddyList::Buddy			T_PurpleObj
+Purple::BuddyList::Chat			T_PurpleObj
+Purple::BuddyList::Contact		T_PurpleObj
+Purple::BuddyList::Group			T_PurpleObj
+Purple::BuddyList::Node			T_PurpleObj
+Purple::BuddyList::NodeFlags		T_IV
+Purple::BuddyList::UiOps			T_PurpleObj
+
+Purple::Cipher				T_PurpleObj
+Purple::CipherCaps			T_IV
+Purple::Cipher::Ops			T_PurpleObj
+Purple::Cipher::Context			T_PurpleObj
+Purple::Cmd::Flag				T_IV
+Purple::Cmd::Id				T_IV
+Purple::Cmd::Priority			T_IV
+Purple::Cmd::Ret				T_IV
+Purple::Connection			T_PurpleObj
+Purple::Connection::UiOps			T_PurpleObj
+Purple::Conversation			T_PurpleObj
+Purple::Conversation::Chat		T_PurpleObj
+Purple::Conversation::ChatBuddy		T_PurpleObj
+Purple::Conversation::IM			T_PurpleObj
+Purple::Conversation::UiOps		T_PurpleObj
+Purple::Core				T_PurpleObj
+Purple::Core::UiOps			T_PurpleObj
+
+Purple::Desktop::Item			T_PurpleObj
+Purple::DesktopItemType			T_IV
+
+Purple::Handle				T_PurpleObj
+
+Purple::IconScaleRules			T_IV
+
+Purple::Log				T_PurpleObj
+Purple::LogType				T_IV
+Purple::Log::CommonLoggerData		T_PurpleObj
+Purple::Log::Logger			T_PurpleObj
+Purple::Log::ReadFlags			T_PurpleObj
+Purple::Log::Set				T_PurpleObj
+
+Purple::Menu::Action			T_PurpleObj
+
+Purple::NetworkListenData			T_PurpleObj
+Purple::NetworkListenCallback		T_PTR
+
+Purple::NotifyCloseCallback		T_PTR
+Purple::NotifyMsgType			T_IV
+Purple::NotifySearchButtonType		T_IV
+Purple::NotifySearchResults		T_PurpleObj
+Purple::NotifySearchColumn		T_PurpleObj
+Purple::NotifySearchButton		T_PurpleObj
+Purple::NotifyType			T_IV
+Purple::NotifyUiOps			T_PurpleObj
+Purple::NotifyUserInfo			T_PurpleObj
+Purple::NotifyUserInfoEntry		T_PurpleObj
+
+Purple::Plugin				T_PurpleObj
+Purple::PluginType			T_IV
+Purple::PluginUiInfo			T_PurpleObj
+Purple::Plugin::Action			T_PurpleObj
+Purple::Plugin::Info			T_PurpleObj
+Purple::Plugin::Loader::Info		T_PurpleObj
+Purple::Plugin::Protocol::Info		T_PurpleObj
+Purple::PrefType				T_IV
+Purple::PluginPref			T_PurpleObj
+Purple::PluginPrefType			T_IV
+Purple::PluginPref::Frame			T_PurpleObj
+Purple::Pounce				T_PurpleObj
+Purple::PounceEvent			T_IV
+Purple::Presence				T_PurpleObj
+Purple::PrivacyType			T_IV
+Purple::Privacy::UiOps			T_PurpleObj
+Purple::ProtocolOptions			T_IV
+Purple::ProxyInfo				T_PurpleObj
+Purple::ProxyType				T_IV
+
+Purple::RequestFieldType			T_IV
+Purple::RequestType			T_IV
+Purple::Request::Field			T_PurpleObj
+Purple::Request::Fields			T_PurpleObj
+Purple::Request::Field::Group		T_PurpleObj
+Purple::Request::UiOps			T_PurpleObj
+
+Purple::Roomlist				T_PurpleObj
+Purple::Roomlist::Room			T_PurpleObj
+Purple::Roomlist::Field			T_PurpleObj
+Purple::Roomlist::UiOps			T_PurpleObj
+Purple::RoomlistFieldType			T_IV
+Purple::RoomlistRoomType			T_IV
+
+Purple::SavedStatus			T_PurpleObj
+Purple::SavedStatusSub			T_PurpleObj
+Purple::SoundEventID			T_IV
+Purple::Sound::UiOps			T_PurpleObj
+
+Purple::Input::Condition			T_PurpleObj
+Purple::SslErrorType			T_IV
+Purple::Ssl::Connection			T_PurpleObj
+Purple::Ssl::Ops				T_PurpleObj
+
+Purple::Presence				T_PurpleObj
+Purple::PresenceContext			T_IV
+Purple::Status				T_PurpleObj
+Purple::StatusAttr			T_PurpleObj
+Purple::StatusPrimitive			T_IV
+Purple::StatusType			T_PurpleObj
+const Purple::StatusType			T_PurpleObj
+
+Purple::StoredImage			T_PurpleObj
+Purple::Stringref				T_PurpleObj
+Purple::Util::FetchUrlData	T_PTR
+Purple::Util::InfoFieldFormatCallback	T_PTR
+Purple::Value				T_PurpleObj
+
+Purple::Xfer				T_PurpleObj
+Purple::XferType				T_IV
+Purple::XferStatusType			T_IV
+Purple::XferUiOps				T_IV
+
+Purple::XMLNode				T_PurpleObj
 XMLNode::Type				T_IV
 
 /* enums */
@@ -175,29 +175,29 @@ XMLNode::Type				T_IV
 /* blist.h */
 
 /* debug.h */
-Gaim::DebugLevel			T_IV
+Purple::DebugLevel			T_IV
 
 /* conversation.h */
-Gaim::ConvChatBuddyFlags		T_IV
-Gaim::ConvUpdateType			T_IV
-Gaim::ConversationType			T_IV
-Gaim::MessageFlags			T_IV
-Gaim::TypingState			T_IV
-Gaim::UnseenState			T_IV
+Purple::ConvChatBuddyFlags		T_IV
+Purple::ConvUpdateType			T_IV
+Purple::ConversationType			T_IV
+Purple::MessageFlags			T_IV
+Purple::TypingState			T_IV
+Purple::UnseenState			T_IV
 
 /* connection.h */
-Gaim::ConnectionFlags			T_IV
-Gaim::ConnectionState			T_IV
+Purple::ConnectionFlags			T_IV
+Purple::ConnectionState			T_IV
 
 INPUT
 
-T_GaimObj
-	$var = gaim_perl_ref_object($arg)
+T_PurpleObj
+	$var = purple_perl_ref_object($arg)
 
 OUTPUT
 
-T_GaimObj
-	$arg = gaim_perl_bless_object($var, \"$type\");
+T_PurpleObj
+	$arg = purple_perl_bless_object($var, \"$type\");
 
 T_GCHAR_OWN
 	/* used when we can directly own the returned string. */
diff --git a/libpurple/plugins/perl/scripts/account.pl b/libpurple/plugins/perl/scripts/account.pl
index e4bc2ca282..6c853adb62 100644
--- a/libpurple/plugins/perl/scripts/account.pl
+++ b/libpurple/plugins/perl/scripts/account.pl
@@ -1,8 +1,8 @@
 $MODULE_NAME = "Account Functions Test";
 
-use Gaim;
+use Purple;
 
-# All the information Gaim gets about our nifty plugin
+# All the information Purple gets about our nifty plugin
 %PLUGIN_INFO = (
 	perl_api_version => 2,
 	name => "Perl: $MODULE_NAME",
@@ -40,40 +40,40 @@ sub plugin_init {
 sub plugin_load {
 	my $plugin = shift;
 	print "#" x 80 . "\n\n";
-	Gaim::Debug::info($MODULE_NAME, "plugin_load() - Testing $MODULE_NAME Started.");
+	Purple::Debug::info($MODULE_NAME, "plugin_load() - Testing $MODULE_NAME Started.");
 	print "\n\n";
 
 
 	#################################
 	#				#
-	#	Gaim::Account::Option	#
+	#	Purple::Account::Option	#
 	#				#
 	#################################
 
-	print "Testing: Gaim::Account::Option::new()...\n";
-	$acc_opt  = Gaim::Account::Option->new(1, "TEXT", "pref_name");
-	$acc_opt2 = Gaim::Account::Option->bool_new("TeXt", "MYprefName", 1);
+	print "Testing: Purple::Account::Option::new()...\n";
+	$acc_opt  = Purple::Account::Option->new(1, "TEXT", "pref_name");
+	$acc_opt2 = Purple::Account::Option->bool_new("TeXt", "MYprefName", 1);
 
 	#################################
 	#				#
-	#	Gaim::Account		#
+	#	Purple::Account		#
 	#				#
 	#################################
 
 
-	print "Testing: Gaim::Account::new()... ";
-	$account = Gaim::Account->new($TEST_NAME, $PROTOCOL_ID);
+	print "Testing: Purple::Account::new()... ";
+	$account = Purple::Account->new($TEST_NAME, $PROTOCOL_ID);
 	if ($account) { print "ok.\n"; } else { print "fail.\n"; }
 
-	print "Testing: Gaim::Accounts::add()...";
-	Gaim::Accounts::add($account);
+	print "Testing: Purple::Accounts::add()...";
+	Purple::Accounts::add($account);
 	print "pending find...\n";
 
-	print "Testing: Gaim::Accounts::find()...";
-	$account = Gaim::Accounts::find($TEST_NAME, $PROTOCOL_ID);
+	print "Testing: Purple::Accounts::find()...";
+	$account = Purple::Accounts::find($TEST_NAME, $PROTOCOL_ID);
 	if ($account) { print "ok.\n"; } else { print "fail.\n"; }
 
-	print "Testing: Gaim::Account::get_username()... ";
+	print "Testing: Purple::Account::get_username()... ";
 	$user_name = $account->get_username();
 	if ($user_name) {
 		print "Success: $user_name.\n";
@@ -81,28 +81,28 @@ sub plugin_load {
 		print "Failed!\n";
 	}
 
-	print "Testing: Gaim::Account::is_connected()... ";
+	print "Testing: Purple::Account::is_connected()... ";
 	if ($account->is_connected()) {
 		print " Connected.\n";
 	} else {
 		print " Disconnected.\n";
 	}
 
-	print "Testing: Gaim::Accounts::get_active_status()... ";
+	print "Testing: Purple::Accounts::get_active_status()... ";
 	if ($account->get_active_status()) {
 		print "Okay.\n";
 	} else {
 		print "Failed!\n";
 	}
 
-	$account = Gaim::Accounts::find($USERNAME, $PROTOCOL_ID);
-	print "Testing: Gaim::Accounts::connect()...pending...\n";
+	$account = Purple::Accounts::find($USERNAME, $PROTOCOL_ID);
+	print "Testing: Purple::Accounts::connect()...pending...\n";
 
 	$account->set_status("available", TRUE);
 	$account->connect();
 
 	print "\n\n";
-	Gaim::Debug::info($MODULE_NAME, "plugin_load() - Testing $MODULE_NAME Completed.\n");
+	Purple::Debug::info($MODULE_NAME, "plugin_load() - Testing $MODULE_NAME Completed.\n");
 	print "\n\n" . "#" x 80 . "\n\n";
 }
 
@@ -110,13 +110,13 @@ sub plugin_unload {
 	my $plugin = shift;
 
 	print "#" x 80 . "\n\n";
-	Gaim::Debug::info($MODULE_NAME, "plugin_unload() - Testing $MODULE_NAME Started.\n");
+	Purple::Debug::info($MODULE_NAME, "plugin_unload() - Testing $MODULE_NAME Started.\n");
 	print "\n\n";
 
 	#########  TEST CODE HERE  ##########
 
 	print "\n\n";
-	Gaim::Debug::info($MODULE_NAME, "plugin_unload() - Testing $MODULE_NAME Completed.\n");
+	Purple::Debug::info($MODULE_NAME, "plugin_unload() - Testing $MODULE_NAME Completed.\n");
 	print "\n\n" . "#" x 80 . "\n\n";
 }
 
diff --git a/libpurple/plugins/perl/scripts/buddy_list.pl b/libpurple/plugins/perl/scripts/buddy_list.pl
index 3aef6487ae..4da756d084 100644
--- a/libpurple/plugins/perl/scripts/buddy_list.pl
+++ b/libpurple/plugins/perl/scripts/buddy_list.pl
@@ -1,8 +1,8 @@
 $MODULE_NAME = "Buddy List Test";
 
-use Gaim;
+use Purple;
 
-# All the information Gaim gets about our nifty plugin
+# All the information Purple gets about our nifty plugin
 %PLUGIN_INFO = (
 	perl_api_version => 2,
 	name => "Perl: $MODULE_NAME",
@@ -39,49 +39,49 @@ sub plugin_load {
 
 	# This is how we get an account to use in the following tests.  You should replace the username
 	#  with an existing user
-	$account = Gaim::Accounts::find($USERNAME, $PROTOCOL_ID);
+	$account = Purple::Accounts::find($USERNAME, $PROTOCOL_ID);
 
-	# Testing a find function: Note Gaim::Find not Gaim::Buddy:find!
+	# Testing a find function: Note Purple::Find not Purple::Buddy:find!
 	#  Furthermore, this should work the same for chats and groups
-	Gaim::Debug::info($MODULE_NAME, "Testing: Gaim::Find::buddy()...");
-	$buddy = Gaim::Find::buddy($account, $TEST_NAME);
-	Gaim::Debug::info("", ($buddy ? "ok." : "fail.") . "\n");
+	Purple::Debug::info($MODULE_NAME, "Testing: Purple::Find::buddy()...");
+	$buddy = Purple::Find::buddy($account, $TEST_NAME);
+	Purple::Debug::info("", ($buddy ? "ok." : "fail.") . "\n");
 
 	# If you should need the handle for some reason, here is how you do it
-	Gaim::Debug::info($MODULE_NAME, "Testing: Gaim::BuddyList::get_handle()...");
-	$handle = Gaim::BuddyList::get_handle();
-	Gaim::Debug::info("", ($handle ? "ok." : "fail.") . "\n");
+	Purple::Debug::info($MODULE_NAME, "Testing: Purple::BuddyList::get_handle()...");
+	$handle = Purple::BuddyList::get_handle();
+	Purple::Debug::info("", ($handle ? "ok." : "fail.") . "\n");
 
-	# This gets the Gaim::BuddyList and references it by $blist
-	Gaim::Debug::info($MODULE_NAME, "Testing: Gaim::get_blist()...");
-	$blist = Gaim::get_blist();
-	Gaim::Debug::info("", ($blist ? "ok." : "fail.") . "\n");
+	# This gets the Purple::BuddyList and references it by $blist
+	Purple::Debug::info($MODULE_NAME, "Testing: Purple::get_blist()...");
+	$blist = Purple::get_blist();
+	Purple::Debug::info("", ($blist ? "ok." : "fail.") . "\n");
 
 	# This is how you would add a buddy named $TEST_NAME" with the alias $TEST_ALIAS
-	Gaim::Debug::info($MODULE_NAME, "Testing: Gaim::BuddyList::Buddy::new...");
-	$buddy = Gaim::BuddyList::Buddy::new($account, $TEST_NAME, $TEST_ALIAS);
-	Gaim::Debug::info("", ($buddy ? "ok." : "fail.") . "\n");
+	Purple::Debug::info($MODULE_NAME, "Testing: Purple::BuddyList::Buddy::new...");
+	$buddy = Purple::BuddyList::Buddy::new($account, $TEST_NAME, $TEST_ALIAS);
+	Purple::Debug::info("", ($buddy ? "ok." : "fail.") . "\n");
 
 	# Here we add the new buddy '$buddy' to the group $TEST_GROUP
 	#  so first we must find the group
-	Gaim::Debug::info($MODULE_NAME, "Testing: Gaim::Find::group...");
-	$group = Gaim::Find::group($TEST_GROUP);
-	Gaim::Debug::info("", ($group ? "ok." : "fail.") . "\n");
+	Purple::Debug::info($MODULE_NAME, "Testing: Purple::Find::group...");
+	$group = Purple::Find::group($TEST_GROUP);
+	Purple::Debug::info("", ($group ? "ok." : "fail.") . "\n");
 
 	# To add the buddy we need to have the buddy, contact, group and node for insertion.
 	#  For this example we can let contact be undef and set the insertion node as the group
-	Gaim::Debug::info($MODULE_NAME, "Testing: Gaim::BuddyList::add_buddy...\n");
-	Gaim::BuddyList::add_buddy($buddy, undef, $group, $group);
+	Purple::Debug::info($MODULE_NAME, "Testing: Purple::BuddyList::add_buddy...\n");
+	Purple::BuddyList::add_buddy($buddy, undef, $group, $group);
 
 	# The example that follows gives an indication of how an API call that returns a list is handled.
 	#  In this case the buddies of the account found earlier are retrieved and put in an array '@buddy_array'
 	#  Further down an accessor method is used, 'get_name()' -- see source for details on the full set of methods
-	Gaim::Debug::info($MODULE_NAME,  "Testing: Gaim::Find::buddies...\n");
-	@buddy_array = Gaim::Find::buddies($account, undef);
+	Purple::Debug::info($MODULE_NAME,  "Testing: Purple::Find::buddies...\n");
+	@buddy_array = Purple::Find::buddies($account, undef);
 	if (@buddy_array) {
-		Gaim::Debug::info($MODULE_NAME, "Buddies in list (" . @buddy_array . "): \n");
+		Purple::Debug::info($MODULE_NAME, "Buddies in list (" . @buddy_array . "): \n");
 		foreach $bud (@buddy_array) {
-			Gaim::Debug::info($MODULE_NAME, Gaim::BuddyList::Buddy::get_name($bud) . "\n");
+			Purple::Debug::info($MODULE_NAME, Purple::BuddyList::Buddy::get_name($bud) . "\n");
 		}
 	}
 }
@@ -92,13 +92,13 @@ sub plugin_unload {
 	print "#" x 80 . "\n\n";
 	#########  TEST CODE HERE  ##########
 
-	print "Testing: Gaim::Find::buddy()...";
-	$buddy = Gaim::Find::buddy($account, $TEST_NAME . TEST);
+	print "Testing: Purple::Find::buddy()...";
+	$buddy = Purple::Find::buddy($account, $TEST_NAME . TEST);
 	if ($buddy) {
 		print "ok.\n";
-		print "Testing: Gaim::BuddyList::remove_buddy()...";
-		Gaim::BuddyList::remove_buddy($buddy);
-		if (Gaim::Find::buddy($account, $TEST_NAME . TEST)) { print "fail.\n"; } else { print "ok.\n"; }
+		print "Testing: Purple::BuddyList::remove_buddy()...";
+		Purple::BuddyList::remove_buddy($buddy);
+		if (Purple::Find::buddy($account, $TEST_NAME . TEST)) { print "fail.\n"; } else { print "ok.\n"; }
 	} else { print "fail.\n"; }
 
 
diff --git a/libpurple/plugins/perl/scripts/conversation.pl b/libpurple/plugins/perl/scripts/conversation.pl
index a04273f2be..0a559deb07 100644
--- a/libpurple/plugins/perl/scripts/conversation.pl
+++ b/libpurple/plugins/perl/scripts/conversation.pl
@@ -1,8 +1,8 @@
 $MODULE_NAME = "Conversation Test";
 
-use Gaim;
+use Purple;
 
-# All the information Gaim gets about our nifty plugin
+# All the information Purple gets about our nifty plugin
 %PLUGIN_INFO = ( 
 	perl_api_version => 2, 
 	name => "Perl: $MODULE_NAME", 
@@ -45,27 +45,27 @@ sub plugin_load {
 	print "#" x 80 . "\n\n";
 
 	print "PERL: Finding account.\n";
-	$account = Gaim::Accounts::find($USERNAME, $PROTOCOL_ID);
+	$account = Purple::Accounts::find($USERNAME, $PROTOCOL_ID);
 	
 	#########  TEST CODE HERE  ##########
 	# First we create two new conversations.
-	print "Testing Gaim::Conversation::new()...";
-	$conv1 = Gaim::Conversation->new(1, $account, "Test Conversation 1");
+	print "Testing Purple::Conversation::new()...";
+	$conv1 = Purple::Conversation->new(1, $account, "Test Conversation 1");
 	if ($conv1) { print "ok.\n"; } else { print "fail.\n"; }
 
-	print "Testing Gaim::Conversation::new()...";
-	$conv2 = Gaim::Conversation->new(1, $account, "Test Conversation 2");
+	print "Testing Purple::Conversation::new()...";
+	$conv2 = Purple::Conversation->new(1, $account, "Test Conversation 2");
 	if ($conv2) { print "ok.\n"; } else { print "fail.\n"; }
 	
 	# Second we create a window to display the conversations in.
-	#  Note that the package here is Gaim::Conversation::Window
-	print "Testing Gaim::Conversation::Window::new()...\n";
-	$win = Gaim::Conversation::Window::new();
+	#  Note that the package here is Purple::Conversation::Window
+	print "Testing Purple::Conversation::Window::new()...\n";
+	$win = Purple::Conversation::Window::new();
 
 	# The third thing to do is to add the two conversations to the windows.
 	# The subroutine add_conversation() returns the number of conversations
 	# present in the window.
-	print "Testing Gaim::Conversation::Window::add_conversation()...";
+	print "Testing Purple::Conversation::Window::add_conversation()...";
 	$conv_count = $conv1->add_conversation();
 	if ($conv_count) { 
 		print "ok..." . $conv_count . " conversations...\n";
@@ -73,7 +73,7 @@ sub plugin_load {
 		print "fail.\n";
 	}
 
-	print "Testing Gaim::Conversation::Window::add_conversation()...";
+	print "Testing Purple::Conversation::Window::add_conversation()...";
 	$conv_count = $win->add_conversation($conv2);
 	if ($conv_count) {
 		print "ok..." . $conv_count . " conversations...\n";
@@ -82,19 +82,19 @@ sub plugin_load {
 	}
 
 	# Now the window is displayed to the user.
-	print "Testing Gaim::Conversation::Window::show()...\n";
+	print "Testing Purple::Conversation::Window::show()...\n";
 	$win->show();
 
 	# Use get_im_data() to get a handle for the conversation	
-	print "Testing Gaim::Conversation::get_im_data()...\n";
+	print "Testing Purple::Conversation::get_im_data()...\n";
 	$im = $conv1->get_im_data();
 	if ($im) { print "ok.\n"; } else { print "fail.\n"; }
 
 	# Here we send messages to the conversation
-	print "Testing Gaim::Conversation::IM::send()...\n";
+	print "Testing Purple::Conversation::IM::send()...\n";
 	$im->send("Message Test.");
 
-	print "Testing Gaim::Conversation::IM::write()...\n";
+	print "Testing Purple::Conversation::IM::write()...\n";
 	$im->write("SENDER", "<b>Message</b> Test.", 0, 0);
 	
 	print "#" x 80 . "\n\n";
@@ -106,11 +106,11 @@ sub plugin_unload {
 	print "#" x 80 . "\n\n";
 	#########  TEST CODE HERE  ##########
 
-	print "Testing Gaim::Conversation::Window::get_conversation_count()...\n";
+	print "Testing Purple::Conversation::Window::get_conversation_count()...\n";
 	$conv_count = $win->get_conversation_count();
 	print "...and it returned $conv_count.\n";
 	if ($conv_count > 0) {
-	        print "Testing Gaim::Conversation::Window::destroy()...\n";
+	        print "Testing Purple::Conversation::Window::destroy()...\n";
 	        $win->destroy();
 	}
 	
diff --git a/libpurple/plugins/perl/scripts/count_down.pl b/libpurple/plugins/perl/scripts/count_down.pl
index d1a22fcded..ad4831669f 100644
--- a/libpurple/plugins/perl/scripts/count_down.pl
+++ b/libpurple/plugins/perl/scripts/count_down.pl
@@ -1,4 +1,4 @@
-use Gaim;
+use Purple;
 
 %PLUGIN_INFO = ( 
 	perl_api_version => 2, 
@@ -28,7 +28,7 @@ sub plugin_load {
 	my $plugin = shift; 
 	
 	# Retrieve all the accounts
-	@accounts = Gaim::Accounts::get_all();
+	@accounts = Purple::Accounts::get_all();
 	
 	print "NUM OF ACCS: " . $accounts . "\n";
 	# Search each account's user info for our tag
@@ -68,7 +68,7 @@ sub hello {
 	my ($widget, $window) = @_;
 	print "Called from sub hello!\n ";
 	print "Test var: " . $GLOBAL_TEST_VAR . " \n";
-	@accounts = Gaim::Accounts::get_all();
+	@accounts = Purple::Accounts::get_all();
 	$acc = $accounts[0];
 	$user_info = $acc->get_user_info();
 	print "USER INFO from sub hello: " . $user_info . "\n";
diff --git a/libpurple/plugins/perl/scripts/gtk_frame_test.pl b/libpurple/plugins/perl/scripts/gtk_frame_test.pl
index 5569b39368..cad3f39329 100644
--- a/libpurple/plugins/perl/scripts/gtk_frame_test.pl
+++ b/libpurple/plugins/perl/scripts/gtk_frame_test.pl
@@ -1,6 +1,6 @@
 $MODULE_NAME = "GTK Frame Test";
 
-use Gaim;
+use Purple;
 
 %PLUGIN_INFO = ( 
 	perl_api_version => 2, 
@@ -57,7 +57,7 @@ sub plugin_load {
 	print "$MODULE_NAME: Loading...\n";
 	
 	
-	Gaim::debug_info("plugin_load()", "Testing $MODULE_NAME Completed.");
+	Purple::debug_info("plugin_load()", "Testing $MODULE_NAME Completed.");
 	print "#" x 80 . "\n\n";
 } 
 
diff --git a/libpurple/plugins/perl/scripts/plugin_action.pl b/libpurple/plugins/perl/scripts/plugin_action.pl
index 04f28edb08..826e626545 100644
--- a/libpurple/plugins/perl/scripts/plugin_action.pl
+++ b/libpurple/plugins/perl/scripts/plugin_action.pl
@@ -1,5 +1,5 @@
 $MODULE_NAME = "Plugin Action Test Plugin";
-use Gaim;
+use Purple;
 
 sub plugin_init {
 	return %PLUGIN_INFO;
@@ -42,7 +42,7 @@ sub plugin_action_names {
 	return @array;
 }
 
-# All the information Gaim gets about our nifty plugin
+# All the information Purple gets about our nifty plugin
 %PLUGIN_INFO = (
 	perl_api_version => 2,
 	name => "Perl: $MODULE_NAME",
diff --git a/libpurple/plugins/perl/scripts/plugin_pref.pl b/libpurple/plugins/perl/scripts/plugin_pref.pl
index 4a763356b4..a30b3e1476 100644
--- a/libpurple/plugins/perl/scripts/plugin_pref.pl
+++ b/libpurple/plugins/perl/scripts/plugin_pref.pl
@@ -1,6 +1,6 @@
 $MODULE_NAME = "Prefs Functions Test";
-use Gaim;
-# All the information Gaim gets about our nifty plugin
+use Purple;
+# All the information Purple gets about our nifty plugin
 %PLUGIN_INFO = ( 
 	perl_api_version => 2, 
 	name => "Perl: $MODULE_NAME",
@@ -31,24 +31,24 @@ use Gaim;
 	my $PROTOCOL_ID 	= "prpl-oscar";
 
 sub foo {
-	$frame = Gaim::PluginPref::Frame->new();
+	$frame = Purple::PluginPref::Frame->new();
 
-	$ppref = Gaim::PluginPref->new_with_label("boolean");
+	$ppref = Purple::PluginPref->new_with_label("boolean");
 	$frame->add($ppref);
 	
-	$ppref = Gaim::PluginPref->new_with_name_and_label(
+	$ppref = Purple::PluginPref->new_with_name_and_label(
 	    "/plugins/core/perl_test/bool", "Boolean Preference");
 	$frame->add($ppref);
 
 		
-	$ppref = Gaim::PluginPref->new_with_name_and_label(
+	$ppref = Purple::PluginPref->new_with_name_and_label(
 	    "/plugins/core/perl_test/choice", "Choice Preference");
 	$ppref->set_type(1);
 	$ppref->add_choice("ch0", $frame);
 	$ppref->add_choice("ch1", $frame);
 	$frame->add($ppref);
 	
-	$ppref = Gaim::PluginPref->new_with_name_and_label(
+	$ppref = Purple::PluginPref->new_with_name_and_label(
 	    "/plugins/core/perl_test/text", "Text Box Preference");
 	$ppref->set_max_length(16);
 	$frame->add($ppref);
@@ -71,10 +71,10 @@ sub plugin_load {
 
 	#########  TEST CODE HERE  ##########
 
-	Gaim::Prefs::add_none("/plugins/core/perl_test");
-	Gaim::Prefs::add_bool("/plugins/core/perl_test/bool", 1);	
-	Gaim::Prefs::add_string("/plugins/core/perl_test/choice", "ch1");	
-	Gaim::Prefs::add_string("/plugins/core/perl_test/text", "Foobar");	
+	Purple::Prefs::add_none("/plugins/core/perl_test");
+	Purple::Prefs::add_bool("/plugins/core/perl_test/bool", 1);	
+	Purple::Prefs::add_string("/plugins/core/perl_test/choice", "ch1");	
+	Purple::Prefs::add_string("/plugins/core/perl_test/text", "Foobar");	
 	
 
 	print "\n\n" . "#" x 80 . "\n\n";
diff --git a/libpurple/plugins/perl/scripts/request.pl b/libpurple/plugins/perl/scripts/request.pl
index 1bed69f28f..7914aa7e7e 100644
--- a/libpurple/plugins/perl/scripts/request.pl
+++ b/libpurple/plugins/perl/scripts/request.pl
@@ -1,8 +1,8 @@
 $MODULE_NAME = "Request Functions Test";
 
-use Gaim;
+use Purple;
 
-# All the information Gaim gets about our nifty plugin
+# All the information Purple gets about our nifty plugin
 %PLUGIN_INFO = (
 	perl_api_version => 2,
 	name => "Perl: $MODULE_NAME",
@@ -36,28 +36,28 @@ sub plugin_init {
 sub ok_cb_test {
 	$fields = shift;
 
-	Gaim::Debug::info($MODULE_NAME, "plugin_action_cb_test: BEGIN\n");
-	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: BEGIN\n");
-	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: Button Click\n");
-	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: Field Type:  $fields \n");
-	$account = Gaim::Request::Fields::get_account($fields, "acct_test");
-	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: Username of selected account: " . Gaim::Account::get_username($account) . "\n");
-	$int = Gaim::Request::Fields::get_integer($fields, "int_test");
-	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: Integer Value: $int \n");
-	$choice = Gaim::Request::Fields::get_choice($fields, "ch_test");
-	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: Choice Value: $choice \n");
-	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: END\n");
+	Purple::Debug::info($MODULE_NAME, "plugin_action_cb_test: BEGIN\n");
+	Purple::Debug::info($MODULE_NAME, "ok_cb_test: BEGIN\n");
+	Purple::Debug::info($MODULE_NAME, "ok_cb_test: Button Click\n");
+	Purple::Debug::info($MODULE_NAME, "ok_cb_test: Field Type:  $fields \n");
+	$account = Purple::Request::Fields::get_account($fields, "acct_test");
+	Purple::Debug::info($MODULE_NAME, "ok_cb_test: Username of selected account: " . Purple::Account::get_username($account) . "\n");
+	$int = Purple::Request::Fields::get_integer($fields, "int_test");
+	Purple::Debug::info($MODULE_NAME, "ok_cb_test: Integer Value: $int \n");
+	$choice = Purple::Request::Fields::get_choice($fields, "ch_test");
+	Purple::Debug::info($MODULE_NAME, "ok_cb_test: Choice Value: $choice \n");
+	Purple::Debug::info($MODULE_NAME, "ok_cb_test: END\n");
 }
 
 sub cancel_cb_test {
-	Gaim::Debug::info($MODULE_NAME, "cancel_cb_test: Button Click\n");
+	Purple::Debug::info($MODULE_NAME, "cancel_cb_test: Button Click\n");
 }
 
 sub plugin_action_test {
 	$plugin = shift;
-	Gaim::Debug::info($MODULE_NAME, "plugin_action_cb_test: BEGIN\n");
+	Purple::Debug::info($MODULE_NAME, "plugin_action_cb_test: BEGIN\n");
 	plugin_request($plugin);
-	Gaim::Debug::info($MODULE_NAME, "plugin_action_cb_test: END\n");
+	Purple::Debug::info($MODULE_NAME, "plugin_action_cb_test: END\n");
 }
 
 sub plugin_load {
@@ -68,27 +68,27 @@ sub plugin_load {
 }
 
 sub plugin_request {
-	$group = Gaim::Request::Field::Group::new("Group Name");
-	$field = Gaim::Request::Field::account_new("acct_test", "Account Text", undef);
-	Gaim::Request::Field::account_set_show_all($field, 0);
-	Gaim::Request::Field::Group::add_field($group, $field);
+	$group = Purple::Request::Field::Group::new("Group Name");
+	$field = Purple::Request::Field::account_new("acct_test", "Account Text", undef);
+	Purple::Request::Field::account_set_show_all($field, 0);
+	Purple::Request::Field::Group::add_field($group, $field);
 
-	$field = Gaim::Request::Field::int_new("int_test", "Integer Text", 33);
-	Gaim::Request::Field::Group::add_field($group, $field);
+	$field = Purple::Request::Field::int_new("int_test", "Integer Text", 33);
+	Purple::Request::Field::Group::add_field($group, $field);
 
 	# Test field choice
-	$field = Gaim::Request::Field::choice_new("ch_test", "Choice Text", 1);
-	Gaim::Request::Field::choice_add($field, "Choice 0");
-	Gaim::Request::Field::choice_add($field, "Choice 1");
-	Gaim::Request::Field::choice_add($field, "Choice 2");
+	$field = Purple::Request::Field::choice_new("ch_test", "Choice Text", 1);
+	Purple::Request::Field::choice_add($field, "Choice 0");
+	Purple::Request::Field::choice_add($field, "Choice 1");
+	Purple::Request::Field::choice_add($field, "Choice 2");
 
-	Gaim::Request::Field::Group::add_field($group, $field);
+	Purple::Request::Field::Group::add_field($group, $field);
 
 
-	$request = Gaim::Request::Fields::new();
-	Gaim::Request::Fields::add_group($request, $group);
+	$request = Purple::Request::Fields::new();
+	Purple::Request::Fields::add_group($request, $group);
 
-	Gaim::Request::fields(
+	Purple::Request::fields(
 		$plugin,
 		"Request Title!",
 		"Primary Title",
@@ -100,10 +100,10 @@ sub plugin_request {
 
 sub plugin_unload {
 	my $plugin = shift;
-	Gaim::Debug::info($MODULE_NAME, "#" x 80 . "\n");
+	Purple::Debug::info($MODULE_NAME, "#" x 80 . "\n");
 	#########  TEST CODE HERE  ##########
 
 
-	Gaim::Debug::info($MODULE_NAME, "\n" . "#" x 80 . "\n");
+	Purple::Debug::info($MODULE_NAME, "\n" . "#" x 80 . "\n");
 }