diff --git a/singleton_models/admin.py b/singleton_models/admin.py
index 461c41b..8c26fc6 100644
--- a/singleton_models/admin.py
+++ b/singleton_models/admin.py
@@ -1,8 +1,9 @@
+from functools import update_wrapper
+
 from django.contrib import admin
 from django.utils.translation import ugettext as _
 from django.utils.encoding import force_unicode
 from django.http import HttpResponseRedirect
-from django.utils.functional import update_wrapper
 
 class SingletonModelAdmin(admin.ModelAdmin):
 
@@ -13,14 +14,14 @@ def has_add_permission(self, request):
         return False
         
     def get_urls(self):
-        from django.conf.urls.defaults import patterns, url
+        from django.conf.urls import patterns, url
 
         def wrap(view):
             def wrapper(*args, **kwargs):
                 return self.admin_site.admin_view(view)(*args, **kwargs)
             return update_wrapper(wrapper, view)
 
-        info = self.model._meta.app_label, self.model._meta.module_name
+        info = self.model._meta.app_label, self.model._meta.model_name
 
         urlpatterns = patterns('',
             url(r'^history/$',
@@ -30,7 +31,7 @@ def wrapper(*args, **kwargs):
             url(r'^$',
                 wrap(self.change_view),
                 {'object_id': '1'},
-                name='%s_%s_change' % info),
+                name='%s_%s_changelist' % info),
         )
         return urlpatterns