diff --git a/test/components/structures/__snapshots__/MatrixChat-test.tsx.snap b/test/components/structures/__snapshots__/MatrixChat-test.tsx.snap
index bf03f84a6e..e6765a4da9 100644
--- a/test/components/structures/__snapshots__/MatrixChat-test.tsx.snap
+++ b/test/components/structures/__snapshots__/MatrixChat-test.tsx.snap
@@ -287,7 +287,7 @@ exports[`<MatrixChat /> with a soft-logged-out session should show the soft-logo
           Clear personal data
         </h2>
         <p>
-          Warning: your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.
+          Warning: your personal data (including encryption keys) is still stored in this device. Clear it if you're finished using this device, or want to sign in to another account.
         </p>
         <div>
           <div
diff --git a/test/components/views/dialogs/LogoutDialog-test.tsx b/test/components/views/dialogs/LogoutDialog-test.tsx
index c40c9ad894..285637a604 100644
--- a/test/components/views/dialogs/LogoutDialog-test.tsx
+++ b/test/components/views/dialogs/LogoutDialog-test.tsx
@@ -60,7 +60,7 @@ describe("LogoutDialog", () => {
     it("Prompts user to connect backup if there is a backup on the server", async () => {
         mockClient.getKeyBackupVersion.mockResolvedValue({} as KeyBackupInfo);
         const rendered = renderComponent();
-        await rendered.findByText("Connect this session to Key Backup");
+        await rendered.findByText("Connect this device to Key Backup");
         expect(rendered.container).toMatchSnapshot();
     });
 
diff --git a/test/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx b/test/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx
index c411c2caa4..5d773faa1a 100644
--- a/test/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx
+++ b/test/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx
@@ -83,7 +83,7 @@ describe("ManualDeviceKeyVerificationDialog", () => {
         const onFinished = jest.fn();
         renderDialog(mockClient.getUserId()!, device, onFinished);
 
-        screen.getByRole("button", { name: "Verify session" }).click();
+        screen.getByRole("button", { name: "Verify device" }).click();
 
         // Then
         expect(onFinished).toHaveBeenCalledWith(true);
diff --git a/test/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap
index 3219b1fa72..c74e7e6521 100644
--- a/test/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap
+++ b/test/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap
@@ -61,7 +61,7 @@ exports[`LogoutDialog Prompts user to connect backup if there is a backup on the
             data-testid="dialog-primary-button"
             type="button"
           >
-            Connect this session to Key Backup
+            Connect this device to Key Backup
           </button>
         </span>
       </div>
diff --git a/test/components/views/dialogs/__snapshots__/ManualDeviceKeyVerificationDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/ManualDeviceKeyVerificationDialog-test.tsx.snap
index a115bf96be..731211d74a 100644
--- a/test/components/views/dialogs/__snapshots__/ManualDeviceKeyVerificationDialog-test.tsx.snap
+++ b/test/components/views/dialogs/__snapshots__/ManualDeviceKeyVerificationDialog-test.tsx.snap
@@ -21,7 +21,7 @@ exports[`ManualDeviceKeyVerificationDialog should display the device 1`] = `
         class="mx_Heading_h3 mx_Dialog_title"
         id="mx_BaseDialog_title"
       >
-        Verify session
+        Verify device
       </h1>
     </div>
     <div
@@ -36,7 +36,7 @@ exports[`ManualDeviceKeyVerificationDialog should display the device 1`] = `
     >
       <div>
         <p>
-          Confirm by comparing the following with the User Settings in your other session:
+          Confirm by comparing the following with the User Settings in your other device:
         </p>
         <div
           class="mx_DeviceVerifyDialog_cryptoSection"
@@ -102,7 +102,7 @@ exports[`ManualDeviceKeyVerificationDialog should display the device 1`] = `
           data-testid="dialog-primary-button"
           type="button"
         >
-          Verify session
+          Verify device
         </button>
       </span>
     </div>
@@ -136,7 +136,7 @@ exports[`ManualDeviceKeyVerificationDialog should display the device of another
         class="mx_Heading_h3 mx_Dialog_title"
         id="mx_BaseDialog_title"
       >
-        Verify session
+        Verify device
       </h1>
     </div>
     <div
@@ -151,7 +151,7 @@ exports[`ManualDeviceKeyVerificationDialog should display the device of another
     >
       <div>
         <p>
-          Confirm this user's session by comparing the following with their User Settings:
+          Confirm this user's device by comparing the following with their User Settings:
         </p>
         <div
           class="mx_DeviceVerifyDialog_cryptoSection"
@@ -217,7 +217,7 @@ exports[`ManualDeviceKeyVerificationDialog should display the device of another
           data-testid="dialog-primary-button"
           type="button"
         >
-          Verify session
+          Verify device
         </button>
       </span>
     </div>
diff --git a/test/components/views/dialogs/security/__snapshots__/CreateSecretStorageDialog-test.tsx.snap b/test/components/views/dialogs/security/__snapshots__/CreateSecretStorageDialog-test.tsx.snap
index 3ba1018ae1..e6ad1df146 100644
--- a/test/components/views/dialogs/security/__snapshots__/CreateSecretStorageDialog-test.tsx.snap
+++ b/test/components/views/dialogs/security/__snapshots__/CreateSecretStorageDialog-test.tsx.snap
@@ -194,7 +194,7 @@ exports[`CreateSecretStorageDialog when backup is present but not trusted shows
     <div>
       <form>
         <p>
-          Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.
+          Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.
         </p>
         <div>
           <div>
@@ -261,7 +261,7 @@ exports[`CreateSecretStorageDialog when canUploadKeysWithPasswordOnly calls boot
     <div>
       <form>
         <p>
-          Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.
+          Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.
         </p>
         <div>
           <div>
@@ -347,7 +347,7 @@ exports[`CreateSecretStorageDialog when canUploadKeysWithPasswordOnly prompts fo
     <div>
       <form>
         <p>
-          Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.
+          Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.
         </p>
         <div>
           <div>
@@ -433,7 +433,7 @@ exports[`CreateSecretStorageDialog when canUploadKeysWithPasswordOnly when there
     <div>
       <form>
         <p>
-          Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.
+          Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.
         </p>
         <div>
           <div>
diff --git a/test/components/views/right_panel/UserInfo-test.tsx b/test/components/views/right_panel/UserInfo-test.tsx
index 1c9e375e04..624b0c7626 100644
--- a/test/components/views/right_panel/UserInfo-test.tsx
+++ b/test/components/views/right_panel/UserInfo-test.tsx
@@ -383,7 +383,7 @@ describe("<UserInfo />", () => {
             await act(flushPromises);
 
             // check the button exists with the expected text
-            const devicesButton = screen.getByRole("button", { name: "1 session" });
+            const devicesButton = screen.getByRole("button", { name: "1 device" });
 
             // click it
             await userEvent.click(devicesButton);
@@ -434,7 +434,7 @@ describe("<UserInfo />", () => {
                 await act(flushPromises);
 
                 // check the button exists with the expected text (the dehydrated device shouldn't be counted)
-                const devicesButton = screen.getByRole("button", { name: "1 session" });
+                const devicesButton = screen.getByRole("button", { name: "1 device" });
 
                 // click it
                 await act(() => {
@@ -482,7 +482,7 @@ describe("<UserInfo />", () => {
                 await act(flushPromises);
 
                 // check the button exists with the expected text (the dehydrated device shouldn't be counted)
-                const devicesButton = screen.getByRole("button", { name: "1 verified session" });
+                const devicesButton = screen.getByRole("button", { name: "1 verified device" });
 
                 // click it
                 await act(() => {
@@ -562,7 +562,7 @@ describe("<UserInfo />", () => {
                 await act(flushPromises);
 
                 // check the button exists with the expected text (the dehydrated device shouldn't be counted)
-                const devicesButton = screen.getByRole("button", { name: "2 sessions" });
+                const devicesButton = screen.getByRole("button", { name: "2 devices" });
 
                 // click it
                 await act(() => {
diff --git a/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap b/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
index 95f75eadc8..dc3b28c89d 100644
--- a/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
+++ b/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
@@ -183,7 +183,7 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
                 class="mx_E2EIcon mx_E2EIcon_normal"
               />
               <div>
-                1 session
+                1 device
               </div>
             </div>
           </div>
diff --git a/test/components/views/rooms/EventTile-test.tsx b/test/components/views/rooms/EventTile-test.tsx
index cb4cbc56f0..1bd5340e0e 100644
--- a/test/components/views/rooms/EventTile-test.tsx
+++ b/test/components/views/rooms/EventTile-test.tsx
@@ -267,7 +267,7 @@ describe("EventTile", () => {
             [EventShieldReason.UNSIGNED_DEVICE, "device not verified by its owner"],
             [EventShieldReason.UNKNOWN_DEVICE, "unknown or deleted device"],
             [EventShieldReason.AUTHENTICITY_NOT_GUARANTEED, "can't be guaranteed"],
-            [EventShieldReason.MISMATCHED_SENDER_KEY, "Encrypted by an unverified session"],
+            [EventShieldReason.MISMATCHED_SENDER_KEY, "Encrypted by an unverified device"],
         ])("shows the correct reason code for %i (%s)", async (reasonCode: EventShieldReason, expectedText: string) => {
             mxEvent = await mkEncryptedMatrixEvent({
                 plainContent: { msgtype: "m.text", body: "msg1" },
diff --git a/test/components/views/rooms/MemberTile-test.tsx b/test/components/views/rooms/MemberTile-test.tsx
index 5f96147a50..ececad0402 100644
--- a/test/components/views/rooms/MemberTile-test.tsx
+++ b/test/components/views/rooms/MemberTile-test.tsx
@@ -53,7 +53,7 @@ describe("MemberTile", () => {
         await waitFor(async () => {
             await userEvent.hover(container.querySelector(".mx_E2EIcon")!);
             expect(
-                screen.getByRole("tooltip", { name: "This user has not verified all of their sessions." }),
+                screen.getByRole("tooltip", { name: "This user has not verified all of their devices." }),
             ).toBeInTheDocument();
         });
     });
@@ -78,7 +78,7 @@ describe("MemberTile", () => {
             await userEvent.hover(container.querySelector(".mx_E2EIcon")!);
             expect(
                 screen.getByRole("tooltip", {
-                    name: "You have verified this user. This user has verified all of their sessions.",
+                    name: "You have verified this user. This user has verified all of their devices.",
                 }),
             ).toBeInTheDocument();
         });
diff --git a/test/components/views/settings/CrossSigningPanel-test.tsx b/test/components/views/settings/CrossSigningPanel-test.tsx
index 501b0fe901..b025619248 100644
--- a/test/components/views/settings/CrossSigningPanel-test.tsx
+++ b/test/components/views/settings/CrossSigningPanel-test.tsx
@@ -134,7 +134,7 @@ describe("<CrossSigningPanel />", () => {
             await flushPromises();
 
             expect(screen.getByTestId("summarised-status").innerHTML).toEqual(
-                "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
+                "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.",
             );
             expect(screen.getByText("Cross-signing private keys:").parentElement!).toMatchSnapshot();
         });
diff --git a/test/components/views/settings/SecureBackupPanel-test.tsx b/test/components/views/settings/SecureBackupPanel-test.tsx
index cadd0353aa..46d1af08c9 100644
--- a/test/components/views/settings/SecureBackupPanel-test.tsx
+++ b/test/components/views/settings/SecureBackupPanel-test.tsx
@@ -104,7 +104,7 @@ describe("<SecureBackupPanel />", () => {
         // flush checkKeyBackup promise
         await flushPromises();
 
-        expect(screen.getByText("✅ This session is backing up your keys.")).toBeInTheDocument();
+        expect(screen.getByText("✅ This device is backing up your keys.")).toBeInTheDocument();
     });
 
     it("asks for confirmation before deleting a backup", async () => {
diff --git a/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap b/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap
index 718df62fee..19caa590ac 100644
--- a/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap
+++ b/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap
@@ -5,7 +5,7 @@ exports[`<SecureBackupPanel /> handles error fetching backup 1`] = `
   <div
     class="mx_SettingsSubsection_text"
   >
-    Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.
+    Back up your encryption keys with your account data in case you lose access to your devices. Your keys will be secured with a unique Security Key.
   </div>
   <div
     class="mx_SettingsSubsection_text"
@@ -72,13 +72,13 @@ exports[`<SecureBackupPanel /> suggests connecting session to key backup when ba
   <div
     class="mx_SettingsSubsection_text"
   >
-    Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.
+    Back up your encryption keys with your account data in case you lose access to your devices. Your keys will be secured with a unique Security Key.
   </div>
   <div
     class="mx_SettingsSubsection_text"
   >
     <span>
-      This session is 
+      This device is 
       <b>
         not backing up your keys
       </b>
@@ -88,7 +88,7 @@ exports[`<SecureBackupPanel /> suggests connecting session to key backup when ba
   <div
     class="mx_SettingsSubsection_text"
   >
-    Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.
+    Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.
   </div>
   <details>
     <summary
@@ -179,7 +179,7 @@ exports[`<SecureBackupPanel /> suggests connecting session to key backup when ba
       role="button"
       tabindex="0"
     >
-      Connect this session to Key Backup
+      Connect this device to Key Backup
     </div>
     <div
       class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger_outline"
diff --git a/test/components/views/settings/devices/DeviceDetailHeading-test.tsx b/test/components/views/settings/devices/DeviceDetailHeading-test.tsx
index 966c0a4be8..17385f6d0f 100644
--- a/test/components/views/settings/devices/DeviceDetailHeading-test.tsx
+++ b/test/components/views/settings/devices/DeviceDetailHeading-test.tsx
@@ -136,7 +136,7 @@ describe("<DeviceDetailHeading />", () => {
         await flushPromisesWithFakeTimers();
 
         // error message displayed
-        expect(queryByText("Failed to set session name")).toBeTruthy();
+        expect(queryByText("Failed to set device name")).toBeTruthy();
         // spinner removed
         expect(container.getElementsByClassName("mx_Spinner").length).toBeFalsy();
 
diff --git a/test/components/views/settings/devices/DeviceTypeIcon-test.tsx b/test/components/views/settings/devices/DeviceTypeIcon-test.tsx
index 417f1cd27b..49c1214d45 100644
--- a/test/components/views/settings/devices/DeviceTypeIcon-test.tsx
+++ b/test/components/views/settings/devices/DeviceTypeIcon-test.tsx
@@ -44,30 +44,30 @@ describe("<DeviceTypeIcon />", () => {
 
     it("renders an unknown device icon when no device type given", () => {
         const { getByLabelText } = render(getComponent());
-        expect(getByLabelText("Unknown session type")).toBeTruthy();
+        expect(getByLabelText("Unknown device type")).toBeTruthy();
     });
 
     it("renders a desktop device type", () => {
         const deviceType = DeviceType.Desktop;
         const { getByLabelText } = render(getComponent({ deviceType }));
-        expect(getByLabelText("Desktop session")).toBeTruthy();
+        expect(getByLabelText("Desktop device")).toBeTruthy();
     });
 
     it("renders a web device type", () => {
         const deviceType = DeviceType.Web;
         const { getByLabelText } = render(getComponent({ deviceType }));
-        expect(getByLabelText("Web session")).toBeTruthy();
+        expect(getByLabelText("Web device")).toBeTruthy();
     });
 
     it("renders a mobile device type", () => {
         const deviceType = DeviceType.Mobile;
         const { getByLabelText } = render(getComponent({ deviceType }));
-        expect(getByLabelText("Mobile session")).toBeTruthy();
+        expect(getByLabelText("Mobile device")).toBeTruthy();
     });
 
     it("renders an unknown device type", () => {
         const deviceType = DeviceType.Unknown;
         const { getByLabelText } = render(getComponent({ deviceType }));
-        expect(getByLabelText("Unknown session type")).toBeTruthy();
+        expect(getByLabelText("Unknown device type")).toBeTruthy();
     });
 });
diff --git a/test/components/views/settings/devices/DeviceVerificationStatusCard-test.tsx b/test/components/views/settings/devices/DeviceVerificationStatusCard-test.tsx
index 51af424816..4987e9e6c1 100644
--- a/test/components/views/settings/devices/DeviceVerificationStatusCard-test.tsx
+++ b/test/components/views/settings/devices/DeviceVerificationStatusCard-test.tsx
@@ -53,7 +53,7 @@ describe("<DeviceVerificationStatusCard />", () => {
         // current device uses different copy
         it("renders an unverified device", () => {
             const { getByText } = render(getComponent({ isCurrentDevice: true }));
-            expect(getByText("Verify your current session for enhanced secure messaging.")).toBeTruthy();
+            expect(getByText("Verify your current device for enhanced secure messaging.")).toBeTruthy();
         });
 
         it("renders an unverifiable device", () => {
@@ -63,7 +63,7 @@ describe("<DeviceVerificationStatusCard />", () => {
                     isCurrentDevice: true,
                 }),
             );
-            expect(getByText("This session doesn't support encryption and thus can't be verified.")).toBeTruthy();
+            expect(getByText("This device doesn't support encryption and thus can't be verified.")).toBeTruthy();
         });
 
         it("renders a verified device", () => {
@@ -73,7 +73,7 @@ describe("<DeviceVerificationStatusCard />", () => {
                     isCurrentDevice: true,
                 }),
             );
-            expect(getByText("Your current session is ready for secure messaging.")).toBeTruthy();
+            expect(getByText("Your current device is ready for secure messaging.")).toBeTruthy();
         });
     });
 
diff --git a/test/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
index 93f53a7ece..1bc29f2ab8 100644
--- a/test/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
+++ b/test/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
@@ -44,12 +44,12 @@ HTMLCollection [
           <p
             class="mx_DeviceSecurityCard_heading"
           >
-            Unverified session
+            Unverified device
           </p>
           <p
             class="mx_DeviceSecurityCard_description"
           >
-            Verify your current session for enhanced secure messaging.
+            Verify your current device for enhanced secure messaging.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"
@@ -67,7 +67,7 @@ HTMLCollection [
               role="button"
               tabindex="0"
             >
-              Verify session
+              Verify device
             </div>
           </div>
         </div>
@@ -79,7 +79,7 @@ HTMLCollection [
       <p
         class="mx_DeviceDetails_sectionHeading"
       >
-        Session details
+        Device details
       </p>
       <table
         class="mx_DeviceDetails_metadataTable"
@@ -90,7 +90,7 @@ HTMLCollection [
             <td
               class="mxDeviceDetails_metadataLabel"
             >
-              Session ID
+              Device ID
             </td>
             <td
               class="mxDeviceDetails_metadataValue"
@@ -113,7 +113,7 @@ HTMLCollection [
         <span
           class="mx_DeviceDetails_signOutButtonContent"
         >
-          Sign out of this session
+          Sign out of this device
         </span>
       </div>
     </section>
@@ -133,7 +133,7 @@ exports[`<CurrentDeviceSection /> handles when device is falsy 1`] = `
       <h3
         class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
       >
-        Current session
+        Current device
       </h3>
       <div
         aria-disabled="true"
@@ -170,7 +170,7 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
       <h3
         class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
       >
-        Current session
+        Current device
       </h3>
       <div
         aria-expanded="false"
@@ -200,7 +200,7 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
             class="mx_DeviceTypeIcon_deviceIconWrapper"
           >
             <div
-              aria-label="Unknown session type"
+              aria-label="Unknown device type"
               class="mx_DeviceTypeIcon_deviceIcon"
               role="img"
             />
@@ -269,12 +269,12 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
           <p
             class="mx_DeviceSecurityCard_heading"
           >
-            Unverified session
+            Unverified device
           </p>
           <p
             class="mx_DeviceSecurityCard_description"
           >
-            Verify your current session for enhanced secure messaging.
+            Verify your current device for enhanced secure messaging.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"
@@ -292,7 +292,7 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
               role="button"
               tabindex="0"
             >
-              Verify session
+              Verify device
             </div>
           </div>
         </div>
@@ -314,7 +314,7 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
       <h3
         class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
       >
-        Current session
+        Current device
       </h3>
       <div
         aria-expanded="false"
@@ -344,7 +344,7 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
             class="mx_DeviceTypeIcon_deviceIconWrapper"
           >
             <div
-              aria-label="Unknown session type"
+              aria-label="Unknown device type"
               class="mx_DeviceTypeIcon_deviceIcon"
               role="img"
             />
@@ -413,12 +413,12 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
           <p
             class="mx_DeviceSecurityCard_heading"
           >
-            Unverified session
+            Unverified device
           </p>
           <p
             class="mx_DeviceSecurityCard_description"
           >
-            Verify your current session for enhanced secure messaging.
+            Verify your current device for enhanced secure messaging.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"
@@ -436,7 +436,7 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
               role="button"
               tabindex="0"
             >
-              Verify session
+              Verify device
             </div>
           </div>
         </div>
diff --git a/test/components/views/settings/devices/__snapshots__/DeviceDetailHeading-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/DeviceDetailHeading-test.tsx.snap
index b9c63774cd..2c09938514 100644
--- a/test/components/views/settings/devices/__snapshots__/DeviceDetailHeading-test.tsx.snap
+++ b/test/components/views/settings/devices/__snapshots__/DeviceDetailHeading-test.tsx.snap
@@ -12,7 +12,7 @@ exports[`<DeviceDetailHeading /> displays name edit form on rename button click
         class="mx_DeviceDetailHeading_renameFormHeading"
         id="device-rename-123"
       >
-        Rename session
+        Rename device
       </p>
       <div>
         <div
@@ -36,7 +36,7 @@ exports[`<DeviceDetailHeading /> displays name edit form on rename button click
           class="mx_Caption"
           id="device-rename-description-123"
         >
-          Please be aware that session names are also visible to people you communicate with.
+          Please be aware that device names are also visible to people you communicate with.
           <div
             class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
             role="button"
diff --git a/test/components/views/settings/devices/__snapshots__/DeviceDetails-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/DeviceDetails-test.tsx.snap
index f39be8aaeb..40ccf4ce5b 100644
--- a/test/components/views/settings/devices/__snapshots__/DeviceDetails-test.tsx.snap
+++ b/test/components/views/settings/devices/__snapshots__/DeviceDetails-test.tsx.snap
@@ -44,12 +44,12 @@ exports[`<DeviceDetails /> renders a verified device 1`] = `
           <p
             class="mx_DeviceSecurityCard_heading"
           >
-            Verified session
+            Verified device
           </p>
           <p
             class="mx_DeviceSecurityCard_description"
           >
-            Your current session is ready for secure messaging.
+            Your current device is ready for secure messaging.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"
@@ -67,7 +67,7 @@ exports[`<DeviceDetails /> renders a verified device 1`] = `
       <p
         class="mx_DeviceDetails_sectionHeading"
       >
-        Session details
+        Device details
       </p>
       <table
         class="mx_DeviceDetails_metadataTable"
@@ -78,7 +78,7 @@ exports[`<DeviceDetails /> renders a verified device 1`] = `
             <td
               class="mxDeviceDetails_metadataLabel"
             >
-              Session ID
+              Device ID
             </td>
             <td
               class="mxDeviceDetails_metadataValue"
@@ -101,7 +101,7 @@ exports[`<DeviceDetails /> renders a verified device 1`] = `
         <span
           class="mx_DeviceDetails_signOutButtonContent"
         >
-          Sign out of this session
+          Sign out of this device
         </span>
       </div>
     </section>
@@ -153,12 +153,12 @@ exports[`<DeviceDetails /> renders device with metadata 1`] = `
           <p
             class="mx_DeviceSecurityCard_heading"
           >
-            Unverified session
+            Unverified device
           </p>
           <p
             class="mx_DeviceSecurityCard_description"
           >
-            Verify your current session for enhanced secure messaging.
+            Verify your current device for enhanced secure messaging.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"
@@ -176,7 +176,7 @@ exports[`<DeviceDetails /> renders device with metadata 1`] = `
       <p
         class="mx_DeviceDetails_sectionHeading"
       >
-        Session details
+        Device details
       </p>
       <table
         class="mx_DeviceDetails_metadataTable"
@@ -187,7 +187,7 @@ exports[`<DeviceDetails /> renders device with metadata 1`] = `
             <td
               class="mxDeviceDetails_metadataLabel"
             >
-              Session ID
+              Device ID
             </td>
             <td
               class="mxDeviceDetails_metadataValue"
@@ -310,7 +310,7 @@ exports[`<DeviceDetails /> renders device with metadata 1`] = `
         <span
           class="mx_DeviceDetails_signOutButtonContent"
         >
-          Sign out of this session
+          Sign out of this device
         </span>
       </div>
     </section>
@@ -362,12 +362,12 @@ exports[`<DeviceDetails /> renders device without metadata 1`] = `
           <p
             class="mx_DeviceSecurityCard_heading"
           >
-            Unverified session
+            Unverified device
           </p>
           <p
             class="mx_DeviceSecurityCard_description"
           >
-            Verify your current session for enhanced secure messaging.
+            Verify your current device for enhanced secure messaging.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"
@@ -385,7 +385,7 @@ exports[`<DeviceDetails /> renders device without metadata 1`] = `
       <p
         class="mx_DeviceDetails_sectionHeading"
       >
-        Session details
+        Device details
       </p>
       <table
         class="mx_DeviceDetails_metadataTable"
@@ -396,7 +396,7 @@ exports[`<DeviceDetails /> renders device without metadata 1`] = `
             <td
               class="mxDeviceDetails_metadataLabel"
             >
-              Session ID
+              Device ID
             </td>
             <td
               class="mxDeviceDetails_metadataValue"
@@ -419,7 +419,7 @@ exports[`<DeviceDetails /> renders device without metadata 1`] = `
         <span
           class="mx_DeviceDetails_signOutButtonContent"
         >
-          Sign out of this session
+          Sign out of this device
         </span>
       </div>
     </section>
diff --git a/test/components/views/settings/devices/__snapshots__/DeviceTile-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/DeviceTile-test.tsx.snap
index 2d0d4a8d40..be87d3a35c 100644
--- a/test/components/views/settings/devices/__snapshots__/DeviceTile-test.tsx.snap
+++ b/test/components/views/settings/devices/__snapshots__/DeviceTile-test.tsx.snap
@@ -13,7 +13,7 @@ exports[`<DeviceTile /> renders a device with no metadata 1`] = `
         class="mx_DeviceTypeIcon_deviceIconWrapper"
       >
         <div
-          aria-label="Unknown session type"
+          aria-label="Unknown device type"
           class="mx_DeviceTypeIcon_deviceIcon"
           role="img"
         />
@@ -68,7 +68,7 @@ exports[`<DeviceTile /> renders a verified device with no metadata 1`] = `
         class="mx_DeviceTypeIcon_deviceIconWrapper"
       >
         <div
-          aria-label="Unknown session type"
+          aria-label="Unknown device type"
           class="mx_DeviceTypeIcon_deviceIcon"
           role="img"
         />
@@ -123,7 +123,7 @@ exports[`<DeviceTile /> renders display name with a tooltip 1`] = `
         class="mx_DeviceTypeIcon_deviceIconWrapper"
       >
         <div
-          aria-label="Unknown session type"
+          aria-label="Unknown device type"
           class="mx_DeviceTypeIcon_deviceIcon"
           role="img"
         />
@@ -178,7 +178,7 @@ exports[`<DeviceTile /> separates metadata with a dot 1`] = `
         class="mx_DeviceTypeIcon_deviceIconWrapper"
       >
         <div
-          aria-label="Unknown session type"
+          aria-label="Unknown device type"
           class="mx_DeviceTypeIcon_deviceIcon"
           role="img"
         />
diff --git a/test/components/views/settings/devices/__snapshots__/DeviceTypeIcon-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/DeviceTypeIcon-test.tsx.snap
index 74e398d0b9..1e8768b47c 100644
--- a/test/components/views/settings/devices/__snapshots__/DeviceTypeIcon-test.tsx.snap
+++ b/test/components/views/settings/devices/__snapshots__/DeviceTypeIcon-test.tsx.snap
@@ -9,7 +9,7 @@ exports[`<DeviceTypeIcon /> renders a verified device 1`] = `
       class="mx_DeviceTypeIcon_deviceIconWrapper"
     >
       <div
-        aria-label="Unknown session type"
+        aria-label="Unknown device type"
         class="mx_DeviceTypeIcon_deviceIcon"
         role="img"
       />
@@ -32,7 +32,7 @@ exports[`<DeviceTypeIcon /> renders an unverified device 1`] = `
       class="mx_DeviceTypeIcon_deviceIconWrapper"
     >
       <div
-        aria-label="Unknown session type"
+        aria-label="Unknown device type"
         class="mx_DeviceTypeIcon_deviceIcon"
         role="img"
       />
@@ -55,7 +55,7 @@ exports[`<DeviceTypeIcon /> renders correctly when selected 1`] = `
       class="mx_DeviceTypeIcon_deviceIconWrapper"
     >
       <div
-        aria-label="Unknown session type"
+        aria-label="Unknown device type"
         class="mx_DeviceTypeIcon_deviceIcon"
         role="img"
       />
diff --git a/test/components/views/settings/devices/__snapshots__/DeviceVerificationStatusCard-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/DeviceVerificationStatusCard-test.tsx.snap
index 6e42937c28..2691fbcbb2 100644
--- a/test/components/views/settings/devices/__snapshots__/DeviceVerificationStatusCard-test.tsx.snap
+++ b/test/components/views/settings/devices/__snapshots__/DeviceVerificationStatusCard-test.tsx.snap
@@ -19,12 +19,12 @@ exports[`<DeviceVerificationStatusCard /> renders a verified device 1`] = `
       <p
         class="mx_DeviceSecurityCard_heading"
       >
-        Verified session
+        Verified device
       </p>
       <p
         class="mx_DeviceSecurityCard_description"
       >
-        This session is ready for secure messaging.
+        This device is ready for secure messaging.
         <div
           class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
           role="button"
@@ -57,12 +57,12 @@ exports[`<DeviceVerificationStatusCard /> renders an unverifiable device 1`] = `
       <p
         class="mx_DeviceSecurityCard_heading"
       >
-        Unverified session
+        Unverified device
       </p>
       <p
         class="mx_DeviceSecurityCard_description"
       >
-        This session doesn't support encryption and thus can't be verified.
+        This device doesn't support encryption and thus can't be verified.
         <div
           class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
           role="button"
@@ -95,12 +95,12 @@ exports[`<DeviceVerificationStatusCard /> renders an unverified device 1`] = `
       <p
         class="mx_DeviceSecurityCard_heading"
       >
-        Unverified session
+        Unverified device
       </p>
       <p
         class="mx_DeviceSecurityCard_description"
       >
-        Verify or sign out from this session for best security and reliability.
+        Verify or sign out from this device for best security and reliability.
         <div
           class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
           role="button"
@@ -118,7 +118,7 @@ exports[`<DeviceVerificationStatusCard /> renders an unverified device 1`] = `
           role="button"
           tabindex="0"
         >
-          Verify session
+          Verify device
         </div>
       </div>
     </div>
diff --git a/test/components/views/settings/devices/__snapshots__/FilteredDeviceList-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/FilteredDeviceList-test.tsx.snap
index 62a6cd94d1..77694987f9 100644
--- a/test/components/views/settings/devices/__snapshots__/FilteredDeviceList-test.tsx.snap
+++ b/test/components/views/settings/devices/__snapshots__/FilteredDeviceList-test.tsx.snap
@@ -5,7 +5,7 @@ HTMLCollection [
   <div
     class="mx_FilteredDeviceList_noResults"
   >
-    No sessions found.
+    No devices found.
   </div>,
 ]
 `;
@@ -32,13 +32,13 @@ HTMLCollection [
         <p
           class="mx_DeviceSecurityCard_heading"
         >
-          Inactive sessions
+          Inactive devices
         </p>
         <p
           class="mx_DeviceSecurityCard_description"
         >
           <span>
-            Consider signing out from old sessions (90 days or older) you don't use anymore.
+            Consider signing out from old devices (90 days or older) you don't use anymore.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"
@@ -76,13 +76,13 @@ HTMLCollection [
         <p
           class="mx_DeviceSecurityCard_heading"
         >
-          Unverified sessions
+          Unverified devices
         </p>
         <p
           class="mx_DeviceSecurityCard_description"
         >
           <span>
-            Verify your sessions for enhanced secure messaging or sign out from those you don't recognize or use anymore.
+            Verify your devices for enhanced secure messaging or sign out from those you don't recognize or use anymore.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"
@@ -120,13 +120,13 @@ HTMLCollection [
         <p
           class="mx_DeviceSecurityCard_heading"
         >
-          Verified sessions
+          Verified devices
         </p>
         <p
           class="mx_DeviceSecurityCard_description"
         >
           <span>
-            For best security, sign out from any session that you don't recognize or use anymore.
+            For best security, sign out from any device that you don't recognize or use anymore.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"
@@ -147,7 +147,7 @@ HTMLCollection [
   <div
     class="mx_FilteredDeviceList_noResults"
   >
-    No inactive sessions found.
+    No inactive devices found.
      
     <div
       class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
@@ -166,7 +166,7 @@ HTMLCollection [
   <div
     class="mx_FilteredDeviceList_noResults"
   >
-    No unverified sessions found.
+    No unverified devices found.
      
     <div
       class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
@@ -185,7 +185,7 @@ HTMLCollection [
   <div
     class="mx_FilteredDeviceList_noResults"
   >
-    No verified sessions found.
+    No verified devices found.
      
     <div
       class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
diff --git a/test/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
index 0698d0363f..340975ed11 100644
--- a/test/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
+++ b/test/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
@@ -646,7 +646,7 @@ exports[`<LoginWithQRFlow /> renders QR code 1`] = `
       <div
         class="mx_LoginWithQR_breadcrumbs"
       >
-        Sessions
+        Devices
          / 
         Link new device
       </div>
@@ -773,7 +773,7 @@ exports[`<LoginWithQRFlow /> renders spinner while connecting 1`] = `
       <div
         class="mx_LoginWithQR_breadcrumbs"
       >
-        Sessions
+        Devices
          / 
         Link new device
       </div>
@@ -839,7 +839,7 @@ exports[`<LoginWithQRFlow /> renders spinner while loading 1`] = `
       <div
         class="mx_LoginWithQR_breadcrumbs"
       >
-        Sessions
+        Devices
          / 
         Link new device
       </div>
@@ -893,7 +893,7 @@ exports[`<LoginWithQRFlow /> renders spinner while signing in 1`] = `
       <div
         class="mx_LoginWithQR_breadcrumbs"
       >
-        Sessions
+        Devices
          / 
         Link new device
       </div>
@@ -959,7 +959,7 @@ exports[`<LoginWithQRFlow /> renders spinner while verifying 1`] = `
       <div
         class="mx_LoginWithQR_breadcrumbs"
       >
-        Sessions
+        Devices
          / 
         Link new device
       </div>
@@ -1016,7 +1016,7 @@ exports[`<LoginWithQRFlow /> renders spinner whilst QR generating 1`] = `
       <div
         class="mx_LoginWithQR_breadcrumbs"
       >
-        Sessions
+        Devices
          / 
         Link new device
       </div>
diff --git a/test/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap
index 37e93804d5..47509aa8e4 100644
--- a/test/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap
+++ b/test/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap
@@ -44,7 +44,7 @@ exports[`<SelectableDeviceTile /> renders unselected device tile with checkbox 1
                 class="mx_DeviceTypeIcon_deviceIconWrapper"
               >
                 <div
-                  aria-label="Unknown session type"
+                  aria-label="Unknown device type"
                   class="mx_DeviceTypeIcon_deviceIcon"
                   role="img"
                 />
diff --git a/test/components/views/settings/notifications/__snapshots__/Notifications2-test.tsx.snap b/test/components/views/settings/notifications/__snapshots__/Notifications2-test.tsx.snap
index bb945a5024..e8f3b8fe64 100644
--- a/test/components/views/settings/notifications/__snapshots__/Notifications2-test.tsx.snap
+++ b/test/components/views/settings/notifications/__snapshots__/Notifications2-test.tsx.snap
@@ -48,7 +48,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
               <div
                 id="mx_LabelledToggleSwitch_QgU2PomxwKpa"
               >
-                Enable desktop notifications for this session
+                Enable desktop notifications for this device
               </div>
             </span>
             <div
@@ -98,7 +98,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
               <div
                 id="mx_LabelledToggleSwitch_4yVCeEefiPqp"
               >
-                Enable audible notifications for this session
+                Enable audible notifications for this device
               </div>
             </span>
             <div
@@ -816,7 +816,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
               <div
                 id="mx_LabelledToggleSwitch_QgU2PomxwKpa"
               >
-                Enable desktop notifications for this session
+                Enable desktop notifications for this device
               </div>
             </span>
             <div
@@ -866,7 +866,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
               <div
                 id="mx_LabelledToggleSwitch_4yVCeEefiPqp"
               >
-                Enable audible notifications for this session
+                Enable audible notifications for this device
               </div>
             </span>
             <div
diff --git a/test/components/views/settings/tabs/user/SessionManagerTab-test.tsx b/test/components/views/settings/tabs/user/SessionManagerTab-test.tsx
index f62515d04b..7d5bc1ab0e 100644
--- a/test/components/views/settings/tabs/user/SessionManagerTab-test.tsx
+++ b/test/components/views/settings/tabs/user/SessionManagerTab-test.tsx
@@ -851,7 +851,7 @@ describe("<SessionManagerTab />", () => {
             });
 
             fireEvent.click(getByTestId("current-session-menu"));
-            fireEvent.click(getByLabelText("Sign out of all other sessions (2)"));
+            fireEvent.click(getByLabelText("Sign out of all other devices (2)"));
             await confirmSignout(getByTestId);
 
             // other devices deleted, excluding current device
@@ -892,7 +892,7 @@ describe("<SessionManagerTab />", () => {
             expect(mockClient.deleteAccountData).not.toHaveBeenCalled();
 
             fireEvent.click(getByTestId("current-session-menu"));
-            fireEvent.click(getByLabelText("Sign out of all other sessions (2)"));
+            fireEvent.click(getByLabelText("Sign out of all other devices (2)"));
             await confirmSignout(getByTestId);
 
             // only called once for signed out device with account data event
@@ -1185,7 +1185,7 @@ describe("<SessionManagerTab />", () => {
                 });
 
                 fireEvent.click(getByTestId("other-sessions-menu"));
-                fireEvent.click(getByLabelText("Sign out of 2 sessions"));
+                fireEvent.click(getByLabelText("Sign out of 2 devices"));
                 await confirmSignout(getByTestId);
 
                 // other devices deleted, excluding current device
@@ -1450,7 +1450,7 @@ describe("<SessionManagerTab />", () => {
             toggleDeviceSelection(getByTestId, alicesOlderMobileDevice.device_id);
 
             // header displayed correctly
-            expect(getByText("2 sessions selected")).toBeTruthy();
+            expect(getByText("2 devices selected")).toBeTruthy();
 
             expect(isDeviceSelected(getByTestId, alicesMobileDevice.device_id)).toBeTruthy();
             expect(isDeviceSelected(getByTestId, alicesOlderMobileDevice.device_id)).toBeTruthy();
@@ -1474,7 +1474,7 @@ describe("<SessionManagerTab />", () => {
             toggleDeviceSelection(getByTestId, alicesOlderMobileDevice.device_id);
 
             // header displayed correctly
-            expect(getByText("2 sessions selected")).toBeTruthy();
+            expect(getByText("2 devices selected")).toBeTruthy();
 
             fireEvent.click(getByTestId("cancel-selection-cta"));
 
@@ -1513,7 +1513,7 @@ describe("<SessionManagerTab />", () => {
                 fireEvent.click(getByTestId("device-select-all-checkbox"));
 
                 // header displayed correctly
-                expect(getByText("2 sessions selected")).toBeTruthy();
+                expect(getByText("2 devices selected")).toBeTruthy();
                 expect(isSelectAllChecked(getByTestId)).toBeTruthy();
 
                 // devices selected
@@ -1533,7 +1533,7 @@ describe("<SessionManagerTab />", () => {
                 fireEvent.click(getByTestId("device-select-all-checkbox"));
 
                 // header displayed correctly
-                expect(getByText("2 sessions selected")).toBeTruthy();
+                expect(getByText("2 devices selected")).toBeTruthy();
                 expect(isSelectAllChecked(getByTestId)).toBeTruthy();
 
                 // devices selected
@@ -1551,7 +1551,7 @@ describe("<SessionManagerTab />", () => {
                 fireEvent.click(getByTestId("device-select-all-checkbox"));
 
                 // header displayed correctly
-                expect(getByText("2 sessions selected")).toBeTruthy();
+                expect(getByText("2 devices selected")).toBeTruthy();
                 expect(isSelectAllChecked(getByTestId)).toBeTruthy();
 
                 // devices selected
diff --git a/test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap b/test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap
index 7e2940026f..e9cec54a43 100644
--- a/test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap
+++ b/test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap
@@ -37,7 +37,7 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
               <div
                 class="mx_SettingsSubsection_text"
               >
-                Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.
+                Back up your encryption keys with your account data in case you lose access to your devices. Your keys will be secured with a unique Security Key.
               </div>
               <div
                 class="mx_Spinner"
@@ -266,7 +266,7 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
                     <th
                       scope="row"
                     >
-                      Session ID:
+                      Device ID:
                     </th>
                     <td>
                       <code />
@@ -276,7 +276,7 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
                     <th
                       scope="row"
                     >
-                      Session key:
+                      Device key:
                     </th>
                     <td>
                       <code>
@@ -298,13 +298,13 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Never send encrypted messages to unverified sessions from this session
+                    Never send encrypted messages to unverified devices from this device
                   </span>
                 </label>
                 <div
                   aria-checked="false"
                   aria-disabled="false"
-                  aria-label="Never send encrypted messages to unverified sessions from this session"
+                  aria-label="Never send encrypted messages to unverified devices from this device"
                   class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
                   id="mx_SettingsFlag_vY7Q4uEh9K38"
                   role="switch"
@@ -377,13 +377,13 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Manually verify all remote sessions
+                    Manually verify all remote devices
                   </span>
                 </label>
                 <div
                   aria-checked="false"
                   aria-disabled="false"
-                  aria-label="Manually verify all remote sessions"
+                  aria-label="Manually verify all remote devices"
                   class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
                   id="mx_SettingsFlag_QgU2PomxwKpa"
                   role="switch"
@@ -397,7 +397,7 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
               <div
                 class="mx_SettingsSubsection_text"
               >
-                Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.
+                Individually verify each device used by a user to mark it as trusted, not trusting cross-signed devices.
               </div>
             </div>
           </div>
diff --git a/test/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap b/test/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap
index 275f4430c7..62ad1178e7 100644
--- a/test/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap
+++ b/test/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap
@@ -19,12 +19,12 @@ HTMLCollection [
       <p
         class="mx_DeviceSecurityCard_heading"
       >
-        Unverified session
+        Unverified device
       </p>
       <p
         class="mx_DeviceSecurityCard_description"
       >
-        This session doesn't support encryption and thus can't be verified.
+        This device doesn't support encryption and thus can't be verified.
         <div
           class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
           role="button"
@@ -48,7 +48,7 @@ exports[`<SessionManagerTab /> Sign out Signs out of current device 1`] = `
   <span
     class="mx_DeviceDetails_signOutButtonContent"
   >
-    Sign out of this session
+    Sign out of this device
   </span>
 </div>
 `;
@@ -63,7 +63,7 @@ exports[`<SessionManagerTab /> Sign out for an OIDC-aware server Signs out of cu
   <span
     class="mx_DeviceDetails_signOutButtonContent"
   >
-    Sign out of this session
+    Sign out of this device
   </span>
 </div>
 `;
@@ -79,7 +79,7 @@ exports[`<SessionManagerTab /> current session section renders current session s
     <h3
       class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
     >
-      Current session
+      Current device
     </h3>
     <div
       aria-expanded="false"
@@ -109,7 +109,7 @@ exports[`<SessionManagerTab /> current session section renders current session s
           class="mx_DeviceTypeIcon_deviceIconWrapper"
         >
           <div
-            aria-label="Unknown session type"
+            aria-label="Unknown device type"
             class="mx_DeviceTypeIcon_deviceIcon"
             role="img"
           />
@@ -178,12 +178,12 @@ exports[`<SessionManagerTab /> current session section renders current session s
         <p
           class="mx_DeviceSecurityCard_heading"
         >
-          Verified session
+          Verified device
         </p>
         <p
           class="mx_DeviceSecurityCard_description"
         >
-          Your current session is ready for secure messaging.
+          Your current device is ready for secure messaging.
           <div
             class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
             role="button"
@@ -209,7 +209,7 @@ exports[`<SessionManagerTab /> current session section renders current session s
     <h3
       class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
     >
-      Current session
+      Current device
     </h3>
     <div
       aria-expanded="false"
@@ -239,7 +239,7 @@ exports[`<SessionManagerTab /> current session section renders current session s
           class="mx_DeviceTypeIcon_deviceIconWrapper"
         >
           <div
-            aria-label="Unknown session type"
+            aria-label="Unknown device type"
             class="mx_DeviceTypeIcon_deviceIcon"
             role="img"
           />
@@ -308,12 +308,12 @@ exports[`<SessionManagerTab /> current session section renders current session s
         <p
           class="mx_DeviceSecurityCard_heading"
         >
-          Unverified session
+          Unverified device
         </p>
         <p
           class="mx_DeviceSecurityCard_description"
         >
-          Verify your current session for enhanced secure messaging.
+          Verify your current device for enhanced secure messaging.
           <div
             class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
             role="button"
@@ -331,7 +331,7 @@ exports[`<SessionManagerTab /> current session section renders current session s
             role="button"
             tabindex="0"
           >
-            Verify session
+            Verify device
           </div>
         </div>
       </div>
@@ -372,7 +372,7 @@ exports[`<SessionManagerTab /> goes to filtered list from security recommendatio
   <span
     class="mx_FilteredDeviceListHeader_label"
   >
-    Sessions
+    Devices
   </span>
   <div
     class="mx_Dropdown mx_FilterDropdown"