diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
index 9bd5cdd2e..667d21873 100644
--- a/assets/l10n/intl_en.arb
+++ b/assets/l10n/intl_en.arb
@@ -3903,7 +3903,7 @@
   "define": "Define",
   "listen": "Listen",
   "addConversationBot": "Enable Conversation Bot",
-  "addConversationBotDesc": "Add a bot to this group chat",
+  "addConversationBotDesc": "Add a bot to this chat",
   "convoBotSettingsTitle": "Conversation Bot Settings",
   "convoBotSettingsDescription": "Edit conversation topic and difficulty",
   "enterAConversationTopic": "Enter a conversation topic",
@@ -4195,5 +4195,9 @@
   "discoverHomeservers": "Discover homeservers",
   "whatIsAHomeserver": "What is a homeserver?",
   "homeserverDescription": "All your data is stored on the homeserver, just like an email provider. You can choose which homeserver you want to use, while you can still communicate with everyone. Learn more at at https://matrix.org.",
-  "doesNotSeemToBeAValidHomeserver": "Doesn't seem to be a compatible homeserver. Wrong URL?"
+  "doesNotSeemToBeAValidHomeserver": "Doesn't seem to be a compatible homeserver. Wrong URL?",
+  "grammar": "Grammar",
+  "contactHasBeenInvitedToTheChat": "Contact has been invited to the chat",
+  "inviteChat": "📨 Invite chat",
+  "chatName": "Chat name"
 }
\ No newline at end of file
diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 065f9c9e8..5a84541d8 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -138,8 +138,11 @@ class ChatListController extends State<ChatList>
       final inviteAction = await showModalActionSheet<InviteActions>(
         context: context,
         message: room.isDirectChat
+            // #Pangea
             ? L10n.of(context)!.invitePrivateChat
-            : L10n.of(context)!.inviteGroupChat,
+            // : L10n.of(context)!.inviteGroupChat,
+            : L10n.of(context)!.inviteChat,
+        // Pangea#
         title: room.getLocalizedDisplayname(MatrixLocals(L10n.of(context)!)),
         actions: [
           SheetAction(
diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart
index 5cae0c824..9cbe6af82 100644
--- a/lib/pages/chat_list/chat_list_item.dart
+++ b/lib/pages/chat_list/chat_list_item.dart
@@ -328,7 +328,10 @@ class ChatListItem extends StatelessWidget {
                                   room.membership == Membership.invite
                                       ? isDirectChat
                                           ? L10n.of(context)!.invitePrivateChat
-                                          : L10n.of(context)!.inviteGroupChat
+                                          // #Pangea
+                                          // : L10n.of(context)!.inviteGroupChat
+                                          : L10n.of(context)!.inviteChat
+                                      // Pangea#
                                       : snapshot.data ??
                                           L10n.of(context)!.emptyChat,
                                   softWrap: false,
diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart
index 79dce997f..589c0341c 100644
--- a/lib/pages/chat_list/space_view.dart
+++ b/lib/pages/chat_list/space_view.dart
@@ -319,7 +319,10 @@ class _SpaceViewState extends State<SpaceView> {
         ),
         AlertDialogAction(
           key: AddRoomType.chat,
-          label: L10n.of(context)!.createGroup,
+          // #Pangea
+          // label: L10n.of(context)!.createGroup,
+          label: L10n.of(context)!.createChat,
+          // Pangea#
         ),
       ],
     );
@@ -329,12 +332,18 @@ class _SpaceViewState extends State<SpaceView> {
       context: context,
       title: roomType == AddRoomType.subspace
           ? L10n.of(context)!.createNewSpace
-          : L10n.of(context)!.createGroup,
+          // #Pangea
+          // : L10n.of(context)!.createGroup,
+          : L10n.of(context)!.createChat,
+      // Pangea#
       textFields: [
         DialogTextField(
           hintText: roomType == AddRoomType.subspace
               ? L10n.of(context)!.spaceName
-              : L10n.of(context)!.groupName,
+              // #Pangea
+              // : L10n.of(context)!.groupName,
+              : L10n.of(context)!.chatName,
+          // Pangea#
           minLines: 1,
           maxLines: 1,
           maxLength: 64,
diff --git a/lib/pages/invitation_selection/invitation_selection.dart b/lib/pages/invitation_selection/invitation_selection.dart
index e59e03819..761f43271 100644
--- a/lib/pages/invitation_selection/invitation_selection.dart
+++ b/lib/pages/invitation_selection/invitation_selection.dart
@@ -182,7 +182,10 @@ class InvitationSelectionController extends State<InvitationSelection> {
     if (success.error == null) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-          content: Text(L10n.of(context)!.contactHasBeenInvitedToTheGroup),
+          // #Pangea
+          // content: Text(L10n.of(context)!.contactHasBeenInvitedToTheGroup),
+          content: Text(L10n.of(context)!.contactHasBeenInvitedToTheChat),
+          // Pangea#
         ),
       );
     }
diff --git a/lib/pages/new_group/new_group_view.dart b/lib/pages/new_group/new_group_view.dart
index 52ca198f0..6dfcec212 100644
--- a/lib/pages/new_group/new_group_view.dart
+++ b/lib/pages/new_group/new_group_view.dart
@@ -27,7 +27,10 @@ class NewGroupView extends StatelessWidget {
             onPressed: controller.loading ? null : Navigator.of(context).pop,
           ),
         ),
-        title: Text(L10n.of(context)!.createGroup),
+        // #Pangea
+        // title: Text(L10n.of(context)!.createGroup),
+        title: Text(L10n.of(context)!.createChat),
+        // Pangea#
       ),
       // #Pangea
       floatingActionButton: FloatingActionButton.extended(
@@ -74,7 +77,10 @@ class NewGroupView extends StatelessWidget {
                 readOnly: controller.loading,
                 decoration: InputDecoration(
                   prefixIcon: const Icon(Icons.people_outlined),
-                  labelText: L10n.of(context)!.groupName,
+                  // #Pangea
+                  // labelText: L10n.of(context)!.groupName,
+                  labelText: L10n.of(context)!.chatName,
+                  // Pangea#
                 ),
               ),
             ),
diff --git a/lib/pages/new_private_chat/new_private_chat_view.dart b/lib/pages/new_private_chat/new_private_chat_view.dart
index 0a7c3de4f..024e52bc7 100644
--- a/lib/pages/new_private_chat/new_private_chat_view.dart
+++ b/lib/pages/new_private_chat/new_private_chat_view.dart
@@ -140,7 +140,10 @@ class NewPrivateChatView extends StatelessWidget {
                         foregroundColor: theme.colorScheme.onTertiaryContainer,
                         child: const Icon(Icons.group_add_outlined),
                       ),
-                      title: Text(L10n.of(context)!.createGroup),
+                      // #Pangea
+                      // title: Text(L10n.of(context)!.createGroup),
+                      title: Text(L10n.of(context)!.createChat),
+                      // Pangea#
                       onTap: () => context.go('/rooms/newgroup'),
                     ),
                     if (PlatformInfos.isMobile)
diff --git a/lib/pangea/pages/class_invitation_selection/class_invitation_selection.dart b/lib/pangea/pages/class_invitation_selection/class_invitation_selection.dart
index 0164f7b84..8289d357f 100644
--- a/lib/pangea/pages/class_invitation_selection/class_invitation_selection.dart
+++ b/lib/pangea/pages/class_invitation_selection/class_invitation_selection.dart
@@ -53,7 +53,10 @@ class ClassInvitationSelectionController
     if (success.error == null) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-          content: Text(L10n.of(context)!.contactHasBeenInvitedToTheGroup),
+          // #Pangea
+          // content: Text(L10n.of(context)!.contactHasBeenInvitedToTheGroup),
+          content: Text(L10n.of(context)!.contactHasBeenInvitedToTheChat),
+          // Pangea#
         ),
       );
     }