diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt
index 829e576340..eae3f42d4c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt
@@ -52,7 +52,7 @@ internal fun StartConversationScreen(
                 ItemButton(
                     textId = R.string.messageNew,
                     icon = R.drawable.ic_message,
-                    modifier = Modifier.contentDescription(R.string.AccessibilityId_new_direct_message),
+                    modifier = Modifier.contentDescription(R.string.AccessibilityId_messageNew),
                     onClick = delegate::onNewMessageSelected)
                 Divider(startIndent = LocalDimensions.current.dividerIndent)
                 ItemButton(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 7552551ace..b9e5c46079 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1157,7 +1157,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                 .put(NAME_KEY, recipient.name)
                 .format()
             )
-            dangerButton(R.string.block, R.string.AccessibilityId_block_confirm) {
+            dangerButton(R.string.block, R.string.AccessibilityId_blockConfirm) {
                 viewModel.block()
 
                 // Block confirmation toast added as per SS-64
@@ -1217,7 +1217,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             )
             dangerButton(
                 R.string.blockUnblock,
-                R.string.AccessibilityId_unblock_confirm
+                R.string.AccessibilityId_unblockConfirm
             ) {
                 viewModel.unblock()
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
index 486d6aba87..d3e1de9912 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
@@ -43,7 +43,7 @@ class DownloadDialog(private val recipient: Recipient) : DialogFragment() {
         spannable.setSpan(StyleSpan(Typeface.BOLD), startIndex, startIndex + name.count(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         text(spannable)
 
-        button(R.string.download, R.string.AccessibilityId_download_media) { trust() }
+        button(R.string.download, R.string.AccessibilityId_download) { trust() }
         cancelButton { dismiss() }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
index c8aacdeb6e..431e073703 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
@@ -79,7 +79,7 @@ class InputBar @JvmOverloads constructor(
     var voiceMessageDurationMS = 0L
     var voiceRecorderState = VoiceRecorderState.Idle
 
-    private val attachmentsButton = InputBarButton(context, R.drawable.ic_plus_24).apply { contentDescription = context.getString(R.string.AccessibilityId_attachments_button)}
+    private val attachmentsButton = InputBarButton(context, R.drawable.ic_plus_24).apply { contentDescription = context.getString(R.string.AccessibilityId_attachmentsButton)}
     val microphoneButton = InputBarButton(context, R.drawable.ic_microphone).apply { contentDescription = context.getString(R.string.AccessibilityId_microphone_button)}
     private val sendButton = InputBarButton(context, R.drawable.ic_arrow_up, true).apply { contentDescription = context.getString(R.string.AccessibilityId_send_message_button)}
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index 1e8fb49252..2ec7334139 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -19,14 +19,12 @@ import androidx.core.graphics.drawable.IconCompat
 import com.squareup.phrase.Phrase
 import java.io.IOException
 import network.loki.messenger.R
-import org.session.libsession.LocalisedTimeUtil
 import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.sending_receiving.leave
 import org.session.libsession.utilities.GroupUtil.doubleDecodeGroupID
 import org.session.libsession.utilities.StringSubstitutionConstants.GROUP_NAME_KEY
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.recipients.Recipient
-import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.guava.Optional
 import org.session.libsignal.utilities.toHexString
 import org.thoughtcrime.securesms.MediaOverviewActivity
@@ -43,7 +41,6 @@ import org.thoughtcrime.securesms.service.WebRtcCallService
 import org.thoughtcrime.securesms.showMuteDialog
 import org.thoughtcrime.securesms.showSessionDialog
 import org.thoughtcrime.securesms.util.BitmapUtil
-import kotlin.time.Duration.Companion.milliseconds
 
 object ConversationMenuHelper {
     
@@ -171,7 +168,7 @@ object ConversationMenuHelper {
             context.showSessionDialog {
                 title(R.string.callsPermissionsRequired)
                 text(R.string.callsPermissionsRequiredDescription)
-                button(R.string.sessionSettings, R.string.AccessibilityId_settings) {
+                button(R.string.sessionSettings, R.string.AccessibilityId_sessionSettings) {
                     Intent(context, PrivacySettingsActivity::class.java).let(context::startActivity)
                 }
                 cancelButton()
@@ -185,7 +182,6 @@ object ConversationMenuHelper {
         Intent(context, WebRtcCallActivity::class.java)
             .apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK }
             .let(context::startActivity)
-
     }
 
     @SuppressLint("StaticFieldLeak")
diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml
index ea08d94f01..5f541bb391 100644
--- a/app/src/main/res/layout/activity_conversation_v2.xml
+++ b/app/src/main/res/layout/activity_conversation_v2.xml
@@ -122,7 +122,7 @@
             android:layout_marginTop="8dp"
             android:layout_width="@dimen/input_bar_button_expanded_size"
             android:layout_height="@dimen/input_bar_button_expanded_size"
-            android:contentDescription="@string/AccessibilityId_documents_folder"
+            android:contentDescription="@string/AccessibilityId_files"
             android:alpha="0" />
 
         <FrameLayout
@@ -223,7 +223,7 @@
 
     <FrameLayout
         android:id="@+id/blockedBanner"
-        android:contentDescription="@string/AccessibilityId_blocked_banner"
+        android:contentDescription="@string/AccessibilityId_blockedBanner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
@@ -233,7 +233,7 @@
 
         <TextView
             android:id="@+id/blockedBannerTextView"
-            android:contentDescription="@string/AccessibilityId_blocked_banner_text"
+            android:contentDescription="@string/AccessibilityId_blockedBannerText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -279,7 +279,7 @@
         app:layout_constraintTop_toBottomOf="@+id/outdatedBanner"
         android:elevation="8dp"
         android:contentDescription="@string/AccessibilityId_control_message"
-        tools:text="@string/activity_conversation_empty_state_default"
+        tools:text="Some Control Message Text"
         />
 
     <LinearLayout
@@ -298,7 +298,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:contentDescription="@string/AccessibilityId_block_message_request_button"
+            android:contentDescription="@string/AccessibilityId_messageRequestsBlock"
             android:textColor="?danger"
             android:paddingHorizontal="@dimen/massive_spacing"
             android:paddingVertical="@dimen/small_spacing"
@@ -325,7 +325,7 @@
             <Button
                 android:id="@+id/acceptMessageRequestButton"
                 style="@style/Widget.Session.Button.Common.ProminentOutline"
-                android:contentDescription="@string/AccessibilityId_accept_message_request_button"
+                android:contentDescription="@string/AccessibilityId_messageRequestsAccept"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/medium_button_height"
                 android:layout_weight="1"
@@ -334,7 +334,7 @@
             <Button
                 android:id="@+id/declineMessageRequestButton"
                 style="@style/Widget.Session.Button.Common.DangerOutline"
-                android:contentDescription="@string/AccessibilityId_decline_message_request_button"
+                android:contentDescription="@string/AccessibilityId_decline"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/medium_button_height"
                 android:layout_marginStart="@dimen/medium_spacing"
diff --git a/app/src/main/res/layout/activity_edit_closed_group.xml b/app/src/main/res/layout/activity_edit_closed_group.xml
index f9b6fd9f5e..998737686d 100644
--- a/app/src/main/res/layout/activity_edit_closed_group.xml
+++ b/app/src/main/res/layout/activity_edit_closed_group.xml
@@ -33,7 +33,7 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginLeft="@dimen/medium_spacing"
-                    android:contentDescription="@string/AccessibilityId_cancel_name_change"
+                    android:contentDescription="@string/AccessibilityId_groupNameChangeCancel"
                     android:src="@drawable/ic_baseline_clear_24"/>
 
                 <EditText
@@ -51,7 +51,7 @@
                     android:singleLine="true"
                     android:imeOptions="actionDone"
                     android:maxLength="@integer/max_group_and_community_name_length_chars"
-                    android:contentDescription="@string/AccessibilityId_group_name"
+                    android:contentDescription="@string/AccessibilityId_groupName"
                     android:hint="@string/groupNameEnter" />
 
                 <ImageView
@@ -60,7 +60,7 @@
                     android:layout_height="24dp"
                     android:layout_gravity="center"
                     android:layout_marginRight="@dimen/medium_spacing"
-                    android:contentDescription="@string/AccessibilityId_accept_name_change"
+                    android:contentDescription="@string/AccessibilityId_groupNameNew"
                     android:src="@drawable/ic_baseline_done_24"/>
 
             </LinearLayout>
@@ -78,7 +78,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:contentDescription="@string/AccessibilityId_group_name"
+                    android:contentDescription="@string/AccessibilityId_groupName"
                     android:textColor="?android:textColorPrimary"
                     android:textSize="@dimen/very_large_font_size"
                     android:textStyle="bold"
@@ -124,7 +124,7 @@
                 android:layout_marginVertical="@dimen/small_spacing"
                 android:layout_marginEnd="@dimen/medium_spacing"
                 android:layout_marginStart="@dimen/small_spacing"
-                android:contentDescription="@string/AccessibilityId_add_members"
+                android:contentDescription="@string/AccessibilityId_membersInvite"
                 android:paddingStart="@dimen/medium_spacing"
                 android:paddingEnd="@dimen/medium_spacing"
                 android:text="@string/membersInvite" />
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 c64da7c365..591af450fb 100644
--- a/app/src/main/res/layout/fragment_conversation_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_conversation_bottom_sheet.xml
@@ -70,7 +70,7 @@
     <TextView
         android:id="@+id/muteNotificationsTextView"
         style="@style/BottomSheetActionItem"
-        android:contentDescription="@string/AccessibilityId_mute_notifications"
+        android:contentDescription="@string/AccessibilityId_notificationsMute"
         android:drawableStart="@drawable/ic_outline_notifications_off_24"
         android:text="@string/notificationsMute"
         tools:visibility="visible"
diff --git a/app/src/main/res/layout/fragment_create_group.xml b/app/src/main/res/layout/fragment_create_group.xml
index 927ed1da34..7ad27ad8e6 100644
--- a/app/src/main/res/layout/fragment_create_group.xml
+++ b/app/src/main/res/layout/fragment_create_group.xml
@@ -60,7 +60,7 @@
         android:layout_marginTop="@dimen/medium_spacing"
         android:layout_marginRight="@dimen/large_spacing"
         android:layout_marginBottom="@dimen/medium_spacing"
-        android:contentDescription="@string/AccessibilityId_group_name_input"
+        android:contentDescription="@string/AccessibilityId_groupNameEnter"
         android:hint="@string/groupNameEnter"
         android:imeOptions="actionDone"
         android:inputType="textCapWords"
diff --git a/app/src/main/res/layout/fragment_enter_community_url.xml b/app/src/main/res/layout/fragment_enter_community_url.xml
index 8399af5d4a..47d41493ec 100644
--- a/app/src/main/res/layout/fragment_enter_community_url.xml
+++ b/app/src/main/res/layout/fragment_enter_community_url.xml
@@ -18,7 +18,7 @@
 
     <EditText
         android:id="@+id/communityUrlEditText"
-        android:contentDescription="@string/AccessibilityId_community_input_box"
+        android:contentDescription="@string/AccessibilityId_communityEnterUrl"
         style="@style/SmallSessionEditText"
         android:layout_width="match_parent"
         android:layout_height="64dp"
@@ -92,7 +92,7 @@
     <Button
         android:id="@+id/joinCommunityButton"
         style="@style/Widget.Session.Button.Common.ProminentOutline"
-        android:contentDescription="@string/AccessibilityId_join_community_button"
+        android:contentDescription="@string/AccessibilityId_communityJoin"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginVertical="@dimen/large_spacing"
diff --git a/app/src/main/res/layout/view_control_message.xml b/app/src/main/res/layout/view_control_message.xml
index d75dc63871..ff2652ab38 100644
--- a/app/src/main/res/layout/view_control_message.xml
+++ b/app/src/main/res/layout/view_control_message.xml
@@ -78,7 +78,7 @@
         android:textColor="@color/accent_green"
         android:textSize="@dimen/very_small_font_size"
         android:text="@string/disappearingMessagesFollowSetting"
-        android:contentDescription="@string/AccessibilityId_follow_setting"
+        android:contentDescription="@string/AccessibilityId_disappearingMessagesFollowSetting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 
diff --git a/app/src/main/res/layout/view_input_bar.xml b/app/src/main/res/layout/view_input_bar.xml
index 6bebf45dfd..13f164fd33 100644
--- a/app/src/main/res/layout/view_input_bar.xml
+++ b/app/src/main/res/layout/view_input_bar.xml
@@ -27,7 +27,7 @@
 
         <RelativeLayout
             android:id="@+id/attachmentsButtonContainer"
-            android:contentDescription="@string/AccessibilityId_attachments_button"
+            android:contentDescription="@string/AccessibilityId_attachmentsButton"
             android:layout_width="@dimen/input_bar_button_expanded_size"
             android:layout_height="@dimen/input_bar_button_expanded_size"
             android:layout_alignParentStart="true"
diff --git a/app/src/main/res/layout/view_mention_candidate_v2.xml b/app/src/main/res/layout/view_mention_candidate_v2.xml
index a28c23fa15..1f3ebb908a 100644
--- a/app/src/main/res/layout/view_mention_candidate_v2.xml
+++ b/app/src/main/res/layout/view_mention_candidate_v2.xml
@@ -29,7 +29,7 @@
                 android:src="@drawable/ic_crown"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentBottom="true"
-                android:contentDescription="@string/AccessibilityId_contact_mentions"/>
+                android:contentDescription="@string/AccessibilityId_contactMentions"/>
 
         </RelativeLayout>
 
@@ -42,7 +42,7 @@
             android:textColor="?android:textColorPrimary"
             android:maxLines="1"
             tools:text="Alice"
-            android:contentDescription="@string/AccessibilityId_contact_mentions"
+            android:contentDescription="@string/AccessibilityId_contactMentions"
             android:ellipsize="end" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/view_user.xml b/app/src/main/res/layout/view_user.xml
index 177b3ff6c9..826b3fffc9 100644
--- a/app/src/main/res/layout/view_user.xml
+++ b/app/src/main/res/layout/view_user.xml
@@ -38,7 +38,7 @@
 
         <ImageView
             android:id="@+id/actionIndicatorImageView"
-            android:contentDescription="@string/AccessibilityId_select_contact"
+            android:contentDescription="@string/AccessibilityId_selectContact"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="@dimen/medium_spacing"
diff --git a/app/src/main/res/menu/menu_conversation.xml b/app/src/main/res/menu/menu_conversation.xml
index 0610895544..a48fc90d13 100644
--- a/app/src/main/res/menu/menu_conversation.xml
+++ b/app/src/main/res/menu/menu_conversation.xml
@@ -6,7 +6,7 @@
     <item
         android:title="@string/conversationsSettingsAllMedia"
         android:id="@+id/menu_view_all_media"
-        android:contentDescription="@string/AccessibilityId_all_media"/>
+        android:contentDescription="@string/AccessibilityId_conversationsSettingsAllMedia"/>
 
     <item
         android:title="@string/search"
diff --git a/app/src/main/res/menu/menu_conversation_call.xml b/app/src/main/res/menu/menu_conversation_call.xml
index 173e00cbcd..04f4eec9aa 100644
--- a/app/src/main/res/menu/menu_conversation_call.xml
+++ b/app/src/main/res/menu/menu_conversation_call.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:title="@string/call"
-        android:contentDescription="@string/AccessibilityId_call_button"
+        android:contentDescription="@string/AccessibilityId_call"
         android:icon="@drawable/ic_baseline_call_24"
         app:showAsAction="always"
         android:id="@+id/menu_call"/>
diff --git a/app/src/main/res/menu/menu_conversation_closed_group.xml b/app/src/main/res/menu/menu_conversation_closed_group.xml
index 8b2756f014..fb6bc6da92 100644
--- a/app/src/main/res/menu/menu_conversation_closed_group.xml
+++ b/app/src/main/res/menu/menu_conversation_closed_group.xml
@@ -5,13 +5,13 @@
 
     <item
         android:id="@+id/menu_edit_group"
-        android:contentDescription="@string/AccessibilityId_edit_group"
+        android:contentDescription="@string/AccessibilityId_groupEdit"
         android:title="@string/groupEdit"
         app:showAsAction="collapseActionView" />
 
     <item
         android:id="@+id/menu_leave_group"
-        android:contentDescription="@string/AccessibilityId_leave_group"
+        android:contentDescription="@string/AccessibilityId_groupLeave"
         android:title="@string/groupLeave"
         app:showAsAction="collapseActionView"/>
 
diff --git a/app/src/main/res/menu/menu_conversation_expiration.xml b/app/src/main/res/menu/menu_conversation_expiration.xml
index 4a96db9b42..004f732459 100644
--- a/app/src/main/res/menu/menu_conversation_expiration.xml
+++ b/app/src/main/res/menu/menu_conversation_expiration.xml
@@ -5,6 +5,6 @@
     <item
         android:title="@string/disappearingMessages"
         android:id="@+id/menu_expiring_messages"
-        android:contentDescription="@string/AccessibilityId_disappearing_messages" />
+        android:contentDescription="@string/AccessibilityId_disappearingMessages" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_conversation_notification_settings.xml b/app/src/main/res/menu/menu_conversation_notification_settings.xml
index 8faf3afee2..5fdcd7fac8 100644
--- a/app/src/main/res/menu/menu_conversation_notification_settings.xml
+++ b/app/src/main/res/menu/menu_conversation_notification_settings.xml
@@ -3,5 +3,5 @@
     <item
         android:title="@string/sessionNotifications"
         android:id="@+id/menu_notification_settings"
-        android:contentDescription="@string/AccessibilityId_notification_settings"/>
+        android:contentDescription="@string/AccessibilityId_sessionNotifications"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_conversation_unmuted.xml b/app/src/main/res/menu/menu_conversation_unmuted.xml
index dc0367bc94..dc529f5e1d 100644
--- a/app/src/main/res/menu/menu_conversation_unmuted.xml
+++ b/app/src/main/res/menu/menu_conversation_unmuted.xml
@@ -5,6 +5,6 @@
     <item
         android:title="@string/notificationsMute"
         android:id="@+id/menu_mute_notifications"
-        android:contentDescription="@string/AccessibilityId_mute_notifications" />
+        android:contentDescription="@string/AccessibilityId_notificationsMute" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_edit_closed_group.xml b/app/src/main/res/menu/menu_edit_closed_group.xml
index bcf12aefe2..0bba6a3823 100644
--- a/app/src/main/res/menu/menu_edit_closed_group.xml
+++ b/app/src/main/res/menu/menu_edit_closed_group.xml
@@ -6,7 +6,7 @@
     <item
         android:id="@+id/action_apply"
         android:title="@string/set"
-        android:contentDescription="@string/AccessibilityId_apply_changes"
+        android:contentDescription="@string/AccessibilityId_set"
         app:showAsAction="always|withText" />
 
 </menu>
diff --git a/content-descriptions/src/main/res/values/strings.xml b/content-descriptions/src/main/res/values/strings.xml
index 9be3fdeeac..23ec383ff6 100644
--- a/content-descriptions/src/main/res/values/strings.xml
+++ b/content-descriptions/src/main/res/values/strings.xml
@@ -56,60 +56,54 @@
     <string name="AccessibilityId_groupCreate">Create group</string>
     <string name="AccessibilityId_communityJoin">Join community button</string>
     <string name="AccessibilityId_conversationsNew">New conversation button</string>
-    <string name="AccessibilityId_new_direct_message">New direct message</string>
+    <string name="AccessibilityId_messageNew">New direct message</string>
     <!-- Join community pop up -->
-    <string name="AccessibilityId_community_input_box">Community input</string>
-    <string name="AccessibilityId_join_community_button">Join community button</string>
+    <string name="AccessibilityId_communityEnterUrl">Community input</string>
     <!-- Conversation options (three dots menu)-->
-    <string name="AccessibilityId_add_to_home_screen">Add to home screen</string>
-    <string name="AccessibilityId_all_media">All media</string>
+    <string name="AccessibilityId_conversationsAddToHome">Add to home screen</string>
+    <string name="AccessibilityId_conversationsSettingsAllMedia">All media</string>
     <string name="AccessibilityId_block">Block</string>
-    <string name="AccessibilityId_block_confirm">Confirm block</string>
-    <string name="AccessibilityId_unblock_confirm">Confirm unblock</string>
+    <string name="AccessibilityId_blockConfirm">Confirm block</string>
+    <string name="AccessibilityId_unblockConfirm">Confirm unblock</string>
     <string name="AccessibilityId_delete">Delete</string>
-    <string name="AccessibilityId_disappearing_messages">Disappearing messages</string>
+    <string name="AccessibilityId_disappearingMessages">Disappearing messages</string>
     <string name="AccessibilityId_enable">Enable</string>
-    <string name="AccessibilityId_mute_notifications">Mute notifications</string>
-    <string name="AccessibilityId_notification_settings">Notification settings</string>
+    <string name="AccessibilityId_notificationsMute">Mute notifications</string>
+    <string name="AccessibilityId_sessionNotifications">Notification settings</string>
     <string name="AccessibilityId_search">Search</string>
     <!--  Conversation options for closed group-->
-    <string name="AccessibilityId_accept_name_change">Accept name change</string>
-    <string name="AccessibilityId_add_members">Add members</string>
-    <string name="AccessibilityId_apply_changes">Apply changes</string>
-    <string name="AccessibilityId_cancel_name_change">Cancel name change</string>
-    <string name="AccessibilityId_contact_mentions">Contact mentions</string>
+    <string name="AccessibilityId_groupNameNew">Accept name change</string>
+    <string name="AccessibilityId_membersInvite">Add members</string>
+    <string name="AccessibilityId_set">Apply changes</string>
+    <string name="AccessibilityId_groupNameChangeCancel">Cancel name change</string>
+    <string name="AccessibilityId_contactMentions">Contact mentions</string>
     <string name="AccessibilityId_done">Done</string>
-    <string name="AccessibilityId_edit_group">Edit group</string>
-    <string name="AccessibilityId_group_name">Group name</string>
-    <string name="AccessibilityId_leave_group">Leave group</string>
+    <string name="AccessibilityId_groupEdit">Edit group</string>
+    <string name="AccessibilityId_groupName">Group name</string>
+    <string name="AccessibilityId_groupLeave">Leave group</string>
     <string name="AccessibilityId_mentions_list">Mentions list</string>
     <!--  Conversation icons -->
-    <string name="AccessibilityId_accept_message_request_button">Accept message request</string>
-    <string name="AccessibilityId_block_message_request_button">Block message request</string>
-    <string name="AccessibilityId_call_button">Call button</string>
+    <string name="AccessibilityId_messageRequestsAccept">Accept message request</string>
+    <string name="AccessibilityId_messageRequestsBlock">Block message request</string>
+    <string name="AccessibilityId_call">Call button</string>
     <string name="AccessibilityId_confirm">Confirm</string>
-    <string name="AccessibilityId_decline_message_request_button">Decline message request</string>
-    <string name="AccessibilityId_disappearing_messages_time_picker">Time selector</string>
-    <string name="AccessibilityId_settings">Settings</string>
-    <string name="AccessibilityId_timer_icon">Timer icon</string>
+    <string name="AccessibilityId_decline">Decline message request</string>
+    <string name="AccessibilityId_sessionSettings">Settings</string>
     <!-- Configuration messages -->
-    <string name="AccessibilityId_blocked_banner">Blocked banner</string>
-    <string name="AccessibilityId_blocked_banner_text">Blocked banner text</string>
+    <string name="AccessibilityId_blockedBanner">Blocked banner</string>
+    <string name="AccessibilityId_blockedBannerText">Blocked banner text</string>
     <string name="AccessibilityId_control_message">Control message</string>
-    <string name="AccessibilityId_follow_setting">Follow setting</string>
+    <string name="AccessibilityId_disappearingMessagesFollowSetting">Follow setting</string>
     <!--New Session -->
     <string name="AccessibilityId_next">Next</string>
-    <string name="AccessibilityId_session_id_input">Session id input box</string>
     <!--  New group -->
     <string name="AccessibilityId_contact">Contact</string>
-    <string name="AccessibilityId_continue_group_creation">Continue group creation</string>
-    <string name="AccessibilityId_group_name_input">Group name input</string>
-    <string name="AccessibilityId_select_contact">Select contact</string>
+    <string name="AccessibilityId_groupNameEnter">Group name input</string>
+    <string name="AccessibilityId_selectContact">Select contact</string>
     <!--Conversation screen -->
-    <string name="AccessibilityId_attachments_button">Attachments button</string>
-    <string name="AccessibilityId_documents_folder">Documents folder</string>
-    <string name="AccessibilityId_dont_download_media">Don\'t download media</string>
-    <string name="AccessibilityId_download_media">Download media</string>
+    <string name="AccessibilityId_attachmentsButton">Attachments button</string>
+    <string name="AccessibilityId_files">Documents folder</string>
+    <string name="AccessibilityId_download">Download media</string>
     <string name="AccessibilityId_gif_button">GIF button</string>
     <string name="AccessibilityId_images_folder">Images folder</string>
     <string name="AccessibilityId_message_input">Message input box</string>
diff --git a/libsession/src/main/res/values-fr-rFR/strings.xml b/libsession/src/main/res/values-fr-rFR/strings.xml
index 5401367554..30d0ee1528 100644
--- a/libsession/src/main/res/values-fr-rFR/strings.xml
+++ b/libsession/src/main/res/values-fr-rFR/strings.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- ACL REMOVE THE LINE BELOW - JUST A TEST! -->
+    <string name="sessionMessenger" translatable="false">Le Session</string>
+
     <!-- MessageRecord -->
     <string name="you">Vous</string>
 
diff --git a/libsession/src/main/res/values-fr/strings.xml b/libsession/src/main/res/values-fr/strings.xml
index b914ca09b8..d231fecde1 100644
--- a/libsession/src/main/res/values-fr/strings.xml
+++ b/libsession/src/main/res/values-fr/strings.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+    <!-- ACL REMOVE THE LINE BELOW - JUST A TEST! -->
+    <string name="sessionMessenger" translatable="false">Le Session</string>
+
+
     <!-- MessageRecord -->
     <string name="you">Vous</string>
 
diff --git a/libsession/src/main/res/values/strings.xml b/libsession/src/main/res/values/strings.xml
index 07f727784e..b4b74ba643 100644
--- a/libsession/src/main/res/values/strings.xml
+++ b/libsession/src/main/res/values/strings.xml
@@ -687,7 +687,7 @@
     <string name="sessionHelp">Help</string>
     <string name="sessionInviteAFriend">Invite a Friend</string>
     <string name="sessionMessageRequests">Message Requests</string>
-    <string name="sessionMessenger">Session</string>
+    <string name="sessionMessenger" translatable="false">Session</string>
     <string name="sessionNotifications">Notifications</string>
     <string name="sessionPermissions">Permissions</string>
     <string name="sessionPrivacy">Privacy</string>