diff --git a/categories/__init__.py b/categories/__init__.py
index 1dc8255..035da6a 100644
--- a/categories/__init__.py
+++ b/categories/__init__.py
@@ -23,10 +23,9 @@ default_app_config = 'categories.apps.CategoriesConfig'
 
 def register():
     from categories import settings
-    from categories.registration import (_process_registry, register_fk,
-                                        register_m2m)
-    _process_registry(settings.FK_REGISTRY, register_fk)
-    _process_registry(settings.M2M_REGISTRY, register_m2m)
+    from categories.registration import (_process_registry, registry)
+    _process_registry(settings.FK_REGISTRY, registry.register_fk)
+    _process_registry(settings.M2M_REGISTRY, registry.register_m2m)
 try:
     register()
 except Exception as e:
diff --git a/categories/tests/test_registration.py b/categories/tests/test_registration.py
index b303980..945916e 100644
--- a/categories/tests/test_registration.py
+++ b/categories/tests/test_registration.py
@@ -51,7 +51,7 @@ class Categorym2mTest(TestCase):
         M2M_REGISTRY = {
             'flatpages.flatpage': 'categories'
         }
-        _process_registry(M2M_REGISTRY, register_m2m)
+        _process_registry(M2M_REGISTRY, registry.register_m2m)
         from django.contrib.flatpages.models import FlatPage
         self.assertTrue('category' in FlatPage()._meta.get_all_field_names())