diff --git a/src/components/IOC/IOCManage/IOCManage.js b/src/components/IOC/IOCManage/IOCManage.js
index 0b3100b0b96eb5b8ce62a0206e36ccf0a0b6240d..49f535e868f23d4e8c22f9a62375a3f1b29ed4ca 100644
--- a/src/components/IOC/IOCManage/IOCManage.js
+++ b/src/components/IOC/IOCManage/IOCManage.js
@@ -1,10 +1,4 @@
-import {
-  Button,
-  Link as MuiLink,
-  Stack,
-  Tooltip,
-  Typography
-} from "@mui/material";
+import { Button, Stack, Tooltip, Typography } from "@mui/material";
 import React, {
   useState,
   useEffect,
@@ -85,16 +79,12 @@ export function IOCManage({
 
       let subset = {
         "Naming service record": (
-          <Typography>
-            <MuiLink
-              href={`${window.NAMING_ADDRESS}/devices.xhtml?i=2&deviceName=${ioc.namingName}`}
-              target="_blank"
-              rel="noreferrer"
-              underline="hover"
-            >
-              {ioc.namingName}
-            </MuiLink>
-          </Typography>
+          <ExternalLink
+            href={`${window.NAMING_ADDRESS}/devices.xhtml?i=2&deviceName=${ioc.namingName}`}
+            aria-label="Naming Service Record, External Link"
+          >
+            <ExternalLinkContents>{ioc.namingName}</ExternalLinkContents>
+          </ExternalLink>
         ),
         Repository: (
           <ExternalLink