diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 9728c3f..c9439ea 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -16,6 +16,7 @@ from . xmlstream.handler.xmlcallback import XMLCallback
 from . xmlstream.handler.xmlwaiter import XMLWaiter
 from . xmlstream.handler.waiter import Waiter
 from . xmlstream.handler.callback import Callback
+from . xmlstream.stanzabase import registerStanzaPlugin
 from . import plugins
 from . stanza.message import Message
 from . stanza.iq import Iq
@@ -35,12 +36,6 @@ if sys.version_info < (3,0):
 	reload(sys)
 	sys.setdefaultencoding('utf8')
 
-
-def stanzaPlugin(stanza, plugin):
-	stanza.plugin_attrib_map[plugin.plugin_attrib] = plugin
-	stanza.plugin_tag_map["{%s}%s" % (plugin.namespace, plugin.name)] = plugin
-
-
 class basexmpp(object):
 	def __init__(self):
 		self.id = 0
@@ -62,13 +57,9 @@ class basexmpp(object):
 		self.registerStanza(Message)
 		self.registerStanza(Iq)
 		self.registerStanza(Presence)
-		self.stanzaPlugin(Iq, Roster)
-		self.stanzaPlugin(Message, Nick)
-		self.stanzaPlugin(Message, HTMLIM)
-
-	def stanzaPlugin(self, stanza, plugin):
-		stanza.plugin_attrib_map[plugin.plugin_attrib] = plugin
-		stanza.plugin_tag_map["{%s}%s" % (plugin.namespace, plugin.name)] = plugin
+		registerStanzaPlugin(Iq, Roster)
+		registerStanzaPlugin(Message, Nick)
+		registerStanzaPlugin(Message, HTMLIM)
 	
 	def Message(self, *args, **kwargs):
 		return Message(self, *args, **kwargs)
diff --git a/sleekxmpp/plugins/alt_0004.py b/sleekxmpp/plugins/alt_0004.py
index b38a491..ff9b7ef 100644
--- a/sleekxmpp/plugins/alt_0004.py
+++ b/sleekxmpp/plugins/alt_0004.py
@@ -11,7 +11,7 @@ import copy
 from . import base
 from .. xmlstream.handler.callback import Callback
 from .. xmlstream.matcher.xpath import MatchXPath
-from .. xmlstream.stanzabase import ElementBase, ET, JID
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID
 from .. stanza.message import Message
 
 
@@ -318,9 +318,9 @@ class alt_0004(base.base_plugin):
 								   Form.namespace)),
 				 self.handle_form))
 
-		self.xmpp.stanzaPlugin(FormField, FieldOption)
-		self.xmpp.stanzaPlugin(Form, FormField)
-		self.xmpp.stanzaPlugin(Message, Form)
+		registerStanzaPlugin(FormField, FieldOption)
+		registerStanzaPlugin(Form, FormField)
+		registerStanzaPlugin(Message, Form)
 	
 	def post_init(self):
 		base.base_plugin.post_init(self)
diff --git a/sleekxmpp/plugins/gmail_notify.py b/sleekxmpp/plugins/gmail_notify.py
index acfc38b..fb1ecb3 100644
--- a/sleekxmpp/plugins/gmail_notify.py
+++ b/sleekxmpp/plugins/gmail_notify.py
@@ -10,7 +10,7 @@ import logging
 from . import base
 from .. xmlstream.handler.callback import Callback
 from .. xmlstream.matcher.xpath import MatchXPath
-from .. xmlstream.stanzabase import ElementBase, ET, JID
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID
 from .. stanza.iq import Iq
 
 
@@ -109,9 +109,9 @@ class gmail_notify(base.base_plugin):
                                                    NewMail.name)),
                      self.handle_new_mail))
         
-        self.xmpp.stanzaPlugin(Iq, GmailQuery)
-        self.xmpp.stanzaPlugin(Iq, MailBox)
-        self.xmpp.stanzaPlugin(Iq, NewMail)
+        registerStanzaPlugin(Iq, GmailQuery)
+        registerStanzaPlugin(Iq, MailBox)
+        registerStanzaPlugin(Iq, NewMail)
 
         self.last_result_time = None
 
diff --git a/sleekxmpp/plugins/stanza_pubsub.py b/sleekxmpp/plugins/stanza_pubsub.py
index 1a1526f..e04f1a7 100644
--- a/sleekxmpp/plugins/stanza_pubsub.py
+++ b/sleekxmpp/plugins/stanza_pubsub.py
@@ -1,4 +1,4 @@
-from .. xmlstream.stanzabase import ElementBase, ET, JID
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID
 from .. stanza.iq import Iq
 from .. stanza.message import Message
 from .. basexmpp import basexmpp
@@ -6,9 +6,6 @@ from .. xmlstream.xmlstream import XMLStream
 import logging
 from . import xep_0004
 
-def stanzaPlugin(stanza, plugin):                                                                       
-	stanza.plugin_attrib_map[plugin.plugin_attrib] = plugin                                             
-	stanza.plugin_tag_map["{%s}%s" % (plugin.namespace, plugin.name)] = plugin 
 
 class PubsubState(ElementBase):
 	namespace = 'http://jabber.org/protocol/psstate'
@@ -30,7 +27,7 @@ class PubsubState(ElementBase):
 		for child in self.xml.getchildren():
 			self.xml.remove(child)
 
-stanzaPlugin(Iq, PubsubState)
+registerStanzaPlugin(Iq, PubsubState)
 
 class PubsubStateEvent(ElementBase):
 	namespace = 'http://jabber.org/protocol/psstate#event'
@@ -40,8 +37,8 @@ class PubsubStateEvent(ElementBase):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(Message, PubsubStateEvent)
-stanzaPlugin(PubsubStateEvent, PubsubState)
+registerStanzaPlugin(Message, PubsubStateEvent)
+registerStanzaPlugin(PubsubStateEvent, PubsubState)
 
 class Pubsub(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub'
@@ -51,7 +48,7 @@ class Pubsub(ElementBase):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(Iq, Pubsub)
+registerStanzaPlugin(Iq, Pubsub)
 
 class PubsubOwner(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub#owner'
@@ -61,7 +58,7 @@ class PubsubOwner(ElementBase):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(Iq, PubsubOwner)
+registerStanzaPlugin(Iq, PubsubOwner)
 
 class Affiliation(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub'
@@ -86,7 +83,7 @@ class Affiliations(ElementBase):
 		self.xml.append(affiliation.xml)
 		return self.iterables.append(affiliation)
 
-stanzaPlugin(Pubsub, Affiliations)
+registerStanzaPlugin(Pubsub, Affiliations)
 
 
 class Subscription(ElementBase):
@@ -103,7 +100,7 @@ class Subscription(ElementBase):
 	def getjid(self):
 		return jid(self._getattr('jid'))
 
-stanzaPlugin(Pubsub, Subscription)
+registerStanzaPlugin(Pubsub, Subscription)
 
 class Subscriptions(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub'
@@ -114,7 +111,7 @@ class Subscriptions(ElementBase):
 	plugin_tag_map = {}
 	subitem = (Subscription,)
 
-stanzaPlugin(Pubsub, Subscriptions)
+registerStanzaPlugin(Pubsub, Subscriptions)
 
 class OptionalSetting(object):
 	interfaces = set(('required',))
@@ -147,7 +144,7 @@ class SubscribeOptions(ElementBase, OptionalSetting):
 	plugin_tag_map = {}
 	interfaces = set(('required',))
 
-stanzaPlugin(Subscription, SubscribeOptions)
+registerStanzaPlugin(Subscription, SubscribeOptions)
 
 class Item(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub'
@@ -178,7 +175,7 @@ class Items(ElementBase):
 	plugin_tag_map = {}
 	subitem = (Item,)
 
-stanzaPlugin(Pubsub, Items)
+registerStanzaPlugin(Pubsub, Items)
 
 class Create(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub'
@@ -188,7 +185,7 @@ class Create(ElementBase):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(Pubsub, Create)
+registerStanzaPlugin(Pubsub, Create)
 
 #class Default(ElementBase):
 #	namespace = 'http://jabber.org/protocol/pubsub'
@@ -203,7 +200,7 @@ stanzaPlugin(Pubsub, Create)
 #		if not t: t == 'leaf'
 #		return t
 #
-#stanzaPlugin(Pubsub, Default)
+#registerStanzaPlugin(Pubsub, Default)
 
 class Publish(Items):
 	namespace = 'http://jabber.org/protocol/pubsub'
@@ -214,7 +211,7 @@ class Publish(Items):
 	plugin_tag_map = {}
 	subitem = (Item,)
 
-stanzaPlugin(Pubsub, Publish)
+registerStanzaPlugin(Pubsub, Publish)
 
 class Retract(Items):
 	namespace = 'http://jabber.org/protocol/pubsub'
@@ -224,7 +221,7 @@ class Retract(Items):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(Pubsub, Retract)
+registerStanzaPlugin(Pubsub, Retract)
 
 class Unsubscribe(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub'
@@ -254,7 +251,7 @@ class Subscribe(ElementBase):
 	def getJid(self):
 		return JID(self._getAttr('jid'))
 
-stanzaPlugin(Pubsub, Subscribe)
+registerStanzaPlugin(Pubsub, Subscribe)
 
 class Configure(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub'
@@ -284,7 +281,7 @@ class Configure(ElementBase):
 		config = self.xml.find('{jabber:x:data}x')
 		self.xml.remove(config)
 	
-stanzaPlugin(Pubsub, Configure)
+registerStanzaPlugin(Pubsub, Configure)
 
 class DefaultConfig(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub#owner'
@@ -317,7 +314,7 @@ class DefaultConfig(ElementBase):
 		if not t: t = 'leaf'
 		return t
 
-stanzaPlugin(PubsubOwner, DefaultConfig)
+registerStanzaPlugin(PubsubOwner, DefaultConfig)
 
 class Options(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub'
@@ -351,8 +348,8 @@ class Options(ElementBase):
 	def getJid(self):
 		return JID(self._getAttr('jid'))
 
-stanzaPlugin(Pubsub, Options)
-stanzaPlugin(Subscribe, Options)
+registerStanzaPlugin(Pubsub, Options)
+registerStanzaPlugin(Subscribe, Options)
 
 class OwnerAffiliations(Affiliations):
 	namespace = 'http://jabber.org/protocol/pubsub#owner'
@@ -366,7 +363,7 @@ class OwnerAffiliations(Affiliations):
 		self.xml.append(affiliation.xml)
 		return self.affiliations.append(affiliation)
 
-stanzaPlugin(PubsubOwner, OwnerAffiliations)
+registerStanzaPlugin(PubsubOwner, OwnerAffiliations)
 
 class OwnerAffiliation(Affiliation):
 	namespace = 'http://jabber.org/protocol/pubsub#owner'
@@ -380,7 +377,7 @@ class OwnerConfigure(Configure):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(PubsubOwner, OwnerConfigure)
+registerStanzaPlugin(PubsubOwner, OwnerConfigure)
 
 class OwnerDefault(OwnerConfigure):
 	namespace = 'http://jabber.org/protocol/pubsub#owner'
@@ -388,7 +385,7 @@ class OwnerDefault(OwnerConfigure):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(PubsubOwner, OwnerDefault)
+registerStanzaPlugin(PubsubOwner, OwnerDefault)
 
 class OwnerDelete(ElementBase, OptionalSetting):
 	namespace = 'http://jabber.org/protocol/pubsub#owner'
@@ -398,7 +395,7 @@ class OwnerDelete(ElementBase, OptionalSetting):
 	plugin_tag_map = {}
 	interfaces = set(('node',))
 
-stanzaPlugin(PubsubOwner, OwnerDelete)
+registerStanzaPlugin(PubsubOwner, OwnerDelete)
 
 class OwnerPurge(ElementBase, OptionalSetting):
 	namespace = 'http://jabber.org/protocol/pubsub#owner'
@@ -407,7 +404,7 @@ class OwnerPurge(ElementBase, OptionalSetting):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(PubsubOwner, OwnerPurge)
+registerStanzaPlugin(PubsubOwner, OwnerPurge)
 
 class OwnerRedirect(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub#owner'
@@ -423,7 +420,7 @@ class OwnerRedirect(ElementBase):
 	def getJid(self):
 		return JID(self._getAttr('jid'))
 
-stanzaPlugin(OwnerDelete, OwnerRedirect)
+registerStanzaPlugin(OwnerDelete, OwnerRedirect)
 
 class OwnerSubscriptions(Subscriptions):
 	namespace = 'http://jabber.org/protocol/pubsub#owner'
@@ -437,7 +434,7 @@ class OwnerSubscriptions(Subscriptions):
 		self.xml.append(subscription.xml)
 		return self.subscriptions.append(subscription)
 
-stanzaPlugin(PubsubOwner, OwnerSubscriptions)
+registerStanzaPlugin(PubsubOwner, OwnerSubscriptions)
 
 class OwnerSubscription(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub#owner'
@@ -461,7 +458,7 @@ class Event(ElementBase):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(Message, Event)
+registerStanzaPlugin(Message, Event)
 
 class EventItem(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub#event'
@@ -501,7 +498,7 @@ class EventItems(ElementBase):
 	plugin_tag_map = {}
 	subitem = (EventItem, EventRetract)
 
-stanzaPlugin(Event, EventItems)
+registerStanzaPlugin(Event, EventItems)
 
 class EventCollection(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub#event'
@@ -511,7 +508,7 @@ class EventCollection(ElementBase):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(Event, EventCollection)
+registerStanzaPlugin(Event, EventCollection)
 
 class EventAssociate(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub#event'
@@ -521,7 +518,7 @@ class EventAssociate(ElementBase):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(EventCollection, EventAssociate)
+registerStanzaPlugin(EventCollection, EventAssociate)
 
 class EventDisassociate(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub#event'
@@ -531,7 +528,7 @@ class EventDisassociate(ElementBase):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(EventCollection, EventDisassociate)
+registerStanzaPlugin(EventCollection, EventDisassociate)
 
 class EventConfiguration(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub#event'
@@ -556,7 +553,7 @@ class EventConfiguration(ElementBase):
 		config = self.xml.find('{jabber:x:data}x')
 		self.xml.remove(config)
 	
-stanzaPlugin(Event, EventConfiguration)
+registerStanzaPlugin(Event, EventConfiguration)
 
 class EventPurge(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub#event'
@@ -566,7 +563,7 @@ class EventPurge(ElementBase):
 	plugin_attrib_map = {}
 	plugin_tag_map = {}
 
-stanzaPlugin(Event, EventPurge)
+registerStanzaPlugin(Event, EventPurge)
 
 class EventSubscription(ElementBase):
 	namespace = 'http://jabber.org/protocol/pubsub#event'
@@ -582,4 +579,4 @@ class EventSubscription(ElementBase):
 	def getJid(self):
 		return JID(self._getAttr('jid'))
 
-stanzaPlugin(Event, EventSubscription)
+registerStanzaPlugin(Event, EventSubscription)
diff --git a/sleekxmpp/plugins/xep_0030.py b/sleekxmpp/plugins/xep_0030.py
index 93e094f..1e04fe4 100644
--- a/sleekxmpp/plugins/xep_0030.py
+++ b/sleekxmpp/plugins/xep_0030.py
@@ -10,7 +10,7 @@ import logging
 from . import base
 from .. xmlstream.handler.callback import Callback
 from .. xmlstream.matcher.xpath import MatchXPath
-from .. xmlstream.stanzabase import ElementBase, ET, JID
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID
 from .. stanza.iq import Iq
 
 class DiscoInfo(ElementBase):
@@ -204,8 +204,8 @@ class xep_0030(base.base_plugin):
 								  DiscoInfo.namespace)),
 				 self.handle_info_query))
 
-		self.xmpp.stanzaPlugin(Iq, DiscoInfo)
-		self.xmpp.stanzaPlugin(Iq, DiscoItems)
+		registerStanzaPlugin(Iq, DiscoInfo)
+		registerStanzaPlugin(Iq, DiscoItems)
 
 		self.xmpp.add_event_handler('disco_items_request', self.handle_disco_items)
 		self.xmpp.add_event_handler('disco_info_request', self.handle_disco_info)
diff --git a/sleekxmpp/plugins/xep_0033.py b/sleekxmpp/plugins/xep_0033.py
index df8bb88..9af27e3 100644
--- a/sleekxmpp/plugins/xep_0033.py
+++ b/sleekxmpp/plugins/xep_0033.py
@@ -10,7 +10,7 @@ import logging
 from . import base
 from .. xmlstream.handler.callback import Callback
 from .. xmlstream.matcher.xpath import MatchXPath
-from .. xmlstream.stanzabase import ElementBase, ET, JID
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID
 from .. stanza.message import Message
 
 
@@ -154,7 +154,7 @@ class xep_0030(base.base_plugin):
 		self.xep = '0033'
 		self.description = 'Extended Stanza Addressing'
 
-		self.xmpp.stanzaPlugin(Message, Addresses)
+		registerStanzaPlugin(Message, Addresses)
 
 	def post_init(self):
 		base.base_plugin.post_init(self)
diff --git a/sleekxmpp/plugins/xep_0045.py b/sleekxmpp/plugins/xep_0045.py
index 937c6f9..88ada19 100644
--- a/sleekxmpp/plugins/xep_0045.py
+++ b/sleekxmpp/plugins/xep_0045.py
@@ -21,7 +21,7 @@ from __future__ import with_statement
 from . import base
 import logging
 from xml.etree import cElementTree as ET
-from .. xmlstream.stanzabase import ElementBase, JID
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, JID
 from .. stanza.presence import Presence
 from .. xmlstream.handler.callback import Callback
 from .. xmlstream.matcher.xpath import MatchXPath
@@ -125,7 +125,7 @@ class xep_0045(base.base_plugin):
 		self.xep = '0045'
 		self.description = 'Multi User Chat'
 		# load MUC support in presence stanzas
-		self.xmpp.stanzaPlugin(Presence, MUCPresence)
+		registerStanzaPlugin(Presence, MUCPresence)
 		self.xmpp.registerHandler(Callback('MUCPresence', MatchXMLMask("<presence xmlns='%s' />" % self.xmpp.default_ns), self.handle_groupchat_presence))
 		self.xmpp.registerHandler(Callback('MUCMessage', MatchXMLMask("<message xmlns='%s' type='groupchat'><body/></message>" % self.xmpp.default_ns), self.handle_groupchat_message))
 	
diff --git a/sleekxmpp/plugins/xep_0060.py b/sleekxmpp/plugins/xep_0060.py
index bff158a..a92a384 100644
--- a/sleekxmpp/plugins/xep_0060.py
+++ b/sleekxmpp/plugins/xep_0060.py
@@ -2,7 +2,7 @@ from __future__ import with_statement
 from . import base
 import logging
 #from xml.etree import cElementTree as ET
-from .. xmlstream.stanzabase import ElementBase, ET
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET
 from . import stanza_pubsub
 
 class xep_0060(base.base_plugin):
diff --git a/sleekxmpp/plugins/xep_0085.py b/sleekxmpp/plugins/xep_0085.py
index e24e9db..66940af 100644
--- a/sleekxmpp/plugins/xep_0085.py
+++ b/sleekxmpp/plugins/xep_0085.py
@@ -10,7 +10,7 @@ import logging
 from . import base
 from .. xmlstream.handler.callback import Callback
 from .. xmlstream.matcher.xpath import MatchXPath
-from .. xmlstream.stanzabase import ElementBase, ET, JID
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID
 from .. stanza.message import Message
 
 
@@ -85,11 +85,11 @@ class xep_0085(base.base_plugin):
                                                             handler[1])), 
                          self._handleChatState))
 
-        self.xmpp.stanzaPlugin(Message, Active)
-        self.xmpp.stanzaPlugin(Message, Composing)
-        self.xmpp.stanzaPlugin(Message, Gone)
-        self.xmpp.stanzaPlugin(Message, Inactive)
-        self.xmpp.stanzaPlugin(Message, Paused)
+        registerStanzaPlugin(Message, Active)
+        registerStanzaPlugin(Message, Composing)
+        registerStanzaPlugin(Message, Gone)
+        registerStanzaPlugin(Message, Inactive)
+        registerStanzaPlugin(Message, Paused)
         
     def post_init(self):
         base.base_plugin.post_init(self)
diff --git a/sleekxmpp/plugins/xep_0128.py b/sleekxmpp/plugins/xep_0128.py
index 3e660b1..7ba00bf 100644
--- a/sleekxmpp/plugins/xep_0128.py
+++ b/sleekxmpp/plugins/xep_0128.py
@@ -10,7 +10,7 @@ import logging
 from . import base
 from .. xmlstream.handler.callback import Callback
 from .. xmlstream.matcher.xpath import MatchXPath
-from .. xmlstream.stanzabase import ElementBase, ET, JID
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID
 from .. stanza.iq import Iq
 from . xep_0030 import DiscoInfo, DiscoItems
 from . alt_0004 import Form
@@ -25,8 +25,8 @@ class xep_0128(base.base_plugin):
         self.xep = '0128'
         self.description = 'Service Discovery Extensions'
 
-        self.xmpp.stanzaPlugin(DiscoInfo, Form)
-        self.xmpp.stanzaPlugin(DiscoItems, Form)
+        registerStanzaPlugin(DiscoInfo, Form)
+        registerStanzaPlugin(DiscoItems, Form)
 
     def extend_info(self, node, data=None):
         if data is None:
diff --git a/sleekxmpp/stanza/atom.py b/sleekxmpp/stanza/atom.py
index 5e82cb9..9df85a2 100644
--- a/sleekxmpp/stanza/atom.py
+++ b/sleekxmpp/stanza/atom.py
@@ -1,4 +1,4 @@
-from .. xmlstream.stanzabase import ElementBase, ET, JID
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID
 from xml.etree import cElementTree as ET
 
 class AtomEntry(ElementBase):
diff --git a/sleekxmpp/stanza/error.py b/sleekxmpp/stanza/error.py
index ee46722..b9ab267 100644
--- a/sleekxmpp/stanza/error.py
+++ b/sleekxmpp/stanza/error.py
@@ -5,7 +5,7 @@
 
     See the file license.txt for copying permission.
 """
-from .. xmlstream.stanzabase import ElementBase, ET
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET
 
 class Error(ElementBase):
 	namespace = 'jabber:client'
diff --git a/sleekxmpp/stanza/htmlim.py b/sleekxmpp/stanza/htmlim.py
index 60686e4..14595e2 100644
--- a/sleekxmpp/stanza/htmlim.py
+++ b/sleekxmpp/stanza/htmlim.py
@@ -5,7 +5,7 @@
 
     See the file license.txt for copying permission.
 """
-from .. xmlstream.stanzabase import ElementBase, ET
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET
 
 class HTMLIM(ElementBase):
 	namespace = 'http://jabber.org/protocol/xhtml-im'
diff --git a/sleekxmpp/stanza/nick.py b/sleekxmpp/stanza/nick.py
index ac7e360..ec29070 100644
--- a/sleekxmpp/stanza/nick.py
+++ b/sleekxmpp/stanza/nick.py
@@ -5,7 +5,7 @@
 
     See the file license.txt for copying permission.
 """
-from .. xmlstream.stanzabase import ElementBase, ET
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET
 
 class Nick(ElementBase):
 	namespace = 'http://jabber.org/nick/nick'
diff --git a/sleekxmpp/stanza/roster.py b/sleekxmpp/stanza/roster.py
index 69027b6..708b8d4 100644
--- a/sleekxmpp/stanza/roster.py
+++ b/sleekxmpp/stanza/roster.py
@@ -5,7 +5,7 @@
 
     See the file license.txt for copying permission.
 """
-from .. xmlstream.stanzabase import ElementBase, ET, JID
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID
 import logging
 
 class Roster(ElementBase):
diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py
index 024fe6c..7592e1f 100644
--- a/sleekxmpp/xmlstream/stanzabase.py
+++ b/sleekxmpp/xmlstream/stanzabase.py
@@ -19,6 +19,16 @@ else:
 
 xmltester = type(ET.Element('xml'))
 
+
+def registerStanzaPlugin(stanza, plugin):
+        """
+        Associate a stanza object as a plugin for another stanza.
+        """
+        tag = "{%s}%s" % (plugin.namespace, plugin.name)
+	stanza.plugin_attrib_map[plugin.plugin_attrib] = plugin
+	stanza.plugin_tag_map[tag] = plugin
+
+
 class JID(object):
 	def __init__(self, jid):
 		self.jid = jid
@@ -392,4 +402,4 @@ class StanzaBase(ElementBase):
 
 	def __copy__(self):
 		return self.__class__(xml=copy.deepcopy(self.xml), stream=self.stream)
-	
+                
diff --git a/tests/sleektest.py b/tests/sleektest.py
index eef3b90..3c270eb 100644
--- a/tests/sleektest.py
+++ b/tests/sleektest.py
@@ -17,6 +17,8 @@ from sleekxmpp import ClientXMPP
 from sleekxmpp import Message, Iq
 from sleekxmpp.stanza.presence import Presence
 from sleekxmpp.xmlstream.matcher.stanzapath import StanzaPath
+from sleekxmpp.xmlstream.stanzabase import registerStanzaPlugin
+
 
 class TestSocket(object):
     
@@ -88,14 +90,6 @@ class SleekTest(unittest.TestCase):
     methods for comparing message, iq, and presence stanzas.
     """
 
-    def stanzaPlugin(self, stanza, plugin):
-        """
-        Associate a stanza object as a plugin for another stanza.
-        """
-        tag = "{%s}%s" % (plugin.namespace, plugin.name)
-	stanza.plugin_attrib_map[plugin.plugin_attrib] = plugin
-	stanza.plugin_tag_map[tag] = plugin
-
     # ------------------------------------------------------------------
     # Shortcut methods for creating stanza objects
 
diff --git a/tests/test_addresses.py b/tests/test_addresses.py
index 2718bb1..63d1100 100644
--- a/tests/test_addresses.py
+++ b/tests/test_addresses.py
@@ -5,7 +5,7 @@ import sleekxmpp.plugins.xep_0033 as xep_0033
 class TestAddresses(SleekTest):
 
     	def setUp(self):
-                self.stanzaPlugin(Message, xep_0033.Addresses)
+                registerStanzaPlugin(Message, xep_0033.Addresses)
 
         def testAddAddress(self):
 		"""Testing adding extended stanza address."""
diff --git a/tests/test_chatstates.py b/tests/test_chatstates.py
index 1e585be..bcacb9e 100644
--- a/tests/test_chatstates.py
+++ b/tests/test_chatstates.py
@@ -4,11 +4,11 @@ import sleekxmpp.plugins.xep_0085 as xep_0085
 class TestChatStates(SleekTest):
 
 	def setUp(self):
-		self.stanzaPlugin(Message, xep_0085.Active)
-		self.stanzaPlugin(Message, xep_0085.Composing)
-		self.stanzaPlugin(Message, xep_0085.Gone)
-		self.stanzaPlugin(Message, xep_0085.Inactive)
-		self.stanzaPlugin(Message, xep_0085.Paused)
+		registerStanzaPlugin(Message, xep_0085.Active)
+		registerStanzaPlugin(Message, xep_0085.Composing)
+		registerStanzaPlugin(Message, xep_0085.Gone)
+		registerStanzaPlugin(Message, xep_0085.Inactive)
+		registerStanzaPlugin(Message, xep_0085.Paused)
         
 	def testCreateChatState(self):
 		"""Testing creating chat states."""
diff --git a/tests/test_disco.py b/tests/test_disco.py
index 6daad13..96a12e2 100644
--- a/tests/test_disco.py
+++ b/tests/test_disco.py
@@ -5,8 +5,8 @@ import sleekxmpp.plugins.xep_0030 as xep_0030
 class TestDisco(SleekTest):
 
     def setUp(self):
-        self.stanzaPlugin(Iq, xep_0030.DiscoInfo)
-        self.stanzaPlugin(Iq, xep_0030.DiscoItems)
+        registerStanzaPlugin(Iq, xep_0030.DiscoInfo)
+        registerStanzaPlugin(Iq, xep_0030.DiscoItems)
         
     def testCreateInfoQueryNoNode(self):
         """Testing disco#info query with no node."""
diff --git a/tests/test_forms.py b/tests/test_forms.py
index 981d887..1616024 100644
--- a/tests/test_forms.py
+++ b/tests/test_forms.py
@@ -5,9 +5,9 @@ import sleekxmpp.plugins.alt_0004 as xep_0004
 class TestDataForms(SleekTest):
 
     def setUp(self):
-        self.stanzaPlugin(Message, xep_0004.Form)
-        self.stanzaPlugin(xep_0004.Form, xep_0004.FormField)
-        self.stanzaPlugin(xep_0004.FormField, xep_0004.FieldOption)
+        registerStanzaPlugin(Message, xep_0004.Form)
+        registerStanzaPlugin(xep_0004.Form, xep_0004.FormField)
+        registerStanzaPlugin(xep_0004.FormField, xep_0004.FieldOption)
 
     def testMultipleInstructions(self):
         """Testing using multiple instructions elements in a data form."""
diff --git a/tests/test_gmail.py b/tests/test_gmail.py
index 199b76a..b2e70d2 100644
--- a/tests/test_gmail.py
+++ b/tests/test_gmail.py
@@ -5,9 +5,9 @@ import sleekxmpp.plugins.gmail_notify as gmail
 class TestGmail(SleekTest):
 
     def setUp(self):
-        self.stanzaPlugin(Iq, gmail.GmailQuery)
-        self.stanzaPlugin(Iq, gmail.MailBox)
-        self.stanzaPlugin(Iq, gmail.NewMail)
+        registerStanzaPlugin(Iq, gmail.GmailQuery)
+        registerStanzaPlugin(Iq, gmail.MailBox)
+        registerStanzaPlugin(Iq, gmail.NewMail)
         
     def testCreateQuery(self):
         """Testing querying Gmail for emails."""
diff --git a/tests/test_messagestanzas.py b/tests/test_messagestanzas.py
index 08488ce..026a578 100644
--- a/tests/test_messagestanzas.py
+++ b/tests/test_messagestanzas.py
@@ -5,9 +5,9 @@ class testmessagestanzas(unittest.TestCase):
 
 	def setUp(self):
 		import sleekxmpp.stanza.message as m
-		from sleekxmpp.basexmpp import stanzaPlugin
+		from sleekxmpp.basexmpp import registerStanzaPlugin
 		from sleekxmpp.stanza.htmlim import HTMLIM
-		stanzaPlugin(m.Message, HTMLIM)
+		registerStanzaPlugin(m.Message, HTMLIM)
 		self.m = m
 	
 	def testGroupchatReplyRegression(self):