diff --git a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx
index 1315c95061..20dedf23a6 100644
--- a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx
+++ b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx
@@ -22,7 +22,7 @@ import { MockEntityListContextProvider } from '../../testUtils/providers';
 import {
   EntityTagFilter,
   UserListFilter,
-  UserOwnersFilter,
+  EntityUserListFilter,
 } from '../../filters';
 import {
   CatalogApi,
@@ -286,7 +286,7 @@ describe('<UserListPicker />', () => {
 
     await waitFor(() =>
       expect(updateFilters).toHaveBeenLastCalledWith({
-        user: UserOwnersFilter.owned(ownershipEntityRefs),
+        user: EntityUserListFilter.owned(ownershipEntityRefs),
       }),
     );
 
@@ -343,7 +343,7 @@ describe('<UserListPicker />', () => {
 
     await waitFor(() =>
       expect(updateFilters).toHaveBeenLastCalledWith({
-        user: UserOwnersFilter.starred([
+        user: EntityUserListFilter.starred([
           'component:default/e-1',
           'component:default/e-2',
         ]),
@@ -414,7 +414,7 @@ describe('<UserListPicker />', () => {
 
     await waitFor(() =>
       expect(updateFilters).toHaveBeenLastCalledWith({
-        user: UserOwnersFilter.all(),
+        user: EntityUserListFilter.all(),
       }),
     );
 
@@ -431,7 +431,7 @@ describe('<UserListPicker />', () => {
       </ApiProvider>,
     );
     expect(updateFilters).toHaveBeenLastCalledWith({
-      user: UserOwnersFilter.owned(ownershipEntityRefs),
+      user: EntityUserListFilter.owned(ownershipEntityRefs),
     });
   });
 
@@ -536,7 +536,7 @@ describe('<UserListPicker />', () => {
 
         await waitFor(() =>
           expect(updateFilters).toHaveBeenLastCalledWith({
-            user: UserOwnersFilter.all(),
+            user: EntityUserListFilter.all(),
           }),
         );
       });
@@ -628,7 +628,7 @@ describe('<UserListPicker />', () => {
 
         await waitFor(() =>
           expect(updateFilters).toHaveBeenLastCalledWith({
-            user: UserOwnersFilter.all(),
+            user: EntityUserListFilter.all(),
           }),
         );
       });
diff --git a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx
index 153cdfdb9e..dff4f995ae 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 { UserListFilter, UserOwnersFilter } from '../../filters';
+import { UserListFilter, EntityUserListFilter } from '../../filters';
 import { useEntityList, useStarredEntities } from '../../hooks';
 import { UserListFilterKind } from '../../types';
 import { useOwnedEntitiesCount } from './useOwnedEntitiesCount';
@@ -219,7 +219,7 @@ export const UserListPicker = (props: UserListPickerProps) => {
         if (selectedUserFilter === 'starred') {
           return starredEntitiesFilter;
         }
-        return UserOwnersFilter.all();
+        return EntityUserListFilter.all();
       };
 
       updateFilters({ user: getFilter() });
diff --git a/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.ts b/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.ts
index 32e367cc07..f7fb9d4516 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 { UserOwnersFilter } from '../../filters';
+import { EntityUserListFilter } from '../../filters';
 import { useEntityList } from '../../hooks';
 import { reduceCatalogFilters } from '../../utils';
 
@@ -94,7 +94,7 @@ export function useOwnedEntitiesCount() {
 
   const loading = loadingEntityRefs || loadingEntityOwnership;
   const filter = useMemo(
-    () => UserOwnersFilter.owned(ownershipEntityRefs ?? []),
+    () => EntityUserListFilter.owned(ownershipEntityRefs ?? []),
     [ownershipEntityRefs],
   );
 
diff --git a/plugins/catalog-react/src/components/UserListPicker/useStarredEntitiesCount.ts b/plugins/catalog-react/src/components/UserListPicker/useStarredEntitiesCount.ts
index ea7423efe8..aff5066a74 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 { UserOwnersFilter } from '../../filters';
+import { EntityUserListFilter } from '../../filters';
 import { useEntityList, useStarredEntities } from '../../hooks';
 import { reduceCatalogFilters } from '../../utils';
 
@@ -72,7 +72,7 @@ export function useStarredEntitiesCount() {
   }, [refRequest.current, starredEntities]);
 
   const filter = useMemo(
-    () => UserOwnersFilter.starred(Array.from(starredEntities)),
+    () => EntityUserListFilter.starred(Array.from(starredEntities)),
     [starredEntities],
   );
 
diff --git a/plugins/catalog-react/src/filters.ts b/plugins/catalog-react/src/filters.ts
index a5a39f9b02..d0ab093e3c 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 UserOwnersFilter implements EntityFilter {
+export class EntityUserListFilter implements EntityFilter {
   private constructor(
     readonly value: UserListFilterKind,
     readonly refs?: string[],
   ) {}
 
   static owned(ownershipEntityRefs: string[]) {
-    return new UserOwnersFilter('owned', ownershipEntityRefs);
+    return new EntityUserListFilter('owned', ownershipEntityRefs);
   }
 
   static all() {
-    return new UserOwnersFilter('all');
+    return new EntityUserListFilter('all');
   }
 
   static starred(starredEntityRefs: string[]) {
-    return new UserOwnersFilter('starred', starredEntityRefs);
+    return new EntityUserListFilter('starred', starredEntityRefs);
   }
 
   getCatalogFilters(): Record<string, string[]> {
@@ -247,7 +247,7 @@ export class UserOwnersFilter implements EntityFilter {
 
 /**
  * Filters entities based on whatever the user has starred or owns them.
- * @deprecated use UserOwnersFilter
+ * @deprecated use EntityUserListFilter
  * @public
  */
 export class UserListFilter implements EntityFilter {
diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
index b7ee8a94ed..e2a8cfc657 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,
-  UserOwnersFilter,
+  EntityUserListFilter,
 } 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 | UserOwnersFilter;
+  user?: UserListFilter | EntityUserListFilter;
   owners?: EntityOwnerFilter;
   lifecycles?: EntityLifecycleFilter;
   tags?: EntityTagFilter;