diff --git a/packages/services/src/Domain/Strings/Messages.ts b/packages/services/src/Domain/Strings/Messages.ts
index abaed42f7..ec794ca5e 100644
--- a/packages/services/src/Domain/Strings/Messages.ts
+++ b/packages/services/src/Domain/Strings/Messages.ts
@@ -121,7 +121,7 @@ export const SessionStrings = {
   },
   SessionRestored: 'Your session has been successfully restored.',
   EnterMfa: 'Please enter your two-factor authentication code.',
-  InputU2FDevice: 'Please authenticate with your U2F device.',
+  InputU2FDevice: 'Please authenticate with your hardware security key.',
   MfaInputPlaceholder: 'Two-factor authentication code',
   EmailInputPlaceholder: 'Email',
   PasswordInputPlaceholder: 'Password',
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FAddDeviceView.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FAddDeviceView.tsx
index 0d36f4630..30fedb9c3 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FAddDeviceView.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FAddDeviceView.tsx
@@ -60,7 +60,7 @@ const U2FAddDeviceView: FunctionComponent<Props> = ({
 
   return (
     <Modal
-      title="Add U2F Device"
+      title="Add Security Key"
       close={closeModal}
       actions={[
         {
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FDescription.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FDescription.tsx
index 16eb9c354..d19631daf 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FDescription.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FDescription.tsx
@@ -13,14 +13,14 @@ const U2FDescription: FunctionComponent<Props> = ({ userProvider }) => {
   const application = useApplication()
 
   if (userProvider.getUser() === undefined) {
-    return <Text>Sign in or register for an account to configure U2F.</Text>
+    return <Text>Sign in or register for an account to configure hardware security keys.</Text>
   }
 
   return (
     <div>
-      <Text>Authenticate with a U2F hardware device such as Yubikey.</Text>
+      <Text>Authenticate with a hardware security key such as Yubikey.</Text>
       {!application.isFullU2FClient && (
-        <Text className="italic">Please visit the web app in order to add a U2F Device.</Text>
+        <Text className="italic">Please visit the web app in order to add a hardware security key.</Text>
       )}
     </div>
   )
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FTitle.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FTitle.tsx
index 97898cda4..5a0ba3eca 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FTitle.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FTitle.tsx
@@ -10,10 +10,10 @@ type Props = {
 
 const U2FTitle: FunctionComponent<Props> = ({ userProvider }) => {
   if (userProvider.getUser() === undefined) {
-    return <Title>Universal 2nd factor authentication not available</Title>
+    return <Title>Hardware security key authentication not available</Title>
   }
 
-  return <Title>Universal 2nd Factor Authentication</Title>
+  return <Title>Hardware Security Key Authentication</Title>
 }
 
 export default observer(U2FTitle)
diff --git a/packages/web/src/javascripts/Components/U2FAuthIframe/U2FAuthIframe.tsx b/packages/web/src/javascripts/Components/U2FAuthIframe/U2FAuthIframe.tsx
index 990c98aa3..156762589 100644
--- a/packages/web/src/javascripts/Components/U2FAuthIframe/U2FAuthIframe.tsx
+++ b/packages/web/src/javascripts/Components/U2FAuthIframe/U2FAuthIframe.tsx
@@ -73,7 +73,7 @@ const U2FAuthIframe = () => {
         throw new Error('No options returned from server')
       }
 
-      setInfo('Waiting for U2F device...')
+      setInfo('Waiting for security key...')
 
       const assertionResponse = await startAuthentication(jsonResponse.data.options)
 
@@ -96,7 +96,9 @@ const U2FAuthIframe = () => {
 
   return (
     <div className="flex h-full w-full flex-col items-center justify-center gap-2">
-      <div className="mb-2 text-center">Insert your U2F device, then press the button below to authenticate.</div>
+      <div className="mb-2 text-center">
+        Insert your hardware security key, then press the button below to authenticate.
+      </div>
       <Button onClick={beginAuthentication}>Authenticate</Button>
       <div className="mt-2">
         <div>{info}</div>