diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditAutoUpdateConfigModal/EditAutoUpdateConfigModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditAutoUpdateConfigModal/EditAutoUpdateConfigModal.tsx
index 377190b060..edf0ffda4e 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditAutoUpdateConfigModal/EditAutoUpdateConfigModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditAutoUpdateConfigModal/EditAutoUpdateConfigModal.tsx
@@ -22,6 +22,7 @@ import {
   CUSTOM_TARGET_OPTIONS,
   generateSelectedLabels,
   getCustomTarget,
+  getDisplayedSoftwareName,
   generateHelpText,
   getTargetType,
 } from "pages/SoftwarePage/helpers";
@@ -122,7 +123,13 @@ const EditAutoUpdateConfigModal = ({
       renderFlash(
         "success",
         <>
-          <strong>{softwareTitle.name}</strong> configuration updated.
+          <strong>
+            {getDisplayedSoftwareName(
+              softwareTitle.name,
+              softwareTitle.display_name
+            )}
+          </strong>{" "}
+          configuration updated.
         </>
       );
 
@@ -209,7 +216,13 @@ const EditAutoUpdateConfigModal = ({
                 <div className={`form-field`}>
                   <div className="form-field__label">Auto updates</div>
                   <div className="form-field__subtitle">
-                    Automatically update <strong>{softwareTitle.name}</strong>{" "}
+                    Automatically update{" "}
+                    <strong>
+                      {getDisplayedSoftwareName(
+                        softwareTitle.name,
+                        softwareTitle.display_name
+                      )}
+                    </strong>{" "}
                     on all targeted hosts when a new version is available.
                   </div>
                   <div>
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditSoftwareModal/helpers.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditSoftwareModal/helpers.tsx
index 7ebf5be587..aba40c8494 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditSoftwareModal/helpers.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditSoftwareModal/helpers.tsx
@@ -4,7 +4,10 @@ import { isAxiosError } from "axios";
 import { getErrorReason } from "interfaces/errors";
 import { IAppStoreApp, ISoftwarePackage } from "interfaces/software";
 
-import { generateSecretErrMsg } from "pages/SoftwarePage/helpers";
+import {
+  generateSecretErrMsg,
+  getDisplayedSoftwareName,
+} from "pages/SoftwarePage/helpers";
 
 const DEFAULT_ERROR_MESSAGE = "Couldn't edit software. Please try again.";
 
@@ -23,7 +26,9 @@ export const getErrorMessage = (
   } else if (reason.includes("selected package is")) {
     return (
       <>
-        Couldn&apos;t edit <b>{software.name}</b>. {reason}
+        Couldn&apos;t edit{" "}
+        <b>{getDisplayedSoftwareName(software.name, software.display_name)}</b>.{" "}
+        {reason}
       </>
     );
   } else if (reason.includes("Secret variable")) {
diff --git a/frontend/pages/hosts/details/DeviceUserPage/components/SettingUpYourDevice/SettingUpYourDevice.tsx b/frontend/pages/hosts/details/DeviceUserPage/components/SettingUpYourDevice/SettingUpYourDevice.tsx
index 0881d2e0a9..1be117b2a2 100644
--- a/frontend/pages/hosts/details/DeviceUserPage/components/SettingUpYourDevice/SettingUpYourDevice.tsx
+++ b/frontend/pages/hosts/details/DeviceUserPage/components/SettingUpYourDevice/SettingUpYourDevice.tsx
@@ -1,3 +1,5 @@
+import { getDisplayedSoftwareName } from "pages/SoftwarePage/helpers";
+
 import Card from "components/Card";
 import { ISetupStep } from "interfaces/setup";
 import Icon from "components/Icon";
@@ -40,7 +42,14 @@ const SettingUpYourDevice = ({
       <>
         <p>
           Your organization requires that critical software be installed before
-          you use your device. <b>{failedSoftware.name}</b> failed to install.
+          you use your device.{" "}
+          <b>
+            {getDisplayedSoftwareName(
+              failedSoftware.name,
+              failedSoftware.display_name
+            )}
+          </b>{" "}
+          failed to install.
         </p>
         <p>
           <Icon name="error-outline" color="status-error" size="small" />{" "}
diff --git a/frontend/pages/hosts/details/modals/InventoryVersionsModal/InventoryVersionsModal.tests.tsx b/frontend/pages/hosts/details/modals/InventoryVersionsModal/InventoryVersionsModal.tests.tsx
index a85b26ea96..1cf38817f5 100644
--- a/frontend/pages/hosts/details/modals/InventoryVersionsModal/InventoryVersionsModal.tests.tsx
+++ b/frontend/pages/hosts/details/modals/InventoryVersionsModal/InventoryVersionsModal.tests.tsx
@@ -17,8 +17,8 @@ describe("SoftwareDetailsModal", () => {
       <InventoryVersionsModal hostSoftware={mockSoftware} onExit={jest.fn()} />
     );
 
-    // Modal title
-    expect(screen.getByText(mockSoftware.name)).toBeVisible();
+    // Modal title is display_name and not name
+    expect(screen.getByText("Mock Software")).toBeVisible();
 
     // Version, Type, Bundle identifier, Last opened
     expect(screen.getByText("Version")).toBeVisible();
diff --git a/frontend/pages/hosts/details/modals/InventoryVersionsModal/InventoryVersionsModal.tsx b/frontend/pages/hosts/details/modals/InventoryVersionsModal/InventoryVersionsModal.tsx
index ea7356ddf4..15e6c6948a 100644
--- a/frontend/pages/hosts/details/modals/InventoryVersionsModal/InventoryVersionsModal.tsx
+++ b/frontend/pages/hosts/details/modals/InventoryVersionsModal/InventoryVersionsModal.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useRef, useState } from "react";
 
 import { IHostSoftware } from "interfaces/software";
+import { getDisplayedSoftwareName } from "pages/SoftwarePage/helpers";
 
 import Modal from "components/Modal";
 import ModalFooter from "components/ModalFooter";
@@ -57,7 +58,10 @@ const InventoryVersionsModal = ({
 
   return (
     <Modal
-      title={hostSoftware.name}
+      title={getDisplayedSoftwareName(
+        hostSoftware.name,
+        hostSoftware.display_name
+      )}
       className={baseClass}
       onExit={onExit}
       width="large"