diff --git a/src/_nav.js b/src/_nav.js
index 9032739642f9..9646643a09f3 100644
--- a/src/_nav.js
+++ b/src/_nav.js
@@ -119,7 +119,7 @@ const _nav = [
       },
       {
         component: CNavItem,
-        name: 'Best Practice Analyzer',
+        name: 'Best Practice Analyser',
         to: '/tenant/standards/bpa-report',
       },
       {
@@ -201,29 +201,29 @@ const _nav = [
   },
   {
     component: CNavGroup,
-    name: 'Intune',
-    to: '/endpoint/intune',
+    name: 'MEM (Intune)',
+    to: '/endpoint/MEM',
     icon: <FontAwesomeIcon icon={faExchangeAlt} className="nav-icon" />,
     items: [
       {
         component: CNavItem,
-        name: 'List Intune Policies',
-        to: '/endpoint/intune/list-policies',
+        name: 'List MEM Policies',
+        to: '/endpoint/MEM/list-policies',
       },
       {
         component: CNavItem,
-        name: 'Add Policy',
-        to: '/endpoint/intune/add-policy',
+        name: 'Apply Policy',
+        to: '/endpoint/MEM/add-policy',
       },
       {
         component: CNavItem,
         name: 'Add Policy Template',
-        to: '/endpoint/intune/add-policy-template',
+        to: '/endpoint/MEM/add-policy-template',
       },
       {
         component: CNavItem,
         name: 'List Templates',
-        to: '/endpoint/intune/list-templates',
+        to: '/endpoint/MEM/list-templates',
       },
     ],
   },
diff --git a/src/routes.js b/src/routes.js
index 6b06a11bfacf..14476363a96b 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -51,11 +51,11 @@ const AutopilotListProfiles = React.lazy(() =>
 const AutopilotListStatusPages = React.lazy(() =>
   import('./views/endpoint/autopilot/AutopilotListStatusPages'),
 )
-const IntuneListPolicies = React.lazy(() => import('./views/endpoint/intune/IntuneListPolicies'))
-const IntuneCAPolicies = React.lazy(() => import('./views/endpoint/intune/IntuneCAPolicies'))
-const IntuneAddPolicy = React.lazy(() => import('./views/endpoint/intune/IntuneAddPolicy'))
+const IntuneListPolicies = React.lazy(() => import('./views/endpoint/MEM/MEMListPolicies'))
+const IntuneCAPolicies = React.lazy(() => import('./views/endpoint/MEM/MEMCAPolicies'))
+const IntuneAddPolicy = React.lazy(() => import('./views/endpoint/MEM/MEMAddPolicy'))
 const IntuneListPolicyTemplate = React.lazy(() =>
-  import('./views/endpoint/intune/IntuneListPolicyTemplate'),
+  import('./views/endpoint/MEM/MEMListPolicyTemplate'),
 )
 const OneDriveList = React.lazy(() => import('./views/teams-share/onedrive/OneDriveList'))
 const SharepointList = React.lazy(() => import('./views/teams-share/sharepoint/SharepointList'))
@@ -205,26 +205,26 @@ const routes = [
     component: AutopilotListStatusPages,
   },
   {
-    path: '/endpoint/intune',
-    name: 'Intune',
+    path: '/endpoint/MEM',
+    name: 'MEM',
   },
   {
-    path: '/endpoint/intune/list-policies',
+    path: '/endpoint/MEM/list-policies',
     name: 'List Status Pages',
     component: IntuneListPolicies,
   },
   {
-    path: '/endpoint/intune/ca-policies',
+    path: '/endpoint/MEM/ca-policies',
     name: 'List Status Pages',
     component: IntuneCAPolicies,
   },
   {
-    path: '/endpoint/intune/add-policy',
+    path: '/endpoint/MEM/add-policy',
     name: 'Add Intune Policy',
     component: IntuneAddPolicy,
   },
   {
-    path: '/endpoint/intune/list-templates',
+    path: '/endpoint/MEM/list-templates',
     name: 'List Intune Policy Template',
     component: IntuneListPolicyTemplate,
   },
diff --git a/src/views/email-exchange/administration/ContactsList.js b/src/views/email-exchange/administration/ContactsList.js
index db13bc37b43c..c7aafac99c83 100644
--- a/src/views/email-exchange/administration/ContactsList.js
+++ b/src/views/email-exchange/administration/ContactsList.js
@@ -80,7 +80,7 @@ const ContactsList = () => {
       <TenantSelector />
       <hr />
       <div className="bg-white rounded p-5">
-        <h3>Applications List</h3>
+        <h3>Contacts List</h3>
         {Object.keys(tenant).length === 0 && <span>Select a tenant to get started.</span>}
         <CippDatatable
           keyField="id"
diff --git a/src/views/email-exchange/administration/MailboxesList.js b/src/views/email-exchange/administration/MailboxesList.js
index f0324bc61424..c3d1ddf7d9ef 100644
--- a/src/views/email-exchange/administration/MailboxesList.js
+++ b/src/views/email-exchange/administration/MailboxesList.js
@@ -80,7 +80,7 @@ const MailboxesList = () => {
       <TenantSelector />
       <hr />
       <div className="bg-white rounded p-5">
-        <h3>Applications List</h3>
+        <h3>Mailbox List</h3>
         {Object.keys(tenant).length === 0 && <span>Select a tenant to get started.</span>}
         <CippDatatable
           keyField="id"
diff --git a/src/views/email-exchange/reports/MailboxClientAccessSettingsList.js b/src/views/email-exchange/reports/MailboxClientAccessSettingsList.js
index c0001272684e..b3b5d3acd592 100644
--- a/src/views/email-exchange/reports/MailboxClientAccessSettingsList.js
+++ b/src/views/email-exchange/reports/MailboxClientAccessSettingsList.js
@@ -80,7 +80,7 @@ const MailboxClientAccessSettingsList = () => {
       <TenantSelector />
       <hr />
       <div className="bg-white rounded p-5">
-        <h3>Applications List</h3>
+        <h3>Mailbox Client Access Settings</h3>
         {Object.keys(tenant).length === 0 && <span>Select a tenant to get started.</span>}
         <CippDatatable
           keyField="id"
diff --git a/src/views/email-exchange/reports/MailboxStatisticsList.js b/src/views/email-exchange/reports/MailboxStatisticsList.js
index 1d352ce785c3..fbf58982b16a 100644
--- a/src/views/email-exchange/reports/MailboxStatisticsList.js
+++ b/src/views/email-exchange/reports/MailboxStatisticsList.js
@@ -80,7 +80,7 @@ const MailboxStatisticsList = () => {
       <TenantSelector />
       <hr />
       <div className="bg-white rounded p-5">
-        <h3>Applications List</h3>
+        <h3>Mailbox Statistics</h3>
         {Object.keys(tenant).length === 0 && <span>Select a tenant to get started.</span>}
         <CippDatatable
           keyField="id"
diff --git a/src/views/email-exchange/reports/MessageTrace.js b/src/views/email-exchange/reports/MessageTrace.js
index 96f1f1e73e12..d4078a09fc53 100644
--- a/src/views/email-exchange/reports/MessageTrace.js
+++ b/src/views/email-exchange/reports/MessageTrace.js
@@ -1,7 +1,7 @@
 import React from 'react'
 
 const MessageTrace = () => {
-  return <div>message trace</div>
+  return <div>Message Trace</div>
 }
 
 export default MessageTrace
diff --git a/src/views/email-exchange/reports/PhishingPoliciesList.js b/src/views/email-exchange/reports/PhishingPoliciesList.js
index 5d46b55a8daf..3654ef562ee7 100644
--- a/src/views/email-exchange/reports/PhishingPoliciesList.js
+++ b/src/views/email-exchange/reports/PhishingPoliciesList.js
@@ -80,7 +80,7 @@ const PhishingPoliciesList = () => {
       <TenantSelector />
       <hr />
       <div className="bg-white rounded p-5">
-        <h3>Applications List</h3>
+        <h3>Phishing Policies</h3>
         {Object.keys(tenant).length === 0 && <span>Select a tenant to get started.</span>}
         <CippDatatable
           keyField="id"
diff --git a/src/views/endpoint/intune/IntuneAddPolicy.js b/src/views/endpoint/MEM/MEMAddPolicy.js
similarity index 74%
rename from src/views/endpoint/intune/IntuneAddPolicy.js
rename to src/views/endpoint/MEM/MEMAddPolicy.js
index 7d6c72fcc87a..2fbe9df0b206 100644
--- a/src/views/endpoint/intune/IntuneAddPolicy.js
+++ b/src/views/endpoint/MEM/MEMAddPolicy.js
@@ -3,7 +3,7 @@ import React from 'react'
 const IntuneAddPolicy = (props) => {
   return (
     <div>
-      <h3>IntuneAddPolicy</h3>
+      <h3>Endpoint Manager - Apply Policy</h3>
     </div>
   )
 }
diff --git a/src/views/endpoint/intune/IntuneCAPolicies.js b/src/views/endpoint/MEM/MEMCAPolicies.js
similarity index 74%
rename from src/views/endpoint/intune/IntuneCAPolicies.js
rename to src/views/endpoint/MEM/MEMCAPolicies.js
index 9f806d7d7e5a..588fc1d7a058 100644
--- a/src/views/endpoint/intune/IntuneCAPolicies.js
+++ b/src/views/endpoint/MEM/MEMCAPolicies.js
@@ -3,7 +3,7 @@ import React from 'react'
 const IntuneCAPolicies = (props) => {
   return (
     <div>
-      <h3>IntuneCAPolicies</h3>
+      <h3>Endpoint Manager - CA Policies</h3>
     </div>
   )
 }
diff --git a/src/views/endpoint/intune/IntuneListPolicies.js b/src/views/endpoint/MEM/MEMListPolicies.js
similarity index 96%
rename from src/views/endpoint/intune/IntuneListPolicies.js
rename to src/views/endpoint/MEM/MEMListPolicies.js
index f6a859170374..09c5db92b539 100644
--- a/src/views/endpoint/intune/IntuneListPolicies.js
+++ b/src/views/endpoint/MEM/MEMListPolicies.js
@@ -40,7 +40,7 @@ const IntuneList = () => {
       <TenantSelector />
       <hr />
       <div className="bg-white rounded p-5">
-        <h3>Intune Policy List</h3>
+        <h3>Endpoint Manager - Policy List</h3>
         {Object.keys(tenant).length === 0 && <span>Select a tenant to get started.</span>}
         <CippDatatable
           keyField="id"
diff --git a/src/views/endpoint/intune/IntuneListPolicyTemplate.js b/src/views/endpoint/MEM/MEMListPolicyTemplate.js
similarity index 96%
rename from src/views/endpoint/intune/IntuneListPolicyTemplate.js
rename to src/views/endpoint/MEM/MEMListPolicyTemplate.js
index d53061f4eaac..93becaf63b5f 100644
--- a/src/views/endpoint/intune/IntuneListPolicyTemplate.js
+++ b/src/views/endpoint/MEM/MEMListPolicyTemplate.js
@@ -48,7 +48,7 @@ const AutopilotListTemplates = () => {
     <div>
       <hr />
       <div className="bg-white rounded p-5">
-        <h3>Available Intune Templates</h3>
+        <h3>Available Endpoint Manager Templates</h3>
         <CippDatatable
           keyField="id"
           reportName={`${tenant?.defaultDomainName}-Autopilot-List`}
diff --git a/src/views/identity/administration/ViewUser.js b/src/views/identity/administration/ViewUser.js
index 4a9352efc4e1..a0aa82564142 100644
--- a/src/views/identity/administration/ViewUser.js
+++ b/src/views/identity/administration/ViewUser.js
@@ -60,6 +60,8 @@ const ViewUser = (props) => {
 
   return (
     <CCard className="bg-white rounded p-5">
+      <h3>View User Information</h3>
+      <br />
       {userFetching && <CSpinner />}
       {!userFetching && userError && <span>Error loading user</span>}
       {!queryError && !userFetching && (
diff --git a/src/views/teams-share/onedrive/OneDriveList.js b/src/views/teams-share/onedrive/OneDriveList.js
index 848655733b51..bc25f8ccb4d4 100644
--- a/src/views/teams-share/onedrive/OneDriveList.js
+++ b/src/views/teams-share/onedrive/OneDriveList.js
@@ -45,7 +45,7 @@ const OneDriveList = () => {
       <TenantSelector />
       <hr />
       <div className="bg-white rounded p-5">
-        <h3>Onedrive Report</h3>
+        <h3>OneDrive Report</h3>
         {Object.keys(tenant).length === 0 && <span>Select a tenant to get started.</span>}
         <CippDatatable
           keyField="id"
diff --git a/src/views/tenant/administration/Tenants.js b/src/views/tenant/administration/Tenants.js
index 84d03179d18f..6f3c877b2bdd 100644
--- a/src/views/tenant/administration/Tenants.js
+++ b/src/views/tenant/administration/Tenants.js
@@ -79,7 +79,7 @@ const TenantsList = () => {
     <div>
       <hr />
       <div className="bg-white rounded p-5">
-        <h3>Applications List</h3>
+        <h3>Tenant List</h3>
         <CippDatatable
           keyField="id"
           reportName={`${tenant?.defaultDomainName}-Autopilot-List`}