diff --git a/netbox/users/forms/filtersets.py b/netbox/users/forms/filtersets.py
index 4ae2bd729..0e9e99a83 100644
--- a/netbox/users/forms/filtersets.py
+++ b/netbox/users/forms/filtersets.py
@@ -11,21 +11,21 @@ from utilities.forms.fields import DynamicModelMultipleChoiceField
 from utilities.forms.widgets import DateTimePicker
 
 __all__ = (
-    'GroupFilterForm',
+    'NetBoxGroupFilterForm',
     'ObjectPermissionFilterForm',
-    'UserFilterForm',
+    'NetBoxUserFilterForm',
     'TokenFilterForm',
 )
 
 
-class GroupFilterForm(NetBoxModelFilterSetForm):
+class NetBoxGroupFilterForm(NetBoxModelFilterSetForm):
     model = NetBoxGroup
     fieldsets = (
         (None, ('q', 'filter_id',)),
     )
 
 
-class UserFilterForm(NetBoxModelFilterSetForm):
+class NetBoxUserFilterForm(NetBoxModelFilterSetForm):
     model = NetBoxUser
     fieldsets = (
         (None, ('q', 'filter_id',)),
diff --git a/netbox/users/views.py b/netbox/users/views.py
index 2e7a47c12..e0fda403e 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -58,7 +58,7 @@ class TokenBulkDeleteView(generic.BulkDeleteView):
 class UserListView(generic.ObjectListView):
     queryset = NetBoxUser.objects.all()
     filterset = filtersets.UserFilterSet
-    filterset_form = forms.UserFilterForm
+    filterset_form = forms.NetBoxUserFilterForm
     table = tables.UserTable
 
 
@@ -112,7 +112,7 @@ class UserBulkDeleteView(generic.BulkDeleteView):
 class GroupListView(generic.ObjectListView):
     queryset = NetBoxGroup.objects.annotate(users_count=Count('user'))
     filterset = filtersets.GroupFilterSet
-    filterset_form = forms.GroupFilterForm
+    filterset_form = forms.NetBoxGroupFilterForm
     table = tables.GroupTable