diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html
index 0c1e896717..22acdcc196 100644
--- a/django/contrib/admin/templates/admin/change_list.html
+++ b/django/contrib/admin/templates/admin/change_list.html
@@ -27,7 +27,7 @@
 <div id="changelist-filter">
 <h2>{% trans 'Filter' %}</h2>
 {% for spec in cl.filter_specs %}
-   {% filter cl spec %}
+   {% admin_list_filter cl spec %}
 {% endfor %}
 </div>
 {% endif %}
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index 98843bf26e..4a4c053971 100644
--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@@ -277,6 +277,6 @@ def search_form(cl):
     }
 search_form = register.inclusion_tag('admin/search_form.html')(search_form)
 
-def filter(cl, spec):
+def admin_list_filter(cl, spec):
     return {'title': spec.title(), 'choices' : list(spec.choices(cl))}
-filter = register.inclusion_tag('admin/filter.html')(filter)
+admin_list_filter = register.inclusion_tag('admin/filter.html')(admin_list_filter)