diff --git a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx
index 63228717a5..d7572c2ac3 100644
--- a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx
+++ b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx
@@ -23,7 +23,7 @@ import {
   EntityKindFilter,
   EntityNamespaceFilter,
   EntityTagFilter,
-  EntityUserListFilter,
+  EntityUserFilter,
 } from '../../filters';
 import {
   CatalogApi,
@@ -263,7 +263,7 @@ describe('<UserListPicker />', () => {
 
     await waitFor(() =>
       expect(updateFilters).toHaveBeenLastCalledWith({
-        user: EntityUserListFilter.owned(ownershipEntityRefs),
+        user: EntityUserFilter.owned(ownershipEntityRefs),
       }),
     );
 
@@ -298,7 +298,7 @@ describe('<UserListPicker />', () => {
 
     await waitFor(() =>
       expect(updateFilters).toHaveBeenLastCalledWith({
-        user: EntityUserListFilter.starred([
+        user: EntityUserFilter.starred([
           'component:default/e-1',
           'component:default/e-2',
         ]),
@@ -331,7 +331,7 @@ describe('<UserListPicker />', () => {
 
     await waitFor(() =>
       expect(updateFilters).toHaveBeenLastCalledWith({
-        user: EntityUserListFilter.all(),
+        user: EntityUserFilter.all(),
       }),
     );
 
@@ -352,7 +352,7 @@ describe('<UserListPicker />', () => {
       </ApiProvider>,
     );
     expect(updateFilters).toHaveBeenLastCalledWith({
-      user: EntityUserListFilter.owned(ownershipEntityRefs),
+      user: EntityUserFilter.owned(ownershipEntityRefs),
     });
   });
 
@@ -437,7 +437,7 @@ describe('<UserListPicker />', () => {
 
         await waitFor(() =>
           expect(updateFilters).toHaveBeenLastCalledWith({
-            user: EntityUserListFilter.all(),
+            user: EntityUserFilter.all(),
           }),
         );
       });
@@ -501,7 +501,7 @@ describe('<UserListPicker />', () => {
 
         await waitFor(() =>
           expect(updateFilters).toHaveBeenLastCalledWith({
-            user: EntityUserListFilter.all(),
+            user: EntityUserFilter.all(),
           }),
         );
       });
@@ -529,7 +529,7 @@ describe('<UserListPicker />', () => {
           expect(mockCatalogApi.queryEntities).toHaveBeenCalledTimes(3),
         );
         expect(updateFilters).not.toHaveBeenCalledWith({
-          user: EntityUserListFilter.all(),
+          user: EntityUserFilter.all(),
         });
       });
 
@@ -542,7 +542,7 @@ describe('<UserListPicker />', () => {
 
         await waitFor(() =>
           expect(updateFilters).toHaveBeenLastCalledWith({
-            user: EntityUserListFilter.owned(expect.any(Array)),
+            user: EntityUserFilter.owned(expect.any(Array)),
           }),
         );
       });
@@ -570,7 +570,7 @@ describe('<UserListPicker />', () => {
           expect(mockCatalogApi.queryEntities).toHaveBeenCalledTimes(3),
         );
         expect(updateFilters).not.toHaveBeenCalledWith({
-          user: EntityUserListFilter.all(),
+          user: EntityUserFilter.all(),
         });
       });
 
@@ -583,7 +583,7 @@ describe('<UserListPicker />', () => {
 
         await waitFor(() =>
           expect(updateFilters).toHaveBeenLastCalledWith({
-            user: EntityUserListFilter.starred([
+            user: EntityUserFilter.starred([
               'component:default/e-1',
               'component:default/e-2',
             ]),
diff --git a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx
index b0a86b1322..854a1cb1b7 100644
--- a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx
+++ b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx
@@ -33,7 +33,7 @@ import {
 import SettingsIcon from '@material-ui/icons/Settings';
 import StarIcon from '@material-ui/icons/Star';
 import React, { Fragment, useEffect, useMemo, useState } from 'react';
-import { EntityUserListFilter } from '../../filters';
+import { EntityUserFilter } from '../../filters';
 import { useEntityList } from '../../hooks';
 import { UserListFilterKind } from '../../types';
 import { useOwnedEntitiesCount } from './useOwnedEntitiesCount';
@@ -213,7 +213,7 @@ export const UserListPicker = (props: UserListPickerProps) => {
       if (selectedUserFilter === 'starred') {
         return starredEntitiesFilter;
       }
-      return EntityUserListFilter.all();
+      return EntityUserFilter.all();
     };
 
     updateFilters({ user: getFilter() });
diff --git a/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.test.tsx b/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.test.tsx
index 6a79e63c8f..4ce3503394 100644
--- a/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.test.tsx
+++ b/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.test.tsx
@@ -32,7 +32,7 @@ import { useOwnedEntitiesCount } from './useOwnedEntitiesCount';
 import {
   EntityNamespaceFilter,
   EntityOwnerFilter,
-  EntityUserListFilter,
+  EntityUserFilter,
 } from '../../filters';
 import { useMountEffect } from '@react-hookz/web';
 
@@ -95,7 +95,7 @@ describe('useOwnedEntitiesCount', () => {
     expect(result.current).toEqual({
       count: 0,
       loading: false,
-      filter: EntityUserListFilter.owned([
+      filter: EntityUserFilter.owned([
         'user:default/spiderman',
         'user:group/a-group',
       ]),
@@ -131,7 +131,7 @@ describe('useOwnedEntitiesCount', () => {
     expect(result.current).toEqual({
       count: 10,
       loading: false,
-      filter: EntityUserListFilter.owned([
+      filter: EntityUserFilter.owned([
         'user:default/spiderman',
         'user:group/a-group',
       ]),
@@ -162,7 +162,7 @@ describe('useOwnedEntitiesCount', () => {
     expect(result.current).toEqual({
       count: 0,
       loading: false,
-      filter: EntityUserListFilter.owned([
+      filter: EntityUserFilter.owned([
         'user:default/spiderman',
         'user:group/a-group',
       ]),
@@ -202,7 +202,7 @@ describe('useOwnedEntitiesCount', () => {
     expect(result.current).toEqual({
       count: 10,
       loading: false,
-      filter: EntityUserListFilter.owned([
+      filter: EntityUserFilter.owned([
         'user:default/spiderman',
         'user:group/a-group',
       ]),
diff --git a/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.ts b/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.ts
index 605c006f44..d86610d9ae 100644
--- a/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.ts
+++ b/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.ts
@@ -20,7 +20,7 @@ import { compact, intersection, isEqual } from 'lodash';
 import { useMemo, useRef } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 import { catalogApiRef } from '../../api';
-import { EntityOwnerFilter, EntityUserListFilter } from '../../filters';
+import { EntityOwnerFilter, EntityUserFilter } from '../../filters';
 import { useEntityList } from '../../hooks';
 import { reduceCatalogFilters } from '../../utils';
 
@@ -82,7 +82,7 @@ export function useOwnedEntitiesCount() {
 
   const loading = loadingEntityRefs || loadingEntityOwnership;
   const filter = useMemo(
-    () => EntityUserListFilter.owned(ownershipEntityRefs ?? []),
+    () => EntityUserFilter.owned(ownershipEntityRefs ?? []),
     [ownershipEntityRefs],
   );
 
diff --git a/plugins/catalog-react/src/components/UserListPicker/useStarredEntitiesCount.ts b/plugins/catalog-react/src/components/UserListPicker/useStarredEntitiesCount.ts
index 93adad0489..6fa49d37a5 100644
--- a/plugins/catalog-react/src/components/UserListPicker/useStarredEntitiesCount.ts
+++ b/plugins/catalog-react/src/components/UserListPicker/useStarredEntitiesCount.ts
@@ -21,7 +21,7 @@ import { compact, isEqual } from 'lodash';
 import { useMemo, useRef } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 import { catalogApiRef } from '../../api';
-import { EntityUserListFilter } from '../../filters';
+import { EntityUserFilter } from '../../filters';
 import { useEntityList, useStarredEntities } from '../../hooks';
 import { reduceCatalogFilters } from '../../utils';
 
@@ -72,7 +72,7 @@ export function useStarredEntitiesCount() {
   }, [request, starredEntities]);
 
   const filter = useMemo(
-    () => EntityUserListFilter.starred(Array.from(starredEntities)),
+    () => EntityUserFilter.starred(Array.from(starredEntities)),
     [starredEntities],
   );
 
diff --git a/plugins/catalog-react/src/filters.ts b/plugins/catalog-react/src/filters.ts
index 3d871fe412..55983d124b 100644
--- a/plugins/catalog-react/src/filters.ts
+++ b/plugins/catalog-react/src/filters.ts
@@ -203,22 +203,22 @@ export class EntityNamespaceFilter implements EntityFilter {
 /**
  * @public
  */
-export class EntityUserListFilter implements EntityFilter {
+export class EntityUserFilter implements EntityFilter {
   private constructor(
     readonly value: UserListFilterKind,
     readonly refs?: string[],
   ) {}
 
   static owned(ownershipEntityRefs: string[]) {
-    return new EntityUserListFilter('owned', ownershipEntityRefs);
+    return new EntityUserFilter('owned', ownershipEntityRefs);
   }
 
   static all() {
-    return new EntityUserListFilter('all');
+    return new EntityUserFilter('all');
   }
 
   static starred(starredEntityRefs: string[]) {
-    return new EntityUserListFilter('starred', starredEntityRefs);
+    return new EntityUserFilter('starred', starredEntityRefs);
   }
 
   getCatalogFilters(): Record<string, string[]> {
@@ -259,7 +259,7 @@ export class EntityUserListFilter implements EntityFilter {
 
 /**
  * Filters entities based on whatever the user has starred or owns them.
- * @deprecated use EntityUserListFilter
+ * @deprecated use EntityUserFilter
  * @public
  */
 export class UserListFilter implements EntityFilter {
diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
index a4401e3441..edbfb65c0c 100644
--- a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
@@ -35,7 +35,7 @@ import { EntityKindPicker, UserListPicker } from '../components';
 import {
   EntityKindFilter,
   EntityTypeFilter,
-  EntityUserListFilter,
+  EntityUserFilter,
 } from '../filters';
 import { UserListFilterKind } from '../types';
 import { EntityListProvider, useEntityList } from './useEntityListProvider';
@@ -155,7 +155,7 @@ describe('<EntityListProvider />', () => {
 
     act(() =>
       result.current.updateFilters({
-        user: EntityUserListFilter.owned(ownershipEntityRefs),
+        user: EntityUserFilter.owned(ownershipEntityRefs),
       }),
     );
 
@@ -196,7 +196,7 @@ describe('<EntityListProvider />', () => {
 
     act(() =>
       result.current.updateFilters({
-        user: EntityUserListFilter.owned(ownershipEntityRefs),
+        user: EntityUserFilter.owned(ownershipEntityRefs),
       }),
     );
 
diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
index e2a8cfc657..948efc969f 100644
--- a/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
@@ -41,7 +41,7 @@ import {
   EntityTypeFilter,
   UserListFilter,
   EntityNamespaceFilter,
-  EntityUserListFilter,
+  EntityUserFilter,
 } from '../filters';
 import { EntityFilter } from '../types';
 import { reduceBackendCatalogFilters, reduceEntityFilters } from '../utils';
@@ -51,7 +51,7 @@ import { useApi } from '@backstage/core-plugin-api';
 export type DefaultEntityFilters = {
   kind?: EntityKindFilter;
   type?: EntityTypeFilter;
-  user?: UserListFilter | EntityUserListFilter;
+  user?: UserListFilter | EntityUserFilter;
   owners?: EntityOwnerFilter;
   lifecycles?: EntityLifecycleFilter;
   tags?: EntityTagFilter;
diff --git a/plugins/catalog-react/src/utils/filters.ts b/plugins/catalog-react/src/utils/filters.ts
index f2cfe64960..580d7b0b76 100644
--- a/plugins/catalog-react/src/utils/filters.ts
+++ b/plugins/catalog-react/src/utils/filters.ts
@@ -23,7 +23,7 @@ import {
   EntityOwnerFilter,
   EntityTagFilter,
   EntityTextFilter,
-  EntityUserListFilter,
+  EntityUserFilter,
   UserListFilter,
 } from '../filters';
 
@@ -57,7 +57,7 @@ export function reduceBackendCatalogFilters(filters: EntityFilter[]) {
       filter instanceof EntityOwnerFilter ||
       filter instanceof EntityLifecycleFilter ||
       filter instanceof EntityNamespaceFilter ||
-      filter instanceof EntityUserListFilter ||
+      filter instanceof EntityUserFilter ||
       filter instanceof EntityOrphanFilter ||
       filter instanceof EntityTextFilter ||
       filter instanceof UserListFilter