diff --git a/django_mailbox/models.py b/django_mailbox/models.py
index b378a24..5c0e5af 100644
--- a/django_mailbox/models.py
+++ b/django_mailbox/models.py
@@ -35,7 +35,7 @@ from django_mailbox.signals import message_received
 from django_mailbox.transports import Pop3Transport, ImapTransport, \
     MaildirTransport, MboxTransport, BabylTransport, MHTransport, \
     MMDFTransport, GmailImapTransport
-from django_mailbox.transports.registry import transport_registry
+from django_mailbox.transports.registry import registry
 
 logger = logging.getLogger(__name__)
 
@@ -224,7 +224,7 @@ class Mailbox(models.Model):
             conn = MHTransport(self.location)
         elif self.type == 'mmdf':
             conn = MMDFTransport(self.location)
-        return transport_registry[self.type].from_url(self.uri)
+        return registry[self.type].from_url(self.uri)
 
     def process_incoming_message(self, message):
         """Process a message incoming to this mailbox."""
diff --git a/django_mailbox/transports/__init__.py b/django_mailbox/transports/__init__.py
index 216582d..b995258 100644
--- a/django_mailbox/transports/__init__.py
+++ b/django_mailbox/transports/__init__.py
@@ -7,4 +7,5 @@ from django_mailbox.transports.mbox import MboxTransport
 from django_mailbox.transports.babyl import BabylTransport
 from django_mailbox.transports.mh import MHTransport
 from django_mailbox.transports.mmdf import MMDFTransport
-from django_mailbox.transports.gmail import GmailImapTransport
\ No newline at end of file
+from django_mailbox.transports.gmail import GmailImapTransport
+from django_mailbox.transports.registry import registry, register
diff --git a/django_mailbox/transports/registry.py b/django_mailbox/transports/registry.py
index 8584701..4ed847e 100644
--- a/django_mailbox/transports/registry.py
+++ b/django_mailbox/transports/registry.py
@@ -1,8 +1,8 @@
-transport_registry = {}
+registry = {}
 
 
-def register_transport(transport_type):
+def register(transport_type):
     def decorator(f):
-        transport_registry[transport_type] = f
+        registry[transport_type] = f
         return f
     return decorator