From d21ee58f027dc1e8decd4c44fe654a5d4eee40c3 Mon Sep 17 00:00:00 2001
From: Sachin Chaurasiya <sachinchaurasiyachotey87@gmail.com>
Date: Thu, 10 Oct 2024 12:21:56 +0530
Subject: [PATCH] GEN-1727: Pluralize owner label everywhere (#18117)

* GEN-1727: Pluralize owner label everywhere

* fix: unit tests

* fix: playwright test

* adress comments

* fix playwright test
---
 .../e2e/Features/EntitySummaryPanel.spec.ts   |  4 ++--
 .../e2e/Features/ExploreQuickFilters.spec.ts  |  2 +-
 .../ui/playwright/e2e/Flow/Metric.spec.ts     |  2 +-
 .../playwright/e2e/Pages/ExploreTree.spec.ts  |  4 ++--
 .../ui/playwright/utils/advancedSearch.ts     |  2 +-
 .../TestSuiteList/TestSuites.component.tsx    |  2 +-
 .../TestSuiteList/TestSuites.test.tsx         |  2 +-
 .../TableQueryRightPanel.component.tsx        |  4 ++--
 .../AddDomainForm/AddDomainForm.component.tsx |  2 +-
 .../AddDomainForm/AddDomainForm.test.tsx      |  2 +-
 .../DocumentationTab.component.tsx            |  4 ++--
 .../SubDomainsTable.component.tsx             |  2 +-
 .../CommonEntitySummaryInfo.test.tsx          |  2 +-
 .../CommonEntitySummaryInfo.tsx               |  2 +-
 .../DataProductSummary.component.tsx          |  2 +-
 .../mocks/CommonEntitySummaryInfo.mock.ts     |  2 +-
 .../AddGlossary/AddGlossary.component.tsx     |  2 +-
 .../AddGlossaryTermForm.component.tsx         |  2 +-
 .../GlossaryDetailsRightPanel.component.tsx   |  4 ++--
 .../GlossaryDetailsRightPanel.test.tsx        |  2 +-
 .../GlossaryTermTab.component.tsx             |  2 +-
 .../PipelineDetails.component.tsx             |  2 +-
 .../Settings/Services/Services.test.tsx       |  2 +-
 .../components/Settings/Services/Services.tsx |  2 +-
 .../EntitySummaryDetails.tsx                  |  2 +-
 .../OwnerLabel/OwnerLabel.component.tsx       |  4 ++--
 .../UserTeamSelectableList.component.tsx      |  4 ++--
 .../src/constants/AdvancedSearch.constants.ts | 12 +++++-----
 .../ui/src/locale/languages/de-de.json        |  1 +
 .../ui/src/locale/languages/en-us.json        |  1 +
 .../ui/src/locale/languages/es-es.json        |  1 +
 .../ui/src/locale/languages/fr-fr.json        |  1 +
 .../ui/src/locale/languages/he-he.json        |  1 +
 .../ui/src/locale/languages/ja-jp.json        |  1 +
 .../ui/src/locale/languages/nl-nl.json        |  1 +
 .../ui/src/locale/languages/pr-pr.json        |  1 +
 .../ui/src/locale/languages/pt-br.json        |  1 +
 .../ui/src/locale/languages/ru-ru.json        |  1 +
 .../ui/src/locale/languages/zh-cn.json        |  1 +
 .../MetricListPage/MetricListPage.tsx         |  2 +-
 .../ServiceDetailsPage/ServiceDetailsPage.tsx |  2 +-
 .../ui/src/utils/AdvancedSearchClassBase.ts   |  2 +-
 .../ui/src/utils/Alerts/AlertsUtil.test.tsx   |  4 +++-
 .../ui/src/utils/Alerts/AlertsUtil.tsx        |  6 ++---
 .../src/utils/Database/Database.util.test.tsx |  2 +-
 .../ui/src/utils/Database/Database.util.tsx   |  2 +-
 .../ui/src/utils/EntityUtils.test.tsx         |  4 ++--
 .../resources/ui/src/utils/EntityUtils.tsx    | 22 +++++++++----------
 .../main/resources/ui/src/utils/FeedUtils.tsx |  2 +-
 .../src/utils/ServiceMainTabContentUtils.tsx  |  2 +-
 50 files changed, 77 insertions(+), 64 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/EntitySummaryPanel.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/EntitySummaryPanel.spec.ts
index 4ff9e53375d..9606d49f9a8 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/EntitySummaryPanel.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/EntitySummaryPanel.spec.ts
@@ -43,7 +43,7 @@ test.describe('Entity Summary Panel', () => {
     await expect(
       page.locator('.ant-drawer-title > [data-testid="entity-link"]')
     ).toBeVisible();
-    await expect(page.getByTestId('Owner-value')).toBeVisible();
+    await expect(page.getByTestId('Owners-value')).toBeVisible();
     await expect(page.getByTestId('Tier-label')).toBeVisible();
     await expect(page.getByTestId('Service-label')).toBeVisible();
     await expect(page.getByTestId('Usage-label')).toBeVisible();
@@ -58,7 +58,7 @@ test.describe('Entity Summary Panel', () => {
     await expect(
       page.locator('.ant-drawer-title > [data-testid="entity-link"]')
     ).toBeVisible();
-    await expect(page.getByTestId('Owner-value')).toBeVisible();
+    await expect(page.getByTestId('Owners-value')).toBeVisible();
     await expect(page.getByTestId('Tier-label')).toBeVisible();
     await expect(page.getByTestId('Service-label')).toBeVisible();
     await expect(page.getByTestId('Database-label')).toBeVisible();
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ExploreQuickFilters.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ExploreQuickFilters.spec.ts
index c0a0968e49c..3c941f8d775 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ExploreQuickFilters.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ExploreQuickFilters.spec.ts
@@ -80,7 +80,7 @@ test('search dropdown should work properly for quick filters', async ({
 
 test('should search for empty or null filters', async ({ page }) => {
   const items = [
-    { label: 'Owner', key: 'owners.displayName.keyword' },
+    { label: 'Owners', key: 'owners.displayName.keyword' },
     { label: 'Tag', key: 'tags.tagFQN' },
     { label: 'Domain', key: 'domain.displayName.keyword' },
     { label: 'Tier', key: 'tier.tagFQN' },
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/Metric.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/Metric.spec.ts
index 3e8647d613b..e7638410261 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/Metric.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/Metric.spec.ts
@@ -149,7 +149,7 @@ test.describe('Listing page and add Metric flow should work', () => {
       page.getByRole('cell', { name: 'Glossary Terms', exact: true })
     ).toBeVisible();
     await expect(
-      page.getByRole('cell', { name: 'Owner', exact: true })
+      page.getByRole('cell', { name: 'Owners', exact: true })
     ).toBeVisible();
 
     // check for metric entities in table
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ExploreTree.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ExploreTree.spec.ts
index 9f0ba1bacd5..9db6cfb2d1c 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ExploreTree.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ExploreTree.spec.ts
@@ -66,8 +66,8 @@ test.describe('Explore Tree scenarios ', () => {
       await expect(
         page.getByTestId('search-dropdown-Domain').locator('span')
       ).toContainText('Domain');
-      await expect(page.getByTestId('search-dropdown-Owner')).toContainText(
-        'Owner'
+      await expect(page.getByTestId('search-dropdown-Owners')).toContainText(
+        'Owners'
       );
       await expect(
         page.getByTestId('search-dropdown-Tag').locator('span')
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/advancedSearch.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/advancedSearch.ts
index f2b4e53d41c..783bc7d1dbb 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/advancedSearch.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/advancedSearch.ts
@@ -23,7 +23,7 @@ type EntityFields = {
 
 export const FIELDS: EntityFields[] = [
   {
-    id: 'Owner',
+    id: 'Owners',
     name: 'owners.displayName.keyword',
     localSearch: false,
   },
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.component.tsx
index 18800dd105b..20a328fc28c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.component.tsx
@@ -182,7 +182,7 @@ export const TestSuites = ({ summaryPanel }: { summaryPanel: ReactNode }) => {
         },
       },
       {
-        title: t('label.owner'),
+        title: t('label.owner-plural'),
         dataIndex: 'owners',
         key: 'owners',
         render: (owners: EntityReference[]) => <OwnerLabel owners={owners} />,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.test.tsx
index b049a6be7f6..babbd838659 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteList/TestSuites.test.tsx
@@ -129,7 +129,7 @@ describe('TestSuites component', () => {
       'label.name',
       'label.test-plural',
       'label.success %',
-      'label.owner',
+      'label.owner-plural',
     ]);
     expect(await screen.findByTestId('test-suite-table')).toBeInTheDocument();
     expect(
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx
index 209f82e9ec5..d9b58e21778 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx
@@ -86,7 +86,7 @@ const TableQueryRightPanel = ({
             <Space className="relative" direction="vertical" size={4}>
               <Space align="center" className="w-full" size={0}>
                 <Typography.Text className="right-panel-label">
-                  {t('label.owner')}
+                  {t('label.owner-plural')}
                 </Typography.Text>
 
                 {(EditAll || EditOwners) && (
@@ -99,7 +99,7 @@ const TableQueryRightPanel = ({
                     }>
                     <Tooltip
                       title={t('label.edit-entity', {
-                        entity: t('label.owner-lowercase'),
+                        entity: t('label.owner-lowercase-plural'),
                       })}>
                       <Button
                         className="cursor-pointer flex-center"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.component.tsx
index 5a1820abfc0..357da5b3fa8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.component.tsx
@@ -143,7 +143,7 @@ const AddDomainForm = ({
     name: 'owners',
     id: 'root/owner',
     required: false,
-    label: t('label.owner'),
+    label: t('label.owner-plural'),
     type: FieldTypes.USER_TEAM_SELECT,
     props: {
       hasPermission: true,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.test.tsx
index e548070156f..6406e78fcdb 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.test.tsx
@@ -80,7 +80,7 @@ describe('Test Add Domain component', () => {
     expect(screen.getByTestId('color-color-input')).toBeInTheDocument();
     expect(screen.getByText('label.domain-type')).toBeInTheDocument();
     expect(screen.getAllByTestId('helper-icon')).toHaveLength(2);
-    expect(screen.getByText('label.owner')).toBeInTheDocument();
+    expect(screen.getByText('label.owner-plural')).toBeInTheDocument();
     expect(screen.getByTestId('add-owner')).toBeInTheDocument();
     expect(screen.getByText('label.expert-plural')).toBeInTheDocument();
     expect(screen.getByTestId('add-experts')).toBeInTheDocument();
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx
index 2378134a3d7..d6bce2a2027 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx
@@ -200,7 +200,7 @@ const DocumentationTab = ({
             <Col data-testid="domain-owner-name" span="24">
               <div className="d-flex items-center m-b-xss">
                 <Typography.Text className="right-panel-label">
-                  {t('label.owner')}
+                  {t('label.owner-plural')}
                 </Typography.Text>
                 {editOwnerPermission && domain.owners && (
                   <UserTeamSelectableList
@@ -210,7 +210,7 @@ const DocumentationTab = ({
                     onUpdate={(updatedUser) => handleUpdatedOwner(updatedUser)}>
                     <Tooltip
                       title={t('label.edit-entity', {
-                        entity: t('label.owner'),
+                        entity: t('label.owner-plural'),
                       })}>
                       <Button
                         className="cursor-pointer flex-center m-l-xss"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/SubDomainsTable/SubDomainsTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/SubDomainsTable/SubDomainsTable.component.tsx
index 098270d2010..81d341d72aa 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/SubDomainsTable/SubDomainsTable.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/SubDomainsTable/SubDomainsTable.component.tsx
@@ -73,7 +73,7 @@ const SubDomainsTable = ({
           ),
       },
       {
-        title: t('label.owner'),
+        title: t('label.owner-plural'),
         dataIndex: 'owners',
         key: 'owners',
         render: (owners: EntityReference[]) => <OwnerLabel owners={owners} />,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/CommonEntitySummaryInfo/CommonEntitySummaryInfo.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/CommonEntitySummaryInfo/CommonEntitySummaryInfo.test.tsx
index 054e3607d83..4ef19c3b6b1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/CommonEntitySummaryInfo/CommonEntitySummaryInfo.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/CommonEntitySummaryInfo/CommonEntitySummaryInfo.test.tsx
@@ -65,7 +65,7 @@ describe('CommonEntitySummaryInfo component', () => {
     );
 
     expect(screen.queryByTestId('label.owner-label')).not.toBeInTheDocument();
-    expect(screen.getByTestId('label.owner-value')).toHaveTextContent(
+    expect(screen.getByTestId('label.owner-plural-value')).toHaveTextContent(
       'No Owner'
     );
     expect(screen.getByTestId('Type-label')).toHaveTextContent('Type');
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/CommonEntitySummaryInfo/CommonEntitySummaryInfo.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/CommonEntitySummaryInfo/CommonEntitySummaryInfo.tsx
index 4a32df36b2c..de4466a7e11 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/CommonEntitySummaryInfo/CommonEntitySummaryInfo.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/CommonEntitySummaryInfo/CommonEntitySummaryInfo.tsx
@@ -30,7 +30,7 @@ function CommonEntitySummaryInfo({
   return (
     <Row gutter={[0, 4]}>
       {entityInfo.map((info) => {
-        const isOwner = info.name === t('label.owner');
+        const isOwner = info.name === t('label.owner-plural');
 
         return info.visible?.includes(componentType) ? (
           <Col key={info.name} span={24}>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx
index 3783c522612..5a19a085866 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx
@@ -82,7 +82,7 @@ const DataProductSummary = ({
             <Typography.Text
               className="summary-panel-section-title"
               data-testid="owner-header">
-              {t('label.owner')}
+              {t('label.owner-plural')}
             </Typography.Text>
           </Col>
           <Col span={24}>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/mocks/CommonEntitySummaryInfo.mock.ts b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/mocks/CommonEntitySummaryInfo.mock.ts
index 691336c4501..d4fdb24457c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/mocks/CommonEntitySummaryInfo.mock.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/mocks/CommonEntitySummaryInfo.mock.ts
@@ -13,7 +13,7 @@
 
 export const mockCommonEntityInfo = [
   {
-    name: 'label.owner',
+    name: 'label.owner-plural',
     value: 'No Owner',
     url: '',
     isLink: false,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossary/AddGlossary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossary/AddGlossary.component.tsx
index dda3df2d971..1681b3d3ad4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossary/AddGlossary.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossary/AddGlossary.component.tsx
@@ -196,7 +196,7 @@ const AddGlossary = ({
     name: 'owners',
     id: 'root/owner',
     required: false,
-    label: t('label.owner'),
+    label: t('label.owner-plural'),
     type: FieldTypes.USER_TEAM_SELECT,
     props: {
       hasPermission: true,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossaryTermForm/AddGlossaryTermForm.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossaryTermForm/AddGlossaryTermForm.component.tsx
index 06e409d3bea..ca248a75e6b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossaryTermForm/AddGlossaryTermForm.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossaryTermForm/AddGlossaryTermForm.component.tsx
@@ -314,7 +314,7 @@ const AddGlossaryTermForm = ({
     name: 'owners',
     id: 'root/owner',
     required: false,
-    label: t('label.owner'),
+    label: t('label.owner-plural'),
     type: FieldTypes.USER_TEAM_SELECT,
     props: {
       hasPermission: true,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component.tsx
index c753cc35069..25e64c16ae5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component.tsx
@@ -158,7 +158,7 @@ const GlossaryDetailsRightPanel = ({
       <Col data-testid="glossary-right-panel-owner-link" span="24">
         <div className="d-flex items-center m-b-xs">
           <Typography.Text className="right-panel-label">
-            {t('label.owner')}
+            {t('label.owner-plural')}
           </Typography.Text>
           {(permissions.EditOwners || permissions.EditAll) &&
             selectedData.owners &&
@@ -171,7 +171,7 @@ const GlossaryDetailsRightPanel = ({
                 onUpdate={(updatedUser) => handleUpdatedOwner(updatedUser)}>
                 <Tooltip
                   title={t('label.edit-entity', {
-                    entity: t('label.owner'),
+                    entity: t('label.owner-plural'),
                   })}>
                   <Button
                     className="cursor-pointer flex-center m-l-xss"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.test.tsx
index bf399b6f8e6..adfca2cf6cd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.test.tsx
@@ -78,7 +78,7 @@ describe('GlossaryDetailsRightPanel', () => {
     );
 
     expect(getByTestId('glossary-right-panel-owner-link')).toHaveTextContent(
-      'label.owner'
+      'label.owner-plural'
     );
     expect(getByTestId('glossary-reviewer-heading-name')).toHaveTextContent(
       'label.reviewer-plural'
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx
index 353dedacb50..6897cd75d05 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx
@@ -163,7 +163,7 @@ const GlossaryTermTab = ({
           ),
       },
       {
-        title: t('label.owner'),
+        title: t('label.owner-plural'),
         dataIndex: 'owners',
         key: 'owners',
         width: '17%',
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.component.tsx
index 7ea1244a54d..65f9e95da19 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.component.tsx
@@ -434,7 +434,7 @@ const PipelineDetails = ({
         ),
       },
       {
-        title: t('label.owner'),
+        title: t('label.owner-plural'),
         dataIndex: 'owners',
         key: 'owners',
         width: 120,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.test.tsx
index 602aa50d296..c19344bfe71 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.test.tsx
@@ -354,7 +354,7 @@ describe('Services', () => {
       await screen.findByTestId('service-name-pipelineServices')
     ).toHaveTextContent('Glue');
 
-    expect(await screen.findByText('label.owner')).toBeInTheDocument();
+    expect(await screen.findByText('label.owner-plural')).toBeInTheDocument();
     expect(await screen.findByText('OwnerLabel')).toBeInTheDocument();
   });
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
index dafd55996d7..ebff1b81640 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
@@ -344,7 +344,7 @@ const Services = ({ serviceName }: ServicesProps) => {
       ),
     },
     {
-      title: t('label.owner'),
+      title: t('label.owner-plural'),
       dataIndex: 'owners',
       key: 'owners',
       width: 200,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.tsx
index b51fa5dc485..1ddebca5885 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.tsx
@@ -120,7 +120,7 @@ const EntitySummaryDetails = ({ data }: GetInfoElementsProps) => {
             <span
               className="d-flex gap-1 items-center"
               data-testid="owner-link">
-              {t('label.no-entity', { entity: t('label.owner') })}
+              {t('label.no-entity', { entity: t('label.owner-plural') })}
             </span>
           );
       }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerLabel/OwnerLabel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerLabel/OwnerLabel.component.tsx
index 884febb15cb..6af04681b65 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerLabel/OwnerLabel.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerLabel/OwnerLabel.component.tsx
@@ -119,7 +119,7 @@ export const OwnerLabel = ({
               const inheritedIcon = owner?.inherited ? (
                 <Tooltip
                   title={t('label.inherited-entity', {
-                    entity: t('label.owner'),
+                    entity: t('label.owner-plural'),
                   })}>
                   <InheritIcon
                     className="inherit-icon cursor-pointer"
@@ -165,7 +165,7 @@ export const OwnerLabel = ({
               className={classNames('no-owner font-medium text-xs', className)}
               data-testid="owner-link">
               {placeHolder ??
-                t('label.no-entity', { entity: t('label.owner') })}
+                t('label.no-entity', { entity: t('label.owner-plural') })}
             </Typography.Text>
           </div>
         )}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/UserTeamSelectableList/UserTeamSelectableList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/UserTeamSelectableList/UserTeamSelectableList.component.tsx
index de127964266..5a16b702536 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/UserTeamSelectableList/UserTeamSelectableList.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/UserTeamSelectableList/UserTeamSelectableList.component.tsx
@@ -267,7 +267,7 @@ export const UserTeamSelectableList = ({
               size={8}>
               <Typography.Text className="text-grey-muted">
                 {t('label.selected-entity', {
-                  entity: label ?? t('label.owner'),
+                  entity: label ?? t('label.owner-plural'),
                 })}
               </Typography.Text>
               <div className="user-team-popover-header-content">
@@ -369,7 +369,7 @@ export const UserTeamSelectableList = ({
               !popupVisible &&
               (tooltipText ??
                 t('label.edit-entity', {
-                  entity: t('label.owner'),
+                  entity: t('label.owner-plural'),
                 }))
             }>
             <Button
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/AdvancedSearch.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/AdvancedSearch.constants.ts
index f827da99dd3..92454b208bf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/AdvancedSearch.constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/AdvancedSearch.constants.ts
@@ -22,7 +22,7 @@ export const COMMON_DROPDOWN_ITEMS = [
     key: EntityFields.DOMAIN,
   },
   {
-    label: t('label.owner'),
+    label: t('label.owner-plural'),
     key: EntityFields.OWNERS,
   },
   {
@@ -53,7 +53,7 @@ export const DATA_ASSET_DROPDOWN_ITEMS = [
     key: EntityFields.DOMAIN,
   },
   {
-    label: t('label.owner'),
+    label: t('label.owner-plural'),
     key: EntityFields.OWNERS,
   },
   {
@@ -174,7 +174,7 @@ export const GLOSSARY_DROPDOWN_ITEMS = [
     key: EntityFields.DOMAIN,
   },
   {
-    label: t('label.owner'),
+    label: t('label.owner-plural'),
     key: EntityFields.OWNERS,
   },
   {
@@ -208,7 +208,7 @@ export const DATA_PRODUCT_DROPDOWN_ITEMS = [
     key: EntityFields.DOMAIN,
   },
   {
-    label: t('label.owner'),
+    label: t('label.owner-plural'),
     key: EntityFields.OWNERS,
   },
 ];
@@ -221,7 +221,7 @@ export const DOMAIN_DATAPRODUCT_DROPDOWN_ITEMS = [
     key: EntityFields.ENTITY_TYPE,
   },
   {
-    label: t('label.owner'),
+    label: t('label.owner-plural'),
     key: EntityFields.OWNERS,
   },
   {
@@ -254,7 +254,7 @@ export const GLOSSARY_ASSETS_DROPDOWN_ITEMS = [
     key: EntityFields.DOMAIN,
   },
   {
-    label: t('label.owner'),
+    label: t('label.owner-plural'),
     key: EntityFields.OWNERS,
   },
   {
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
index 0a8541f35fb..46497f0edd7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
@@ -822,6 +822,7 @@
     "owner": "Besitzer",
     "owner-kpi": "Owner KPI",
     "owner-lowercase": "besitzer",
+    "owner-lowercase-plural": "owners",
     "owner-plural": "Besitzer",
     "page-not-found": "Seite nicht gefunden",
     "page-views-by-data-asset-plural": "Seitenaufrufe nach Datenanlage",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
index b1edbeab746..340deee710a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
@@ -822,6 +822,7 @@
     "owner": "Owner",
     "owner-kpi": "Owner KPI",
     "owner-lowercase": "owner",
+    "owner-lowercase-plural": "owners",
     "owner-plural": "Owners",
     "page-not-found": "Page Not Found",
     "page-views-by-data-asset-plural": "Page Views by Data Assets",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
index 735d456a688..7b914e98401 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
@@ -822,6 +822,7 @@
     "owner": "Propietario",
     "owner-kpi": "Owner KPI",
     "owner-lowercase": "propietario",
+    "owner-lowercase-plural": "owners",
     "owner-plural": "Propietarios",
     "page-not-found": "Página no encontrada",
     "page-views-by-data-asset-plural": "Vistas de página por activos de datos",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
index 64338e468af..f9b2da4fb24 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
@@ -822,6 +822,7 @@
     "owner": "Propriétaire",
     "owner-kpi": "Owner KPI",
     "owner-lowercase": "propriétaire",
+    "owner-lowercase-plural": "owners",
     "owner-plural": "Propriétaires",
     "page-not-found": "Page Non Trouvée",
     "page-views-by-data-asset-plural": "Vues de Page par Actif de Données",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json
index ffe687b1a48..9e927cba141 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json
@@ -822,6 +822,7 @@
     "owner": "אחראי נתונים",
     "owner-kpi": "Owner KPI",
     "owner-lowercase": "אחראי נתונים",
+    "owner-lowercase-plural": "owners",
     "owner-plural": "אחראי נתונים",
     "page-not-found": "הדף לא נמצא",
     "page-views-by-data-asset-plural": "צפיות בדפים לפי נכסי נתונים",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
index 364a6798005..883cfc02ac3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
@@ -822,6 +822,7 @@
     "owner": "所有者",
     "owner-kpi": "Owner KPI",
     "owner-lowercase": "所有者",
+    "owner-lowercase-plural": "owners",
     "owner-plural": "所有者",
     "page-not-found": "ページが存在しません",
     "page-views-by-data-asset-plural": "データアセットごとのページビュー",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json
index abb1fdd1263..a5d899cb7ff 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json
@@ -822,6 +822,7 @@
     "owner": "Eigenaar",
     "owner-kpi": "Owner KPI",
     "owner-lowercase": "eigenaar",
+    "owner-lowercase-plural": "owners",
     "owner-plural": "Eigenaren",
     "page-not-found": "Pagina niet gevonden",
     "page-views-by-data-asset-plural": "Paginaweergaven per data-asset",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json
index 0a7d302c824..9b510cf7716 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json
@@ -822,6 +822,7 @@
     "owner": "مالک",
     "owner-kpi": "KPI مالک",
     "owner-lowercase": "مالک",
+    "owner-lowercase-plural": "owners",
     "owner-plural": "مالکان",
     "page-not-found": "صفحه یافت نشد",
     "page-views-by-data-asset-plural": "بازدیدهای صفحه توسط دارایی‌های داده",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
index 307057ce123..60c45be7620 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
@@ -822,6 +822,7 @@
     "owner": "Proprietário",
     "owner-kpi": "Owner KPI",
     "owner-lowercase": "proprietário",
+    "owner-lowercase-plural": "owners",
     "owner-plural": "Proprietários",
     "page-not-found": "Página Não Encontrada",
     "page-views-by-data-asset-plural": "Visualizações de Página por Ativos de Dados",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
index 33fc7350a2a..7c595235977 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
@@ -822,6 +822,7 @@
     "owner": "Владелец",
     "owner-kpi": "Owner KPI",
     "owner-lowercase": "владелец",
+    "owner-lowercase-plural": "owners",
     "owner-plural": "Владельцы",
     "page-not-found": "Страница не найдена",
     "page-views-by-data-asset-plural": "Просмотры объектов данных",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
index 139301926bb..889c56f89ff 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
@@ -822,6 +822,7 @@
     "owner": "所有者",
     "owner-kpi": "Owner KPI",
     "owner-lowercase": "所有者",
+    "owner-lowercase-plural": "owners",
     "owner-plural": "所有者",
     "page-not-found": "没有找到页面",
     "page-views-by-data-asset-plural": "数据资产页面浏览量",
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/MetricsPage/MetricListPage/MetricListPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/MetricsPage/MetricListPage/MetricListPage.tsx
index 0eda60d862f..5c2826d26f8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/MetricsPage/MetricListPage/MetricListPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/MetricsPage/MetricListPage/MetricListPage.tsx
@@ -214,7 +214,7 @@ const MetricListPage = () => {
         ),
       },
       {
-        title: t('label.owner'),
+        title: t('label.owner-plural'),
         dataIndex: 'owners',
         key: 'owners',
         width: 200,
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx
index f2c4d3bedf5..ef9e3e98bd4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx
@@ -668,7 +668,7 @@ const ServiceDetailsPage: FunctionComponent = () => {
         showErrorToast(
           error as AxiosError,
           t('server.entity-updating-error', {
-            entity: t('label.owner-lowercase'),
+            entity: t('label.owner-lowercase-plural'),
           })
         );
       }
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts
index c7c57bc8e47..5a53ea1eccf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts
@@ -471,7 +471,7 @@ class AdvancedSearchClassBase {
       },
 
       [EntityFields.OWNERS]: {
-        label: t('label.owner'),
+        label: t('label.owner-plural'),
         type: 'select',
         mainWidgetProps: this.mainWidgetProps,
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.test.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.test.tsx
index 585c30eb1c0..e234caa4822 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.test.tsx
@@ -61,7 +61,9 @@ describe('AlertsUtil tests', () => {
   });
 
   it('getFunctionDisplayName should return correct text for matchAnyOwnerName', () => {
-    expect(getFunctionDisplayName('matchAnyOwnerName')).toBe('label.owner');
+    expect(getFunctionDisplayName('matchAnyOwnerName')).toBe(
+      'label.owner-plural'
+    );
   });
 
   it('getFunctionDisplayName should return correct text for matchAnyEventType', () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx
index a2a92f0dbdd..b4eb7f883ae 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx
@@ -83,7 +83,7 @@ export const getFunctionDisplayName = (func: string): string => {
     case 'matchAnyEntityFqn':
       return i18next.t('label.fqn-uppercase');
     case 'matchAnyOwnerName':
-      return i18next.t('label.owner');
+      return i18next.t('label.owner-plural');
     case 'matchAnyEventType':
       return i18next.t('label.event-type');
     case 'matchTestResult':
@@ -477,7 +477,7 @@ export const getMessageFromArgumentName = (argumentName: string) => {
       return t('message.field-text-is-required', {
         fieldText: t('label.entity-list', {
           entity: t('label.entity-name', {
-            entity: t('label.owner'),
+            entity: t('label.owner-plural'),
           }),
         }),
       });
@@ -614,7 +614,7 @@ export const getFieldByArgumentType = (
           data-testid="owner-name-select"
           mode="multiple"
           placeholder={t('label.search-by-type', {
-            type: t('label.owner-lowercase'),
+            type: t('label.owner-lowercase-plural'),
           })}
         />
       );
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Database/Database.util.test.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/Database/Database.util.test.tsx
index 8f1e96c6224..af7bbab48b8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/Database/Database.util.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/Database/Database.util.test.tsx
@@ -92,7 +92,7 @@ describe('Database Util', () => {
           render: expect.any(Function),
         },
         {
-          title: 'label.owner',
+          title: 'label.owner-plural',
           dataIndex: 'owners',
           key: 'owners',
           width: 120,
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Database/Database.util.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/Database/Database.util.tsx
index 786a07e7ec8..01653c08906 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/Database/Database.util.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/Database/Database.util.tsx
@@ -91,7 +91,7 @@ export const schemaTableColumns: ColumnsType<DatabaseSchema> = [
       ),
   },
   {
-    title: t('label.owner'),
+    title: t('label.owner-plural'),
     dataIndex: 'owners',
     key: 'owners',
     width: 120,
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.test.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.test.tsx
index 1960dc44b04..f3eaf2e8430 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.test.tsx
@@ -118,7 +118,7 @@ describe('EntityUtils unit tests', () => {
         getEntityOverview(ExplorePageTabs.CHARTS, MOCK_CHART_DATA)
       );
 
-      expect(result).toContain('label.owner');
+      expect(result).toContain('label.owner-plural');
       expect(result).toContain('label.chart');
       expect(result).toContain('label.url-uppercase');
       expect(result).toContain('Are you an ethnic minority in your city?');
@@ -140,7 +140,7 @@ describe('EntityUtils unit tests', () => {
         })
       );
 
-      expect(result).toContain('label.owner');
+      expect(result).toContain('label.owner-plural');
       expect(result).toContain('label.type');
       expect(result).toContain('label.service');
       expect(result).toContain('label.database');
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx
index e4e96703cd8..ae0ba4b3990 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx
@@ -265,7 +265,7 @@ const getTableOverview = (
 
   const overview = [
     {
-      name: i18next.t('label.owner'),
+      name: i18next.t('label.owner-plural'),
       value: <OwnerLabel hasPermission={false} owners={owners} />,
       visible: [DRAWER_NAVIGATION_OPTIONS.lineage],
     },
@@ -376,7 +376,7 @@ const getPipelineOverview = (pipelineDetails: Pipeline) => {
 
   const overview = [
     {
-      name: i18next.t('label.owner'),
+      name: i18next.t('label.owner-plural'),
       value: <OwnerLabel hasPermission={false} owners={owners} />,
       visible: [DRAWER_NAVIGATION_OPTIONS.lineage],
     },
@@ -424,7 +424,7 @@ const getDashboardOverview = (dashboardDetails: Dashboard) => {
 
   const overview = [
     {
-      name: i18next.t('label.owner'),
+      name: i18next.t('label.owner-plural'),
       value: <OwnerLabel hasPermission={false} owners={owners} />,
       visible: [DRAWER_NAVIGATION_OPTIONS.lineage],
     },
@@ -481,7 +481,7 @@ export const getSearchIndexOverview = (
 
   const overview = [
     {
-      name: i18next.t('label.owner'),
+      name: i18next.t('label.owner-plural'),
       value: <OwnerLabel hasPermission={false} owners={owners} />,
       visible: [DRAWER_NAVIGATION_OPTIONS.lineage],
     },
@@ -513,7 +513,7 @@ const getMlModelOverview = (mlModelDetails: Mlmodel) => {
 
   const overview = [
     {
-      name: i18next.t('label.owner'),
+      name: i18next.t('label.owner-plural'),
       value: <OwnerLabel hasPermission={false} owners={owners} />,
       visible: [DRAWER_NAVIGATION_OPTIONS.lineage],
     },
@@ -609,7 +609,7 @@ const getChartOverview = (chartDetails: Chart) => {
 
   const overview = [
     {
-      name: i18next.t('label.owner'),
+      name: i18next.t('label.owner-plural'),
       value: <OwnerLabel hasPermission={false} owners={owners} />,
       visible: [DRAWER_NAVIGATION_OPTIONS.lineage],
     },
@@ -674,7 +674,7 @@ const getDataModelOverview = (dataModelDetails: DashboardDataModel) => {
 
   const overview = [
     {
-      name: i18next.t('label.owner'),
+      name: i18next.t('label.owner-plural'),
       value: <OwnerLabel hasPermission={false} owners={owners} />,
       visible: [DRAWER_NAVIGATION_OPTIONS.lineage],
     },
@@ -748,7 +748,7 @@ const getStoredProcedureOverview = (
 
   const overview = [
     {
-      name: i18next.t('label.owner'),
+      name: i18next.t('label.owner-plural'),
       value: <OwnerLabel hasPermission={false} owners={owners} />,
       visible: [DRAWER_NAVIGATION_OPTIONS.lineage],
     },
@@ -826,7 +826,7 @@ const getDatabaseOverview = (databaseDetails: Database) => {
 
   const overview = [
     {
-      name: i18next.t('label.owner'),
+      name: i18next.t('label.owner-plural'),
       value: <OwnerLabel hasPermission={false} owners={owners} />,
       visible: [DRAWER_NAVIGATION_OPTIONS.explore],
     },
@@ -866,7 +866,7 @@ const getDatabaseSchemaOverview = (databaseSchemaDetails: DatabaseSchema) => {
 
   const overview = [
     {
-      name: i18next.t('label.owner'),
+      name: i18next.t('label.owner-plural'),
       value: <OwnerLabel hasPermission={false} owners={owners} />,
       visible: [DRAWER_NAVIGATION_OPTIONS.explore],
     },
@@ -915,7 +915,7 @@ const getEntityServiceOverview = (serviceDetails: EntityServiceUnion) => {
 
   const overview = [
     {
-      name: i18next.t('label.owner'),
+      name: i18next.t('label.owner-plural'),
       value: <OwnerLabel hasPermission={false} owners={owners} />,
       visible: [DRAWER_NAVIGATION_OPTIONS.explore],
     },
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx
index 91bec7c6668..e16897e93a9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx
@@ -617,7 +617,7 @@ export const getFeedChangeFieldLabel = (fieldName?: EntityField) => {
     [EntityField.TASKS]: i18next.t('label.task-plural'),
     [EntityField.ML_FEATURES]: i18next.t('label.ml-feature-plural'),
     [EntityField.SCHEMA_TEXT]: i18next.t('label.schema-text'),
-    [EntityField.OWNER]: i18next.t('label.owner'),
+    [EntityField.OWNER]: i18next.t('label.owner-plural'),
     [EntityField.REVIEWERS]: i18next.t('label.reviewer-plural'),
     [EntityField.SYNONYMS]: i18next.t('label.synonym-plural'),
     [EntityField.RELATEDTERMS]: i18next.t('label.related-term-plural'),
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceMainTabContentUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceMainTabContentUtils.tsx
index 44d134d1853..2284f499a95 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceMainTabContentUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceMainTabContentUtils.tsx
@@ -89,7 +89,7 @@ export const getServiceMainTabColumns = (
       ]
     : []),
   {
-    title: t('label.owner'),
+    title: t('label.owner-plural'),
     dataIndex: 'owners',
     key: 'owners',
     render: (owners: ServicePageData['owners']) =>