diff --git a/plugins/scaffolder/src/components/fields/OwnershipEntityRefPicker/OwnershipEntityRefPicker.test.tsx b/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.test.tsx
similarity index 96%
rename from plugins/scaffolder/src/components/fields/OwnershipEntityRefPicker/OwnershipEntityRefPicker.test.tsx
rename to plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.test.tsx
index 3c01ffda94..0bdfe5f153 100644
--- a/plugins/scaffolder/src/components/fields/OwnershipEntityRefPicker/OwnershipEntityRefPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.test.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { render, waitFor } from '@testing-library/react';
 import { CatalogApi } from '@backstage/catalog-client';
 import { FieldProps } from '@rjsf/core';
-import { OwnershipEntityRefPicker } from './OwnershipEntityRefPicker';
+import { MyGroupsPicker } from './MyGroupsPicker';
 import { TestApiProvider } from '@backstage/test-utils';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { Entity } from '@backstage/catalog-model';
@@ -50,7 +50,7 @@ const mockIdentityApi: IdentityApi = {
   signOut: () => Promise.resolve(),
 };
 
-describe('<OwnershipEntityRefPicker />', () => {
+describe('<MyGroupsPicker />', () => {
   let entities: Entity[];
   const onChange = jest.fn();
   const schema = {};
@@ -119,7 +119,7 @@ describe('<OwnershipEntityRefPicker />', () => {
           [errorApiRef, mockErrorApi],
         ]}
       >
-        <OwnershipEntityRefPicker {...props} />
+        <MyGroupsPicker {...props} />
       </TestApiProvider>,
     );
 
@@ -191,7 +191,7 @@ describe('<OwnershipEntityRefPicker />', () => {
           [errorApiRef, mockErrorApi],
         ]}
       >
-        <OwnershipEntityRefPicker {...props} />
+        <MyGroupsPicker {...props} />
       </TestApiProvider>,
     );
 
@@ -248,7 +248,7 @@ describe('<OwnershipEntityRefPicker />', () => {
           [errorApiRef, mockErrorApi],
         ]}
       >
-        <OwnershipEntityRefPicker {...props} />
+        <MyGroupsPicker {...props} />
       </TestApiProvider>,
     );
 
diff --git a/plugins/scaffolder/src/components/fields/OwnershipEntityRefPicker/OwnershipEntityRefPicker.tsx b/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.tsx
similarity index 93%
rename from plugins/scaffolder/src/components/fields/OwnershipEntityRefPicker/OwnershipEntityRefPicker.tsx
rename to plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.tsx
index fe3cc96c0a..28bc2b93fa 100644
--- a/plugins/scaffolder/src/components/fields/OwnershipEntityRefPicker/OwnershipEntityRefPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.tsx
@@ -21,21 +21,16 @@ import {
   useApi,
 } from '@backstage/core-plugin-api';
 import { TextField, FormControl } from '@material-ui/core';
-import {
-  OwnershipEntityRefPickerProps,
-  OwnershipEntityRefPickerSchema,
-} from './schema';
+import { MyGroupsPickerProps, MyGroupsPickerSchema } from './schema';
 import { Autocomplete } from '@material-ui/lab';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { NotFoundError } from '@backstage/errors';
 import useAsync from 'react-use/lib/useAsync';
 import { Entity, stringifyEntityRef } from '@backstage/catalog-model';
 
-export { OwnershipEntityRefPickerSchema };
+export { MyGroupsPickerSchema };
 
-export const OwnershipEntityRefPicker = (
-  props: OwnershipEntityRefPickerProps,
-) => {
+export const MyGroupsPicker = (props: MyGroupsPickerProps) => {
   const {
     schema: { title, description },
     required,
diff --git a/plugins/scaffolder/src/components/fields/OwnershipEntityRefPicker/index.ts b/plugins/scaffolder/src/components/fields/MyGroupsPicker/index.ts
similarity index 84%
rename from plugins/scaffolder/src/components/fields/OwnershipEntityRefPicker/index.ts
rename to plugins/scaffolder/src/components/fields/MyGroupsPicker/index.ts
index 6237038511..00be19cf96 100644
--- a/plugins/scaffolder/src/components/fields/OwnershipEntityRefPicker/index.ts
+++ b/plugins/scaffolder/src/components/fields/MyGroupsPicker/index.ts
@@ -15,7 +15,7 @@
  */
 
 export {
-  OwnershipEntityRefPickerSchema,
-  type OwnershipEntityRefPickerUiOptions,
-  OwnershipEntityRefPickerFieldSchema,
+  MyGroupsPickerSchema,
+  type MyGroupsPickerUiOptions,
+  MyGroupsPickerFieldSchema,
 } from './schema';
diff --git a/plugins/scaffolder/src/components/fields/OwnershipEntityRefPicker/schema.ts b/plugins/scaffolder/src/components/fields/MyGroupsPicker/schema.ts
similarity index 64%
rename from plugins/scaffolder/src/components/fields/OwnershipEntityRefPicker/schema.ts
rename to plugins/scaffolder/src/components/fields/MyGroupsPicker/schema.ts
index 6d1f85b62a..d5f8af7c56 100644
--- a/plugins/scaffolder/src/components/fields/OwnershipEntityRefPicker/schema.ts
+++ b/plugins/scaffolder/src/components/fields/MyGroupsPicker/schema.ts
@@ -18,11 +18,11 @@ import { z } from 'zod';
 import { makeFieldSchemaFromZod } from '../utils';
 
 /**
- * Field schema for the OwnershipEntityRefPicker.
+ * Field schema for the MyGroupsPicker.
  * @public
  */
 
-export const OwnershipEntityRefPickerFieldSchema = makeFieldSchemaFromZod(
+export const MyGroupsPickerFieldSchema = makeFieldSchemaFromZod(
   z.string(),
   z.object({
     title: z.string().default('Group').describe('Group'),
@@ -34,24 +34,22 @@ export const OwnershipEntityRefPickerFieldSchema = makeFieldSchemaFromZod(
 );
 
 /**
- * UI options for the OwnershipEntityRefPicker.
+ * UI options for the MyGroupsPicker.
  * @public
  */
 
-export type OwnershipEntityRefPickerUiOptions =
-  typeof OwnershipEntityRefPickerFieldSchema.uiOptionsType;
+export type MyGroupsPickerUiOptions =
+  typeof MyGroupsPickerFieldSchema.uiOptionsType;
 /**
- * Props for the OwnershipEntityRefPicker.
+ * Props for the MyGroupsPicker.
  * @public
  */
 
-export type OwnershipEntityRefPickerProps =
-  typeof OwnershipEntityRefPickerFieldSchema.type;
+export type MyGroupsPickerProps = typeof MyGroupsPickerFieldSchema.type;
 
 /**
- * Schema for the OwnershipEntityRefPicker.
+ * Schema for the MyGroupsPicker.
  * @public
  */
 
-export const OwnershipEntityRefPickerSchema =
-  OwnershipEntityRefPickerFieldSchema.schema;
+export const MyGroupsPickerSchema = MyGroupsPickerFieldSchema.schema;
diff --git a/plugins/scaffolder/src/components/fields/index.ts b/plugins/scaffolder/src/components/fields/index.ts
index 67bb126ede..7ee4448f6b 100644
--- a/plugins/scaffolder/src/components/fields/index.ts
+++ b/plugins/scaffolder/src/components/fields/index.ts
@@ -18,5 +18,5 @@ export * from './OwnerPicker';
 export * from './RepoUrlPicker';
 export * from './OwnedEntityPicker';
 export * from './EntityTagsPicker';
-export * from './OwnershipEntityRefPicker';
+export * from './MyGroupsPicker';
 export { type FieldSchema, makeFieldSchemaFromZod } from './utils';
diff --git a/plugins/scaffolder/src/extensions/default.ts b/plugins/scaffolder/src/extensions/default.ts
index dae89266d0..ef827cfaca 100644
--- a/plugins/scaffolder/src/extensions/default.ts
+++ b/plugins/scaffolder/src/extensions/default.ts
@@ -40,9 +40,10 @@ import {
   OwnedEntityPickerSchema,
 } from '../components/fields/OwnedEntityPicker/OwnedEntityPicker';
 import {
-  OwnershipEntityRefPicker,
-  OwnershipEntityRefPickerSchema,
-} from '../components/fields/OwnershipEntityRefPicker/OwnershipEntityRefPicker';
+  MyGroupsPicker,
+  MyGroupsPickerSchema,
+} from '../components/fields/MyGroupsPicker/MyGroupsPicker';
+import { MyGroupsPickerFieldSchema } from '../components';
 
 export const DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS = [
   {
@@ -78,8 +79,8 @@ export const DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS = [
     schema: OwnedEntityPickerSchema,
   },
   {
-    component: OwnershipEntityRefPicker,
-    name: 'OwnershipEntityRefPicker',
-    schema: OwnershipEntityRefPickerSchema,
+    component: MyGroupsPicker,
+    name: 'MyGroupsPicker',
+    schema: MyGroupsPickerFieldSchema,
   },
 ];
diff --git a/plugins/scaffolder/src/plugin.tsx b/plugins/scaffolder/src/plugin.tsx
index 0a261a7ff0..674941eaa0 100644
--- a/plugins/scaffolder/src/plugin.tsx
+++ b/plugins/scaffolder/src/plugin.tsx
@@ -67,7 +67,7 @@ import {
 import {
   OwnershipEntityRefPicker,
   OwnershipEntityRefPickerSchema,
-} from './components/fields/OwnershipEntityRefPicker/OwnershipEntityRefPicker';
+} from './components/fields/MyGroupsPicker/MyGroupsPicker';
 
 /**
  * The main plugin export for the scaffolder.