diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx
index 4abc71728f7..2c2448d271f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx
@@ -52,6 +52,7 @@ import {
   getClassificationExtraDropdownContent,
   getTagsTableColumn,
 } from '../../utils/ClassificationUtils';
+import { getEntityName } from '../../utils/EntityUtils';
 import {
   getEntityVersionByField,
   getMutuallyExclusiveDiff,
@@ -501,10 +502,7 @@ function ClassificationDetails({
             'opacity-60': isClassificationDisabled,
           })}
           description={description}
-          entityName={
-            currentClassification?.displayName ??
-            currentClassification?.fullyQualifiedName
-          }
+          entityName={getEntityName(currentClassification)}
           hasEditAccess={editDescriptionPermission}
           isEdit={isEditClassification}
           onCancel={handleCancelEditDescription}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx
index cd0d82f8f83..c19cc211610 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx
@@ -253,7 +253,7 @@ const ContainerDataModel: FC<ContainerDataModelProps> = ({
         <ModalWithMarkdownEditor
           header={`${t('label.edit-entity', {
             entity: t('label.column'),
-          })}: "${editContainerColumnDescription.name}"`}
+          })}: "${getEntityName(editContainerColumnDescription)}"`}
           placeholder={t('label.enter-field-description', {
             field: t('label.column'),
           })}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
index 371c40aff10..dc7de54df8b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
@@ -766,7 +766,7 @@ const DashboardDetails = ({
       {editChart && (
         <ModalWithMarkdownEditor
           header={t('label.edit-chart-name', {
-            name: editChart.chart.displayName,
+            name: getEntityName(editChart.chart),
           })}
           placeholder={t('label.enter-field-description', {
             field: t('label.chart'),
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.component.tsx
index bdd915ca9b3..4fd0b4974d7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.component.tsx
@@ -188,7 +188,7 @@ const ModelTab = ({
         <ModalWithMarkdownEditor
           header={`${t('label.edit-entity', {
             entity: t('label.column'),
-          })}: "${editColumnDescription.name}"`}
+          })}: "${getEntityName(editColumnDescription)}"`}
           placeholder={t('label.enter-field-description', {
             field: t('label.column'),
           })}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx
index c668132847a..7099151e4d6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx
@@ -21,6 +21,7 @@ import { EntityField } from '../../../constants/Feeds.constants';
 import { EntityType } from '../../../enums/entity.enum';
 import { ChangeDescription } from '../../../generated/entity/type';
 import { getFeedCounts } from '../../../utils/CommonUtils';
+import { getEntityName } from '../../../utils/EntityUtils';
 import { getEntityVersionByField } from '../../../utils/EntityVersionUtils';
 import { ActivityFeedTab } from '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component';
 import DescriptionV1 from '../../common/EntityDescription/DescriptionV1';
@@ -133,7 +134,7 @@ const GlossaryDetails = ({
             <DescriptionV1
               description={description}
               entityFqn={glossary.fullyQualifiedName}
-              entityName={glossary.displayName ?? glossary.name}
+              entityName={getEntityName(glossary)}
               entityType={EntityType.GLOSSARY}
               hasEditAccess={permissions.EditDescription || permissions.EditAll}
               isEdit={isDescriptionEditable}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx
index 0d629ea225a..22847756b37 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx
@@ -741,7 +741,7 @@ const AssetsTabs = forwardRef(
         <ConfirmationModal
           bodyText={t('message.are-you-sure-action-property', {
             propertyName: getEntityName(assetToDelete),
-            action: t('label.remove-lowecase'),
+            action: t('label.remove-lowercase'),
           })}
           cancelText={t('label.cancel')}
           confirmText={t('label.delete')}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx
index dfe68a56854..caafbd0ed33 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx
@@ -97,6 +97,11 @@ const MlModelDetail: FC<MlModelDetailProp> = ({
     [mlModelFqn]
   );
 
+  const mlModelName = useMemo(
+    () => getEntityName(mlModelDetail),
+    [mlModelDetail]
+  );
+
   const fetchResourcePermission = useCallback(async () => {
     try {
       const entityPermission = await getEntityPermission(
@@ -124,12 +129,12 @@ const MlModelDetail: FC<MlModelDetailProp> = ({
       ...mlModelDetail,
       tier: getTierTags(mlModelDetail.tags ?? []),
       mlModelTags: getTagsWithoutTier(mlModelDetail.tags ?? []),
-      entityName: getEntityName(mlModelDetail),
+      entityName: mlModelName,
       isFollowing: mlModelDetail.followers?.some(
         ({ id }: { id: string }) => id === currentUser?.id
       ),
     };
-  }, [mlModelDetail]);
+  }, [mlModelDetail, mlModelName]);
 
   const fetchEntityFeedCount = () => {
     getFeedCounts(EntityType.MLMODEL, decodedMlModelFqn, setFeedCount);
@@ -392,7 +397,7 @@ const MlModelDetail: FC<MlModelDetailProp> = ({
                 <DescriptionV1
                   description={mlModelDetail.description}
                   entityFqn={decodedMlModelFqn}
-                  entityName={mlModelDetail.name}
+                  entityName={mlModelName}
                   entityType={EntityType.MLMODEL}
                   hasEditAccess={editDescriptionPermission}
                   isEdit={isEdit}
@@ -514,6 +519,7 @@ const MlModelDetail: FC<MlModelDetailProp> = ({
       feedCount,
       activeTab,
       mlModelDetail,
+      mlModelName,
       mlModelPermissions,
       isEdit,
       getMlHyperParameters,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx
index 43a74400962..73c3c27d1b0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx
@@ -21,6 +21,7 @@ import TableTags from '../../components/TableTags/TableTags.component';
 import { EntityType } from '../../enums/entity.enum';
 import { MlFeature } from '../../generated/entity/data/mlmodel';
 import { TagSource } from '../../generated/type/schema';
+import { getEntityName } from '../../utils/EntityUtils';
 import { createTagObject } from '../../utils/TagsUtils';
 import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor';
@@ -228,7 +229,7 @@ const MlModelFeaturesList = ({
           <ModalWithMarkdownEditor
             header={t('label.edit-entity-name', {
               entityType: t('label.feature'),
-              entityName: selectedFeature.name,
+              entityName: getEntityName(selectedFeature),
             })}
             placeholder={t('label.enter-field-description', {
               field: t('label.feature-lowercase'),
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx
index 5808208ad17..0c3e18a29ec 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx
@@ -767,9 +767,9 @@ const PipelineDetails = ({
 
       {editTask && (
         <ModalWithMarkdownEditor
-          header={`${t('label.edit-entity', { entity: t('label.task') })}: "${
-            editTask.task.displayName ?? editTask.task.name
-          }"`}
+          header={`${t('label.edit-entity', {
+            entity: t('label.task'),
+          })}: "${getEntityName(editTask.task)}"`}
           placeholder={t('label.enter-field-description', {
             field: t('label.task-lowercase'),
           })}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx
index a6863478f50..fbe1a0120b9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx
@@ -473,7 +473,7 @@ const SchemaTable = ({
         <ModalWithMarkdownEditor
           header={`${t('label.edit-entity', {
             entity: t('label.column'),
-          })}: "${editColumn.name}"`}
+          })}: "${getEntityName(editColumn)}"`}
           placeholder={t('message.enter-column-description')}
           value={editColumn.description as string}
           visible={Boolean(editColumn)}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx
index f6540503923..fa0c0443b66 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx
@@ -1141,7 +1141,7 @@ const TeamDetailsV1 = ({
                     }>
                     <Description
                       description={currentTeam.description ?? ''}
-                      entityName={currentTeam.displayName ?? currentTeam.name}
+                      entityName={getEntityName(currentTeam)}
                       isEdit={isDescriptionEditable}
                       onCancel={() => descriptionHandler(false)}
                       onDescriptionUpdate={onDescriptionUpdate}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx
index e6cb8a1d475..866808ec35f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx
@@ -361,7 +361,7 @@ const TopicSchemaFields: FC<TopicSchemaFieldsProps> = ({
         <ModalWithMarkdownEditor
           header={`${t('label.edit-entity', {
             entity: t('label.schema-field'),
-          })}: "${editFieldDescription.name}"`}
+          })}: "${getEntityName(editFieldDescription)}"`}
           placeholder={t('label.enter-field-description', {
             field: t('label.schema-field'),
           })}
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 86a5b01fe46..4808812b0bf 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
@@ -818,7 +818,7 @@
     "relevance": "Relevanz",
     "remove": "Entfernen",
     "remove-entity": "{{entity}} entfernen",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "Entfernt",
     "removing-user": "Benutzer entfernen",
     "rename": "Umbenennen",
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 d4b866e4206..6a07a1000f3 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
@@ -818,7 +818,7 @@
     "relevance": "Relevance",
     "remove": "Remove",
     "remove-entity": "Remove {{entity}}",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "Removed",
     "removing-user": "Removing User",
     "rename": "Rename",
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 601d177620f..52f0186c989 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
@@ -818,7 +818,7 @@
     "relevance": "Relevancia",
     "remove": "Eliminar",
     "remove-entity": "Eliminar {{entity}}",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "Eliminado",
     "removing-user": "Eliminando usuario",
     "rename": "Rename",
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 54c414ef1b9..062e23fae99 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
@@ -818,7 +818,7 @@
     "relevance": "Pertinence",
     "remove": "Retirer",
     "remove-entity": "Retirer un·e {{entity}}",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "Retiré",
     "removing-user": "Retirer un Utilisateur",
     "rename": "Renommer",
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 3d6b3b74e5b..586ea0a6214 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
@@ -818,7 +818,7 @@
     "relevance": "Relevance",
     "remove": "除外",
     "remove-entity": "{{entity}}を除外",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "除外",
     "removing-user": "ユーザを除外する",
     "rename": "Rename",
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 3c68e50c190..285a3c49429 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
@@ -818,7 +818,7 @@
     "relevance": "Relevância",
     "remove": "Remover",
     "remove-entity": "Remover {{entity}}",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "Removido",
     "removing-user": "Removendo usuário",
     "rename": "Rename",
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 3e9c9846df5..ed88a9e92f4 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
@@ -818,7 +818,7 @@
     "relevance": "Актуальность",
     "remove": "Удалить",
     "remove-entity": "Удалить {{entity}}",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "Удаленный",
     "removing-user": "Удаление пользователя",
     "rename": "Переименовать",
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 8d6daed0019..6a4e81b5c8a 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
@@ -818,7 +818,7 @@
     "relevance": "相关性",
     "remove": "删除",
     "remove-entity": "删除{{entity}}",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "已删除",
     "removing-user": "正在删除用户",
     "rename": "重命名",
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx
index f0d9b076858..089556f3418 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx
@@ -186,7 +186,7 @@ const DatabaseDetails: FunctionComponent = () => {
 
       setSchemaInstanceCount(paging.total);
     } catch (error) {
-      showErrorToast(error);
+      showErrorToast(error as AxiosError);
     } finally {
       setIsLoading(false);
     }
@@ -515,7 +515,7 @@ const DatabaseDetails: FunctionComponent = () => {
                   <DescriptionV1
                     description={description}
                     entityFqn={decodedDatabaseFQN}
-                    entityName={databaseName}
+                    entityName={getEntityName(database)}
                     entityType={EntityType.DATABASE}
                     hasEditAccess={editDescriptionPermission}
                     isEdit={isEdit}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
index e13f209e136..ab8af1cf16c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
@@ -83,6 +83,8 @@ const PoliciesDetailPage = () => {
     GlobalSettingOptions.POLICIES
   );
 
+  const policyName = useMemo(() => getEntityName(policy), [policy]);
+
   const breadcrumb = useMemo(
     () => [
       {
@@ -90,11 +92,11 @@ const PoliciesDetailPage = () => {
         url: policiesPath,
       },
       {
-        name: getEntityName(policy),
+        name: policyName,
         url: '',
       },
     ],
-    [policy]
+    [policyName, policiesPath]
   );
 
   const fetchPolicy = async () => {
@@ -329,14 +331,14 @@ const PoliciesDetailPage = () => {
               className="m-b-0 m-t-xs"
               data-testid="heading"
               level={5}>
-              {getEntityName(policy)}
+              {policyName}
             </Typography.Title>
             <Description
               hasEditAccess
               className="m-b-md"
               description={policy.description || ''}
               entityFqn={policy.fullyQualifiedName}
-              entityName={getEntityName(policy)}
+              entityName={policyName}
               entityType={EntityType.POLICY}
               isEdit={editDescription}
               onCancel={() => setEditDescription(false)}
@@ -486,7 +488,7 @@ const PoliciesDetailPage = () => {
           open={!isUndefined(selectedEntity.record)}
           title={`${t('label.remove-entity', {
             entity: getEntityName(selectedEntity.record),
-          })} ${t('label.from-lowercase')} ${getEntityName(policy)}`}
+          })} ${t('label.from-lowercase')} ${policyName}`}
           onCancel={() => setEntity(undefined)}
           onOk={async () => {
             await handleDelete(selectedEntity.record, selectedEntity.attribute);
@@ -495,7 +497,7 @@ const PoliciesDetailPage = () => {
           <Typography.Text>
             {t('message.are-you-sure-you-want-to-remove-child-from-parent', {
               child: getEntityName(selectedEntity.record),
-              parent: getEntityName(policy),
+              parent: policyName,
             })}
           </Typography.Text>
         </Modal>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx
index a3e6266779f..4ca5214a976 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx
@@ -68,6 +68,8 @@ const RolesDetailPage = () => {
     GlobalSettingOptions.ROLES
   );
 
+  const roleName = useMemo(() => getEntityName(role), [role]);
+
   const breadcrumb = useMemo(
     () => [
       {
@@ -75,11 +77,11 @@ const RolesDetailPage = () => {
         url: rolesPath,
       },
       {
-        name: getEntityName(role),
+        name: roleName,
         url: '',
       },
     ],
-    [role]
+    [rolesPath, roleName]
   );
 
   const fetchRole = async () => {
@@ -251,14 +253,14 @@ const RolesDetailPage = () => {
               className="m-b-0 m-t-xs"
               data-testid="heading"
               level={5}>
-              {getEntityName(role)}
+              {roleName}
             </Typography.Title>
             <Description
               hasEditAccess
               className="m-b-md"
               description={role.description || ''}
               entityFqn={role.fullyQualifiedName}
-              entityName={getEntityName(role)}
+              entityName={roleName}
               entityType={EntityType.ROLE}
               isEdit={editDescription}
               onCancel={() => setEditDescription(false)}
@@ -328,7 +330,7 @@ const RolesDetailPage = () => {
           open={!isUndefined(selectedEntity.record)}
           title={`${t('label.remove-entity', {
             entity: getEntityName(selectedEntity.record),
-          })} ${t('label.from-lowercase')} ${getEntityName(role)}`}
+          })} ${t('label.from-lowercase')} ${roleName}`}
           onCancel={() => setEntity(undefined)}
           onOk={async () => {
             await handleDelete(selectedEntity.record, selectedEntity.attribute);
@@ -337,7 +339,7 @@ const RolesDetailPage = () => {
           <Typography.Text>
             {t('message.are-you-sure-you-want-to-remove-child-from-parent', {
               child: getEntityName(selectedEntity.record),
-              parent: getEntityName(role),
+              parent: roleName,
             })}
           </Typography.Text>
         </Modal>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.tsx
index 517ac036bfa..83a075ce9d5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.tsx
@@ -273,7 +273,7 @@ const SearchIndexFieldsTable = ({
         <ModalWithMarkdownEditor
           header={`${t('label.edit-entity', {
             entity: t('label.field'),
-          })}: "${editField.field.name}"`}
+          })}: "${getEntityName(editField.field)}"`}
           placeholder={t('label.enter-field-description', {
             field: t('label.field'),
           })}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx
index 2d7691c2098..23751931686 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx
@@ -277,7 +277,7 @@ const TableDetailsPageV1 = () => {
         setLoading(false);
       }
     },
-    [getEntityPermissionByFqn, setTablePermissions]
+    [tableFqn, getEntityPermissionByFqn, setTablePermissions]
   );
 
   useEffect(() => {
@@ -560,6 +560,7 @@ const TableDetailsPageV1 = () => {
     [
       isEdit,
       tableDetails,
+      entityName,
       onDescriptionEdit,
       onDescriptionUpdate,
       editTagsPermission,
@@ -808,11 +809,11 @@ const TableDetailsPageV1 = () => {
       showErrorToast(
         error as AxiosError,
         t('server.entity-follow-error', {
-          entity: getEntityName(tableDetails),
+          entity: entityName,
         })
       );
     }
-  }, [USERId, tableId, setTableDetails, getEntityFeedCount]);
+  }, [USERId, tableId, entityName, setTableDetails, getEntityFeedCount]);
 
   const unFollowTable = useCallback(async () => {
     try {
@@ -835,11 +836,11 @@ const TableDetailsPageV1 = () => {
       showErrorToast(
         error as AxiosError,
         t('server.entity-unfollow-error', {
-          entity: getEntityName(tableDetails),
+          entity: entityName,
         })
       );
     }
-  }, [USERId, tableId, getEntityFeedCount, setTableDetails]);
+  }, [USERId, tableId, entityName, getEntityFeedCount, setTableDetails]);
 
   const { isFollowing } = useMemo(() => {
     return {
@@ -854,7 +855,7 @@ const TableDetailsPageV1 = () => {
   const versionHandler = useCallback(() => {
     version &&
       history.push(getVersionPath(EntityType.TABLE, tableFqn, version + ''));
-  }, [version]);
+  }, [version, tableFqn]);
 
   const afterDeleteAction = useCallback(
     (isSoftDelete?: boolean) =>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx
index d5eed19a0e6..3e71c1df17e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx
@@ -97,8 +97,8 @@ const TestSuiteDetailsPage = () => {
   const { testSuiteDescription, testSuiteId, testOwner } = useMemo(() => {
     return {
       testOwner: testSuite?.owner,
-      testSuiteId: testSuite?.id,
-      testSuiteDescription: testSuite?.description,
+      testSuiteId: testSuite?.id ?? '',
+      testSuiteDescription: testSuite?.description ?? '',
     };
   }, [testSuite]);
 
@@ -132,7 +132,7 @@ const TestSuiteDetailsPage = () => {
     try {
       const response = await getListTestCase({
         fields: 'testCaseResult,testDefinition,testSuite',
-        testSuiteId: testSuiteId,
+        testSuiteId,
         orderByLastExecutionDate: true,
         ...param,
         limit: pageSize,
@@ -156,7 +156,7 @@ const TestSuiteDetailsPage = () => {
     try {
       await addTestCaseToLogicalTestSuite({
         testCaseIds,
-        testSuiteId: testSuite?.id ?? '',
+        testSuiteId,
       });
       setIsTestCaseModalOpen(false);
       fetchTestCases();
@@ -289,8 +289,8 @@ const TestSuiteDetailsPage = () => {
   }, [testSuiteFQN]);
 
   useEffect(() => {
-    if (testSuite?.id) {
-      fetchTestCases({ testSuiteId: testSuite.id });
+    if (testSuiteId) {
+      fetchTestCases({ testSuiteId });
     }
   }, [testSuite, pageSize]);
 
@@ -360,8 +360,8 @@ const TestSuiteDetailsPage = () => {
 
           <Description
             className="test-suite-description"
-            description={testSuiteDescription || ''}
-            entityName={testSuite?.displayName ?? testSuite?.name}
+            description={testSuiteDescription}
+            entityName={getEntityName(testSuite)}
             hasEditAccess={hasAccess}
             isEdit={isDescriptionEditable}
             onCancel={() => descriptionHandler(false)}