diff --git a/Session/Conversations/Settings/ThreadSettingsViewModel.swift b/Session/Conversations/Settings/ThreadSettingsViewModel.swift
index 7d611f2ac..0dba52653 100644
--- a/Session/Conversations/Settings/ThreadSettingsViewModel.swift
+++ b/Session/Conversations/Settings/ThreadSettingsViewModel.swift
@@ -661,7 +661,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, Ob
                             threadViewModel.threadIsBlocked == true,
                             oldValue: (previous?.threadViewModel?.threadIsBlocked == true),
                             accessibility: Accessibility(
-                                identifier: "Block This User - Switch"
+                                identifier: "Block - Switch"
                             )
                         ),
                         accessibility: Accessibility(
@@ -1130,7 +1130,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, Ob
                             placeholder: "nicknameEnter".localized(),
                             initialValue: current,
                             accessibility: Accessibility(
-                                identifier: "Username"
+                                identifier: "Username input"
                             )
                         ),
                         onChange: { [weak self] updatedName in self?.updatedName = updatedName }
diff --git a/Session/Settings/SettingsViewModel.swift b/Session/Settings/SettingsViewModel.swift
index b7fa48257..d1950c2e5 100644
--- a/Session/Settings/SettingsViewModel.swift
+++ b/Session/Settings/SettingsViewModel.swift
@@ -461,7 +461,7 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
                             placeholder: "displayNameEnter".localized(),
                             initialValue: current,
                             accessibility: Accessibility(
-                                identifier: "Username"
+                                identifier: "Username input"
                             )
                         ),
                         onChange: { [weak self] updatedName in self?.updatedName = updatedName }
diff --git a/SessionTests/Conversations/Settings/ThreadSettingsViewModelSpec.swift b/SessionTests/Conversations/Settings/ThreadSettingsViewModelSpec.swift
index e86d5da1d..6dbd26152 100644
--- a/SessionTests/Conversations/Settings/ThreadSettingsViewModelSpec.swift
+++ b/SessionTests/Conversations/Settings/ThreadSettingsViewModelSpec.swift
@@ -341,7 +341,7 @@ class ThreadSettingsViewModelSpec: QuickSpec {
                                 info: ConfirmationModal.Info.Body.InputInfo(
                                     placeholder: "nicknameEnter".localized(),
                                     initialValue: nil,
-                                    accessibility: Accessibility(identifier: "Username")
+                                    accessibility: Accessibility(identifier: "Username input")
                                 ),
                                 onChange: { _ in }
                             )