diff --git a/datahub-web-react/src/app/entity/dataset/profile/Documentation.tsx b/datahub-web-react/src/app/entity/dataset/profile/Documentation.tsx
deleted file mode 100644
index b23c615fbb72a4..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/Documentation.tsx
+++ /dev/null
@@ -1,217 +0,0 @@
-import { Button, Form, Input, Space, Table, Typography } from 'antd';
-import React, { useEffect, useMemo, useState } from 'react';
-import { Link } from 'react-router-dom';
-import {
-    CorpUser,
-    EntityType,
-    InstitutionalMemoryMetadata,
-    InstitutionalMemoryUpdate,
-} from '../../../../types.generated';
-import { useEntityRegistry } from '../../../useEntityRegistry';
-import { useEntityData } from '../../shared/EntityContext';
-import analytics, { EventType, EntityActionType } from '../../../analytics';
-
-export type Props = {
-    authenticatedUserUrn?: string;
-    authenticatedUserUsername?: string;
-    documents: Array<InstitutionalMemoryMetadata>;
-    updateDocumentation: (update: InstitutionalMemoryUpdate) => void;
-};
-
-function formatDateString(time: number) {
-    const date = new Date(time);
-    return date.toLocaleDateString('en-US');
-}
-
-function FormInput({ name, placeholder, type }: { name: string; placeholder: string; type: 'url' | 'string' }) {
-    return (
-        <Form.Item
-            name={name}
-            style={{
-                margin: 0,
-            }}
-            rules={[
-                {
-                    required: true,
-                    type,
-                    message: `Please provide a ${name}!`,
-                },
-            ]}
-        >
-            <Input placeholder={placeholder} />
-        </Form.Item>
-    );
-}
-
-export default function Documentation({
-    authenticatedUserUrn,
-    documents,
-    updateDocumentation,
-    authenticatedUserUsername,
-}: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    const [form] = Form.useForm();
-    const [editingIndex, setEditingIndex] = useState(-1);
-    const [stagedDocs, setStagedDocs] = useState(documents);
-
-    useEffect(() => {
-        setStagedDocs(documents);
-    }, [documents]);
-
-    const tableData = useMemo(
-        () =>
-            stagedDocs.map((doc, index) => ({
-                key: index,
-                author: { urn: doc.author.urn, username: doc.author.username, type: EntityType.CorpUser },
-                url: doc.url,
-                description: doc.description,
-                createdAt: doc.created.time,
-            })),
-        [stagedDocs],
-    );
-
-    const isEditing = (record: any) => record.key === editingIndex;
-
-    const onAdd = (authorUrn: string, authorUsername: string) => {
-        setEditingIndex(stagedDocs.length);
-
-        form.setFieldsValue({
-            url: '',
-            description: '',
-        });
-
-        const newDoc = {
-            url: '',
-            description: '',
-            label: '',
-            author: { urn: authorUrn, username: authorUsername, type: EntityType.CorpUser },
-            created: {
-                time: Date.now(),
-            },
-        };
-
-        const newStagedDocs = [...stagedDocs, newDoc];
-        setStagedDocs(newStagedDocs);
-    };
-
-    const { urn, entityType } = useEntityData();
-
-    const onSave = async (record: any) => {
-        const row = await form.validateFields();
-
-        const updatedInstitutionalMemory = stagedDocs.map((doc, index) => {
-            if (record.key === index) {
-                return {
-                    url: row.url,
-                    description: row.description,
-                    author: doc.author.urn,
-                    createdAt: doc.created.time,
-                };
-            }
-            return {
-                author: doc.author.urn,
-                url: doc.url,
-                description: doc.description,
-                createdAt: doc.created.time,
-            };
-        });
-        updateDocumentation({ elements: updatedInstitutionalMemory });
-        analytics.event({
-            type: EventType.EntityActionEvent,
-            actionType: EntityActionType.UpdateDescription,
-            entityType,
-            entityUrn: urn,
-        });
-        setEditingIndex(-1);
-    };
-
-    const onCancel = () => {
-        const newStagedDocs = stagedDocs.filter((_, index) => index !== editingIndex);
-        setStagedDocs(newStagedDocs);
-        setEditingIndex(-1);
-    };
-
-    const onDelete = (index: number) => {
-        const newDocs = stagedDocs.filter((_, i) => !(index === i));
-        const updatedInstitutionalMemory = newDocs.map((doc) => ({
-            author: doc.author.urn,
-            url: doc.url,
-            description: doc.description,
-        }));
-        updateDocumentation({ elements: updatedInstitutionalMemory });
-        analytics.event({
-            type: EventType.EntityActionEvent,
-            actionType: EntityActionType.UpdateDescription,
-            entityType,
-            entityUrn: urn,
-        });
-        setStagedDocs(newDocs);
-    };
-
-    const tableColumns = [
-        {
-            title: 'Document',
-            dataIndex: 'description',
-            render: (description: string, record: any) => {
-                return isEditing(record) ? (
-                    <Space>
-                        <FormInput name="description" placeholder="Enter a description" type="string" />
-                        <FormInput name="url" placeholder="Enter a URL" type="url" />
-                    </Space>
-                ) : (
-                    <Typography.Link href={record.url} target="_blank">
-                        {description}
-                    </Typography.Link>
-                );
-            },
-        },
-        {
-            title: 'Author',
-            dataIndex: 'author',
-            render: (user: CorpUser) => (
-                <Link to={`/${entityRegistry.getPathName(EntityType.CorpUser)}/${user.urn}`}>{user.username}</Link>
-            ),
-        },
-        {
-            title: 'Date Added',
-            dataIndex: 'createdAt',
-            render: (createdAt: number) => formatDateString(createdAt),
-        },
-        {
-            title: '',
-            key: 'action',
-            render: (_: string, record: any) => {
-                return isEditing(record) ? (
-                    <Space>
-                        <Button type="link" onClick={() => onSave(record)}>
-                            Save
-                        </Button>
-                        <Button type="link" style={{ color: 'grey' }} onClick={onCancel}>
-                            Cancel
-                        </Button>
-                    </Space>
-                ) : (
-                    <Button type="link" style={{ color: 'red' }} onClick={() => onDelete(record.key)}>
-                        Remove
-                    </Button>
-                );
-            },
-        },
-    ];
-
-    return (
-        <Space direction="vertical" style={{ width: '100%' }} size="middle">
-            <Typography.Title level={3}>Documentation</Typography.Title>
-            <Typography.Paragraph>Keep track of documentation about this Dataset.</Typography.Paragraph>
-            <Form form={form} component={false}>
-                <Table bordered pagination={false} columns={tableColumns} dataSource={tableData} />
-            </Form>
-            {authenticatedUserUrn && authenticatedUserUsername && editingIndex < 0 && (
-                <Button type="link" onClick={() => onAdd(authenticatedUserUrn, authenticatedUserUsername)}>
-                    <b> + </b> Add a link
-                </Button>
-            )}
-        </Space>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Documentation.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Documentation.test.tsx
deleted file mode 100644
index 6e15a7a7a8703c..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Documentation.test.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import Documentation from '../Documentation';
-import { sampleDocs } from '../stories/documentation';
-import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer';
-
-describe('Documentation', () => {
-    it('renders', async () => {
-        const { getByText } = render(
-            <TestPageContainer>
-                <Documentation
-                    authenticatedUserUrn="urn:li:corpuser:1"
-                    authenticatedUserUsername="1"
-                    documents={sampleDocs}
-                    updateDocumentation={(_) => undefined}
-                />
-                ,
-            </TestPageContainer>,
-        );
-        expect(getByText('Documentation')).toBeInTheDocument();
-        expect(getByText('1')).toBeInTheDocument();
-        expect(getByText('This doc spans the internet web')).toBeInTheDocument();
-        expect(getByText('This doc spans the internet web').closest('a')).toHaveAttribute(
-            'href',
-            'https://www.google.com',
-        );
-        expect(getByText('This doc spans the internet web')).toBeInTheDocument();
-        expect(getByText('Add a link')).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/group/GroupMembersSideBarSection.tsx b/datahub-web-react/src/app/entity/group/GroupMembersSideBarSection.tsx
index 173f191042bf64..24dc208049c374 100644
--- a/datahub-web-react/src/app/entity/group/GroupMembersSideBarSection.tsx
+++ b/datahub-web-react/src/app/entity/group/GroupMembersSideBarSection.tsx
@@ -47,7 +47,7 @@ export default function GroupMembersSideBarSection({ total, relationships, onSee
                         const name = entityRegistry.getDisplayName(EntityType.CorpUser, user);
                         return (
                             <MemberTag>
-                                <Link to={`/${entityRegistry.getPathName(EntityType.CorpUser)}/${user.urn}`}>
+                                <Link to={`${entityRegistry.getEntityUrl(EntityType.CorpUser, user.urn)}`}>
                                     <CustomAvatar
                                         name={name}
                                         photoUrl={user.editableProperties?.pictureLink || undefined}
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActor.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActor.tsx
index 057b4c6706f251..3c5e749523c17e 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActor.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActor.tsx
@@ -36,7 +36,7 @@ export const ExpandedActor = ({ actor, popOver, closable, onClose }: Props) => {
 
     return (
         <ActorTag onClose={onClose} closable={closable}>
-            <Link to={`/${entityRegistry.getPathName(actor.type)}/${actor.urn}`}>
+            <Link to={`${entityRegistry.getEntityUrl(actor.type, actor.urn)}`}>
                 <CustomAvatar name={name} photoUrl={pictureLink} useDefaultAvatar={false} />
                 {(!popOver && <>{name}</>) || (
                     <Popover overlayStyle={{ maxWidth: 200 }} placement="left" content={popOver}>
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner.tsx
index 2f82db0ee111bd..deb1e25067a94a 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner.tsx
@@ -10,7 +10,6 @@ import { useEntityRegistry } from '../../../../useEntityRegistry';
 import analytics, { EventType, EntityActionType } from '../../../../analytics';
 import { useEntityData } from '../../EntityContext';
 import { getDescriptionFromType, getNameFromType } from '../../containers/profile/sidebar/Ownership/ownershipUtils';
-import { urlEncodeUrn } from '../../utils';
 
 type Props = {
     entityUrn?: string;
@@ -89,7 +88,7 @@ export const ExpandedOwner = ({ entityUrn, owner, hidePopOver, refetch }: Props)
 
     return (
         <OwnerTag onClose={onClose} closable={!!entityUrn}>
-            <Link to={`/${entityRegistry.getPathName(owner.owner.type)}/${urlEncodeUrn(owner.owner.urn)}`}>
+            <Link to={`${entityRegistry.getEntityUrl(owner.owner.type, owner.owner.urn)}`}>
                 <CustomAvatar name={name} photoUrl={pictureLink} useDefaultAvatar={false} />
                 {(hidePopOver && <>{name}</>) || (
                     <Popover
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx
index aa1128646801ac..eddfbd34aec5de 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx
@@ -82,9 +82,7 @@ export const LinkList = ({ refetch }: LinkListProps) => {
                                     <>
                                         Added {formatDateString(link.created.time)} by{' '}
                                         <Link
-                                            to={`/${entityRegistry.getPathName(EntityType.CorpUser)}/${
-                                                link.author.urn
-                                            }`}
+                                            to={`${entityRegistry.getEntityUrl(EntityType.CorpUser, link.author.urn)}`}
                                         >
                                             {link.author.username}
                                         </Link>
diff --git a/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx b/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx
index f1af3f20b44a81..0606ca24f92e4a 100644
--- a/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx
+++ b/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx
@@ -123,7 +123,7 @@ function NodeItem(props: Props) {
                 {areChildrenVisible && <StyledDownOutlined onClick={() => setAreChildrenVisible(false)} />}
                 {!isSelecting && (
                     <NodeLink
-                        to={`/${entityRegistry.getPathName(node.type)}/${node.urn}`}
+                        to={`${entityRegistry.getEntityUrl(node.type, node.urn)}`}
                         isSelected={entityData?.urn === node.urn}
                     >
                         <StyledFolderOutlined />
diff --git a/datahub-web-react/src/app/glossary/GlossaryBrowser/TermItem.tsx b/datahub-web-react/src/app/glossary/GlossaryBrowser/TermItem.tsx
index 6386020ad8396d..81c65dfb54ef73 100644
--- a/datahub-web-react/src/app/glossary/GlossaryBrowser/TermItem.tsx
+++ b/datahub-web-react/src/app/glossary/GlossaryBrowser/TermItem.tsx
@@ -68,7 +68,7 @@ function TermItem(props: Props) {
         <TermWrapper>
             {!isSelecting && (
                 <TermLink
-                    to={`/${entityRegistry.getPathName(term.type)}/${term.urn}`}
+                    to={`${entityRegistry.getEntityUrl(term.type, term.urn)}`}
                     isSelected={entityData?.urn === term.urn}
                 >
                     {entityRegistry.getDisplayName(term.type, isOnEntityPage ? entityData : term)}
diff --git a/datahub-web-react/src/app/glossary/GlossaryEntitiesPath.tsx b/datahub-web-react/src/app/glossary/GlossaryEntitiesPath.tsx
index 2afb077aa96bf2..f5b9933154709a 100644
--- a/datahub-web-react/src/app/glossary/GlossaryEntitiesPath.tsx
+++ b/datahub-web-react/src/app/glossary/GlossaryEntitiesPath.tsx
@@ -43,7 +43,7 @@ function GlossaryEntitiesPath() {
                     breadcrumbs.map((node) => {
                         return (
                             <BreadcrumbItem key={node.urn}>
-                                <Link to={`/${entityRegistry.getPathName(node.type)}/${node.urn}`}>
+                                <Link to={`${entityRegistry.getEntityUrl(node.type, node.urn)}`}>
                                     {entityRegistry.getDisplayName(node.type, node)}
                                 </Link>
                             </BreadcrumbItem>
diff --git a/datahub-web-react/src/app/glossary/GlossaryEntityItem.tsx b/datahub-web-react/src/app/glossary/GlossaryEntityItem.tsx
index e8bbfbacf616a5..5e2ed055eceb57 100644
--- a/datahub-web-react/src/app/glossary/GlossaryEntityItem.tsx
+++ b/datahub-web-react/src/app/glossary/GlossaryEntityItem.tsx
@@ -58,7 +58,7 @@ function GlossaryEntityItem(props: Props) {
     const entityRegistry = useEntityRegistry();
 
     return (
-        <Link to={`/${entityRegistry.getPathName(type)}/${urn}`}>
+        <Link to={`${entityRegistry.getEntityUrl(type, urn)}`}>
             <ItemWrapper>
                 <GlossaryItem>
                     <span>
diff --git a/datahub-web-react/src/app/glossary/GlossarySearch.tsx b/datahub-web-react/src/app/glossary/GlossarySearch.tsx
index 2fa1a1d9c4e7cb..75cd3b10d581e8 100644
--- a/datahub-web-react/src/app/glossary/GlossarySearch.tsx
+++ b/datahub-web-react/src/app/glossary/GlossarySearch.tsx
@@ -89,7 +89,7 @@ function GlossarySearch() {
                         {searchResults.map((result) => {
                             return (
                                 <SearchResult
-                                    to={`/${entityRegistry.getPathName(result.entity.type)}/${result.entity.urn}`}
+                                    to={`${entityRegistry.getEntityUrl(result.entity.type, result.entity.urn)}`}
                                     onClick={() => setIsSearchBarFocused(false)}
                                 >
                                     <IconWrapper>
diff --git a/datahub-web-react/src/app/permissions/policy/PolicyDetailsModal.tsx b/datahub-web-react/src/app/permissions/policy/PolicyDetailsModal.tsx
index f8e841e3153513..3b5fc03f10a15b 100644
--- a/datahub-web-react/src/app/permissions/policy/PolicyDetailsModal.tsx
+++ b/datahub-web-react/src/app/permissions/policy/PolicyDetailsModal.tsx
@@ -94,7 +94,7 @@ export default function PolicyDetailsModal({ policy, visible, onClose, privilege
                 <Link
                     target="_blank"
                     rel="noopener noreferrer"
-                    to={() => `/${entityRegistry.getPathName(criterionValue.entity!.type)}/${criterionValue.value}`}
+                    to={() => `${entityRegistry.getEntityUrl(criterionValue.entity!.type, criterionValue.value)}`}
                 >
                     {getDisplayName(criterionValue.entity)}
                 </Link>
diff --git a/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx b/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx
index 918c310108dd45..5594b161385178 100644
--- a/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx
+++ b/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx
@@ -262,7 +262,7 @@ export default function PolicyPrivilegeForm({
                 <Link
                     target="_blank"
                     rel="noopener noreferrer"
-                    to={() => `/${entityRegistry.getPathName(result.entity.type)}/${result.entity.urn}`}
+                    to={() => `${entityRegistry.getEntityUrl(result.entity.type, result.entity.urn)}`}
                 >
                     View
                 </Link>