diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
index 8dcf9ab6ce..eea5705b7a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
@@ -35,11 +35,6 @@ class TestPushRulesSettings @Inject constructor(private val activeSessionHolder:
                     RuleIds.RULE_ID_ONE_TO_ONE_ROOM,
                     RuleIds.RULE_ID_ALL_OTHER_MESSAGES_ROOMS)
 
-    val ruleSettingsName = arrayOf(R.string.settings_containing_my_display_name,
-            R.string.settings_containing_my_user_name,
-            R.string.settings_messages_in_one_to_one,
-            R.string.settings_messages_in_group_chat)
-
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
         val pushRules = session.getPushRules().getAllRules()
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 154d5619b4..a80ed06186 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1190,13 +1190,17 @@
     <string name="settings_system_preferences_summary">Choose LED color, vibration, sound…</string>
 
 
-    <string name="settings_containing_my_display_name">Msgs containing my display name</string>
-    <string name="settings_containing_my_user_name">Msgs containing my user name</string>
-    <string name="settings_messages_in_one_to_one">Msgs in one-to-one chats</string>
-    <string name="settings_messages_in_group_chat">Msgs in group chats</string>
-    <string name="settings_invited_to_room">When I’m invited to a room</string>
+    <string name="settings_messages_containing_display_name">Messages containing my display name</string>
+    <string name="settings_messages_containing_username">Messages containing my username</string>
+    <string name="settings_messages_direct_messages">Direct messages</string>
+    <string name="settings_encrypted_direct_messages">Encrypted direct messages</string>
+    <string name="settings_group_messages">Group messages</string>
+    <string name="settings_encrypted_group_messages">Encrypted group messages</string>
+    <string name="settings_messages_at_room">Messages containing @room</string>
+    <string name="settings_room_invitations">Room invitations</string>
     <string name="settings_call_invitations">Call invitations</string>
-    <string name="settings_messages_sent_by_bot">Messages sent by bot</string>
+    <string name="settings_messages_by_bot">Messages by bot</string>
+    <string name="settings_room_upgrades">Room upgrades</string>
 
     <string name="settings_background_sync">Background synchronization</string>
     <string name="settings_background_fdroid_sync_mode">Background Sync Mode</string>
@@ -2948,10 +2952,6 @@
     <string name="error_failed_to_import_keys">Failed to import keys</string>
 
     <string name="settings_notification_configuration">Notifications configuration</string>
-    <string name="settings_messages_at_room">Messages containing @room</string>
-    <string name="settings_messages_in_e2e_one_to_one">Encrypted messages in one-to-one chats</string>
-    <string name="settings_messages_in_e2e_group_chat">Encrypted messages in group chats</string>
-    <string name="settings_when_rooms_are_upgraded">When rooms are upgraded</string>
     <string name="settings_troubleshoot_title">Troubleshoot</string>
     <string name="settings_notification_advanced_summary">Set notification importance by event</string>
 
diff --git a/vector/src/main/res/xml/vector_settings_notification_global.xml b/vector/src/main/res/xml/vector_settings_notification_global.xml
index 787419bd55..70defb32c4 100644
--- a/vector/src/main/res/xml/vector_settings_notification_global.xml
+++ b/vector/src/main/res/xml/vector_settings_notification_global.xml
@@ -7,22 +7,22 @@
         <im.vector.app.core.preference.VectorCheckboxPreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_IN_ONE_TO_ONE_PREFERENCE_KEY"
             android:persistent="false"
-            android:title="@string/settings_messages_in_one_to_one" />
+            android:title="@string/settings_messages_direct_messages" />
 
         <im.vector.app.core.preference.VectorCheckboxPreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_ONE_ONE_CHAT_PREFERENCE_KEY"
             android:persistent="false"
-            android:title="@string/settings_messages_in_e2e_one_to_one" />
+            android:title="@string/settings_encrypted_direct_messages" />
 
         <im.vector.app.core.preference.VectorCheckboxPreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_IN_GROUP_CHAT_PREFERENCE_KEY"
             android:persistent="false"
-            android:title="@string/settings_messages_in_group_chat" />
+            android:title="@string/settings_group_messages" />
 
         <im.vector.app.core.preference.VectorCheckboxPreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_GROUP_CHAT_PREFERENCE_KEY"
             android:persistent="false"
-            android:title="@string/settings_messages_in_e2e_group_chat" />
+            android:title="@string/settings_encrypted_group_messages" />
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml b/vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml
index c84bf53faa..18de36cb52 100644
--- a/vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml
+++ b/vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml
@@ -7,12 +7,12 @@
         <im.vector.app.core.preference.VectorCheckboxPreference
             android:key="SETTINGS_PUSH_RULE_CONTAINING_MY_DISPLAY_NAME_PREFERENCE_KEY"
             android:persistent="false"
-            android:title="@string/settings_containing_my_display_name" />
+            android:title="@string/settings_messages_containing_display_name" />
 
         <im.vector.app.core.preference.VectorCheckboxPreference
             android:key="SETTINGS_PUSH_RULE_CONTAINING_MY_USER_NAME_PREFERENCE_KEY"
             android:persistent="false"
-            android:title="@string/settings_containing_my_user_name" />
+            android:title="@string/settings_messages_containing_username" />
 
         <im.vector.app.core.preference.VectorCheckboxPreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_CONTAINING_AT_ROOM_PREFERENCE_KEY"
diff --git a/vector/src/main/res/xml/vector_settings_notification_other.xml b/vector/src/main/res/xml/vector_settings_notification_other.xml
index e1119e7c16..ad2b5194f0 100644
--- a/vector/src/main/res/xml/vector_settings_notification_other.xml
+++ b/vector/src/main/res/xml/vector_settings_notification_other.xml
@@ -7,7 +7,7 @@
         <im.vector.app.core.preference.VectorCheckboxPreference
             android:key="SETTINGS_PUSH_RULE_INVITED_TO_ROOM_PREFERENCE_KEY"
             android:persistent="false"
-            android:title="@string/settings_invited_to_room" />
+            android:title="@string/settings_room_invitations" />
 
         <im.vector.app.core.preference.VectorCheckboxPreference
             android:key="SETTINGS_PUSH_RULE_CALL_INVITATIONS_PREFERENCE_KEY"
@@ -17,11 +17,11 @@
         <im.vector.app.core.preference.VectorCheckboxPreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_SENT_BY_BOT_PREFERENCE_KEY"
             android:persistent="false"
-            android:title="@string/settings_messages_sent_by_bot" />
+            android:title="@string/settings_messages_by_bot" />
 
         <im.vector.app.core.preference.VectorCheckboxPreference
             android:key="SETTINGS_PUSH_RULE_ROOMS_UPGRADED_KEY"
             android:persistent="false"
-            android:title="@string/settings_when_rooms_are_upgraded" />
+            android:title="@string/settings_room_upgrades" />
     </im.vector.app.core.preference.VectorPreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file