diff --git a/django_admin_sbf/admin.py b/django_admin_sbf/admin.py
index 95e5471..573c895 100644
--- a/django_admin_sbf/admin.py
+++ b/django_admin_sbf/admin.py
@@ -13,7 +13,7 @@ class DjangoAdminSBF(ModelAdmin):
     Extend this class to add advanced search in the admin panel
     """
 
-    change_list_template = 'admin/custom_change_list.html'
+    change_list_template = 'admin/sbf_custom_change_list.html'
 
     def get_changelist(self, request, **kwargs):
         from .admin_forms import CustomChangeList
diff --git a/django_admin_sbf/templates/admin/custom_change_list.html b/django_admin_sbf/templates/admin/sbf_custom_change_list.html
similarity index 100%
rename from django_admin_sbf/templates/admin/custom_change_list.html
rename to django_admin_sbf/templates/admin/sbf_custom_change_list.html
diff --git a/django_admin_sbf/templates/admin/custom_search_form.html b/django_admin_sbf/templates/admin/sbf_custom_search_form.html
similarity index 100%
rename from django_admin_sbf/templates/admin/custom_search_form.html
rename to django_admin_sbf/templates/admin/sbf_custom_search_form.html
diff --git a/django_admin_sbf/templatetags/custom_search_form.py b/django_admin_sbf/templatetags/custom_search_form.py
index eaf6db9..57e1fc8 100644
--- a/django_admin_sbf/templatetags/custom_search_form.py
+++ b/django_admin_sbf/templatetags/custom_search_form.py
@@ -4,7 +4,7 @@
 register = template.Library()
 
 
-@register.inclusion_tag('admin/custom_search_form.html', takes_context=False)
+@register.inclusion_tag('admin/sbf_custom_search_form.html', takes_context=False)
 def advanced_search_form(cl):
     """
     Displays a search form for searching the list.