diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt
index dbc122096d..aad1578e24 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt
@@ -53,7 +53,7 @@ internal fun InviteFriend(
             Text(
                 accountId,
                 modifier = Modifier
-                    .contentDescription(R.string.AccessibilityId_account_id)
+                    .contentDescription(R.string.AccessibilityId_shareAccountId)
                     .fillMaxWidth()
                     .border()
                     .padding(LocalDimensions.current.spacing),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
index 1718a712bf..26e01756ab 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
@@ -27,7 +27,7 @@ class SeedDialog: DialogFragment() {
         title(R.string.sessionRecoveryPassword)
         text(R.string.recoveryPasswordDescription)
         text(seed, R.style.AccountIdTextView)
-        button(R.string.copy, R.string.AccessibilityId_copy_recovery_phrase) { copySeed() }
+        button(R.string.copy, R.string.AccessibilityId_sessionRecoveryPasswordCopy) { copySeed() }
         button(R.string.close) { dismiss() }
     }
 
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 921f2c10a8..3bfb478c48 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -57,7 +57,7 @@
                 <RelativeLayout
                     android:id="@+id/searchViewContainer"
                     android:background="?selectableItemBackgroundBorderless"
-                    android:contentDescription="@string/AccessibilityId_search_icon"
+                    android:contentDescription="@string/AccessibilityId_searchIcon"
                     android:layout_width="@dimen/small_profile_picture_size"
                     android:layout_height="@dimen/small_profile_picture_size"
                     android:layout_alignParentRight="true"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index caf4fbdaf3..50f4c4f709 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -26,7 +26,7 @@
                 android:layout_width="@dimen/large_profile_picture_size"
                 android:layout_height="@dimen/large_profile_picture_size"
                 android:layout_marginTop="@dimen/medium_spacing"
-                android:contentDescription="@string/AccessibilityId_profile_picture" />
+                android:contentDescription="@string/AccessibilityId_profilePicture" />
 
             <RelativeLayout
                 android:id="@+id/ctnGroupNameSection"
@@ -83,7 +83,7 @@
                 android:textColor="?android:textColorPrimary"
                 android:fontFamily="@font/space_mono_regular"
                 android:textAlignment="center"
-                android:contentDescription="@string/AccessibilityId_account_id"
+                android:contentDescription="@string/AccessibilityId_shareAccountId"
                 tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
             <androidx.compose.ui.platform.ComposeView
diff --git a/app/src/main/res/layout/blocked_contacts_preference.xml b/app/src/main/res/layout/blocked_contacts_preference.xml
index dbf2de25c9..2e5070d9db 100644
--- a/app/src/main/res/layout/blocked_contacts_preference.xml
+++ b/app/src/main/res/layout/blocked_contacts_preference.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentDescription="@string/AccessibilityId_blocked_contacts"
+    android:contentDescription="@string/AccessibilityId_conversationsBlockedContacts"
     style="@style/Widget.Session.Button.Common.Borderless"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_change_avatar.xml b/app/src/main/res/layout/dialog_change_avatar.xml
index 98ba77ac0c..f240f81bbc 100644
--- a/app/src/main/res/layout/dialog_change_avatar.xml
+++ b/app/src/main/res/layout/dialog_change_avatar.xml
@@ -52,7 +52,7 @@
         android:layout_width="@dimen/large_profile_picture_size"
         android:layout_height="@dimen/large_profile_picture_size"
         android:layout_marginTop="@dimen/medium_spacing"
-        android:contentDescription="@string/AccessibilityId_profile_picture"
+        android:contentDescription="@string/AccessibilityId_profilePicture"
         tools:visibility="gone"/>
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_conversation_bottom_sheet.xml b/app/src/main/res/layout/fragment_conversation_bottom_sheet.xml
index cd4a8727e6..c64da7c365 100644
--- a/app/src/main/res/layout/fragment_conversation_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_conversation_bottom_sheet.xml
@@ -12,7 +12,7 @@
     <TextView
         android:id="@+id/detailsTextView"
         style="@style/BottomSheetActionItem"
-        android:contentDescription="@string/AccessibilityId_details"
+        android:contentDescription="@string/AccessibilityId_contactUserDetails"
         android:drawableStart="@drawable/ic_info_outline_white_24dp"
         android:drawableTint="?attr/colorControlNormal"
         android:text="@string/contactUserDetails" />
diff --git a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
index 321f17cfac..63bb035dd0 100644
--- a/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
@@ -114,7 +114,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/medium_spacing"
-        android:contentDescription="@string/AccessibilityId_account_id"
+        android:contentDescription="@string/AccessibilityId_shareAccountId"
         android:textSize="@dimen/medium_font_size"
         android:textIsSelectable="true"
         tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
diff --git a/app/src/main/res/layout/view_conversation.xml b/app/src/main/res/layout/view_conversation.xml
index b7ce743a18..040ccf4a2c 100644
--- a/app/src/main/res/layout/view_conversation.xml
+++ b/app/src/main/res/layout/view_conversation.xml
@@ -40,7 +40,7 @@
 
                 <TextView
                     android:id="@+id/conversationViewDisplayNameTextView"
-                    android:contentDescription="@string/AccessibilityId_conversation_list_item"
+                    android:contentDescription="@string/AccessibilityId_conversationListItem"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/content-descriptions/src/main/res/values/strings.xml b/content-descriptions/src/main/res/values/strings.xml
index 4243f5cbf2..be1ee1d803 100644
--- a/content-descriptions/src/main/res/values/strings.xml
+++ b/content-descriptions/src/main/res/values/strings.xml
@@ -36,21 +36,17 @@
     <string name="AccessibilityId_displayNameEnter">Enter display name</string>
     <!--Message Notifications Options-->
     <string name="AccessibilityId_notificationsMessageContinue">Continue with settings</string>
-    <string name="AccessibilityId_fast_mode_notifications_option">Fast mode notifications option</string>
-    <string name="AccessibilityId_message_notifications">Message Notifications</string>
-    <string name="AccessibilityId_slow_mode_notifications_option">Slow mode notifications option</string>
     <!--Recovery Phrase reminder-->
-    <string name="AccessibilityId_copy_recovery_phrase">Copy Recovery Phrase</string>
-    <string name="AccessibilityId_recovery_phrase">Recovery Phrase</string>
+    <string name="AccessibilityId_sessionRecoveryPasswordCopy">Copy Recovery Phrase</string>
     <!--Home Page-->
-    <string name="AccessibilityId_conversation_list_item">Conversation list item</string>
-    <string name="AccessibilityId_details">Details</string>
+    <string name="AccessibilityId_conversationListItem">Conversation list item</string>
+    <string name="AccessibilityId_contactUserDetails">Details</string>
     <string name="AccessibilityId_pin">Pin</string>
-    <string name="AccessibilityId_profile_picture">User settings</string>
-    <string name="AccessibilityId_search_icon">Search icon</string>
+    <string name="AccessibilityId_profilePicture">User settings</string>
+    <string name="AccessibilityId_searchIcon">Search icon</string>
     <!--Settings Page -->
-    <string name="AccessibilityId_blocked_contacts">Blocked contacts</string>
-    <string name="AccessibilityId_account_id">Account ID</string>
+    <string name="AccessibilityId_conversationsBlockedContacts">Blocked contacts</string>
+    <string name="AccessibilityId_shareAccountId">Account ID</string>
     <string name="activity_settings_display_name_edit_text_hint">Enter a display name</string>
     <!--Message requests-->
     <string name="AccessibilityId_clear_all_message_requests">Clear all</string>