diff --git a/locking/managers.py b/locking/managers.py
index 5a4e024..c83971c 100644
--- a/locking/managers.py
+++ b/locking/managers.py
@@ -15,11 +15,11 @@ def point_of_timeout():
     return datetime.datetime.now() - delta
 
 class LockedManager(Manager):
-    def get_query_set(self):
+    def get_queryset(self):
         timeout = point_of_timeout()
-        return super(LockedManager, self).get_query_set().filter(_locked_at__gt=timeout, _locked_at__isnull=False)
+        return super(LockedManager, self).get_queryset().filter(_locked_at__gt=timeout, _locked_at__isnull=False)
 
 class UnlockedManager(Manager):
-    def get_query_set(self):
+    def get_queryset(self):
         timeout = point_of_timeout()
-        return super(UnlockedManager, self).get_query_set().filter(Q(_locked_at__lte=timeout) | Q(_locked_at__isnull=True))
\ No newline at end of file
+        return super(UnlockedManager, self).get_queryset().filter(Q(_locked_at__lte=timeout) | Q(_locked_at__isnull=True))
diff --git a/locking/urls.py b/locking/urls.py
index f7388e8..59a6fd1 100644
--- a/locking/urls.py
+++ b/locking/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('locking.views',
     # verwijst naar een ajax-view voor het lockingmechanisme
@@ -10,4 +10,4 @@
 
 urlpatterns += patterns('',
     (r'jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': 'locking'}),
-    )
\ No newline at end of file
+    )