diff --git a/src/app/currentconversation.cpp b/src/app/currentconversation.cpp
index 44d7ddeaf34a64aa34c2b4fc78dce4974e6d7faf..fa46c0004ccbb222cea59ac4e8d3ae89dff0d3e0 100644
--- a/src/app/currentconversation.cpp
+++ b/src/app/currentconversation.cpp
@@ -152,7 +152,7 @@ CurrentConversation::updateData()
         updateProfile(convId);
         updateActiveCalls(accountId, convId);
     } catch (...) {
-        qWarning() << "Can't update current conversation data for" << convId;
+        qWarning() << "An error occurred while updating current conversation data for" << convId;
     }
 }
 
diff --git a/src/app/mainview/components/NewSwarmPage.qml b/src/app/mainview/components/NewSwarmPage.qml
index b676099dc950c555c67a0249c9b0bfc0dde93e99..6bdfe0356f59ac5eed500390ec8c0ccbb74c01a4 100644
--- a/src/app/mainview/components/NewSwarmPage.qml
+++ b/src/app/mainview/components/NewSwarmPage.qml
@@ -150,7 +150,7 @@ DualPaneView {
                 Layout.preferredWidth: JamiTheme.preferredFieldWidth
 
                 staticText: ""
-                placeholderText: JamiStrings.swarmName
+                placeholderText: JamiStrings.groupName
 
                 textColor: {
                     if (UtilsAdapter.luma(root.color)) {
@@ -205,7 +205,7 @@ DualPaneView {
                 preferredWidth: textSize.width + 2 * JamiTheme.buttontextWizzardPadding
 
                 primary: true
-                text: JamiStrings.createSwarm
+                text: JamiStrings.newGroup
 
                 onClicked: createSwarmClicked(title.dynamicText, description.dynamicText, UtilsAdapter.tempCreationImage())
             }
diff --git a/src/app/mainview/components/SidePanel.qml b/src/app/mainview/components/SidePanel.qml
index 94f17e4a93f7b42e092502c626d64d0adde35599..c564e847afea54d39c7f5d21ec4e07e89423f792 100644
--- a/src/app/mainview/components/SidePanel.qml
+++ b/src/app/mainview/components/SidePanel.qml
@@ -214,7 +214,7 @@ SidePanelBase {
                     font.bold: true
                     font.pointSize: JamiTheme.contactEventPointSize
 
-                    text: JamiStrings.createSwarm
+                    text: JamiStrings.newGroup
                 }
 
                 PushButton {
@@ -288,7 +288,7 @@ SidePanelBase {
                     visible: !swarmMemberSearchList.visible && CurrentAccount.type !== Profile.Type.SIP
 
                     source: smartListLayout.visible ? JamiResources.create_swarm_svg : JamiResources.round_close_24dp_svg
-                    toolTipText: smartListLayout.visible ? JamiStrings.startSwarm : JamiStrings.cancel
+                    toolTipText: smartListLayout.visible ? JamiStrings.newGroup : JamiStrings.cancel
 
                     onClicked: toggleCreateSwarmView()
                 }
diff --git a/src/app/mainview/components/SwarmDetailsPanel.qml b/src/app/mainview/components/SwarmDetailsPanel.qml
index 57af0192ad3fd942a9519dfeb367a3dd0269a0dc..fb3553bade8fdebd3d1acb3842c61ab95ce34c88 100644
--- a/src/app/mainview/components/SwarmDetailsPanel.qml
+++ b/src/app/mainview/components/SwarmDetailsPanel.qml
@@ -115,7 +115,7 @@ Rectangle {
                             titleLine.editMode = activeFocus;
                         }
 
-                        infoTipLineText: CurrentConversation.isCoreDialog ? JamiStrings.contactName : JamiStrings.swarmName
+                        infoTipLineText: CurrentConversation.isCoreDialog ? JamiStrings.contactName : JamiStrings.groupName
                     }
 
                     ModalTextEdit {
diff --git a/src/app/net/jami/Constants/JamiStrings.qml b/src/app/net/jami/Constants/JamiStrings.qml
index 19befd42f481a1559563561bc450e90a01af8869..c8c5a1bd567fd13532634c58eef64f6ebe326f06 100644
--- a/src/app/net/jami/Constants/JamiStrings.qml
+++ b/src/app/net/jami/Constants/JamiStrings.qml
@@ -33,7 +33,7 @@ Item {
     property string endCall: qsTr("End call")
     property string incomingAudioCallFrom: qsTr("Incoming audio call from {}")
     property string incomingVideoCallFrom: qsTr("Incoming video call from {}")
-    property string startSwarm: qsTr("Start swarm")
+    property string newGroup: qsTr("Create new group")
     property string invitations: qsTr("Invitations")
     property string description: qsTr("Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.")
     property string updateToSwarm: qsTr("Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.")
@@ -536,8 +536,8 @@ Item {
     property string troubleshootButton: qsTr("Open logs")
     property string troubleshootText: qsTr("Get logs")
 
-    property string experimentalCallSwarm: qsTr("(Experimental) Enable call support for swarm")
-    property string experimentalCallSwarmTooltip: qsTr("This feature will enable call buttons in swarms with multiple participants.")
+    property string experimentalCallSwarm: qsTr("(Experimental) Enable call support for groups")
+    property string experimentalCallSwarmTooltip: qsTr("This feature will enable the audio and video call buttons in group conversations.")
 
     // Recording Settings
     property string quality: qsTr("Quality")
@@ -780,8 +780,8 @@ Item {
     property string joinWithVideo: qsTr("Join with video")
     property string startedACall: qsTr("Started a call")
     property string wantToJoin: qsTr("A call is in progress. Do you want to join the call?")
-    property string needsHost: qsTr("Current host for this swarm seems unreachable. Do you want to host the call?")
-    property string selectHost: qsTr("Select dedicated device for hosting future calls in this swarm. If not set, the host will be the device starting a call.")
+    property string needsHost: qsTr("Current host for this group conversation seems unreachable. Do you want to host the call?")
+    property string selectHost: qsTr("Select dedicated device for hosting future calls in this group conversation. If not set, the host will be the device starting a call.")
     property string selectThisDevice: qsTr("Select this device")
     property string selectDevice: qsTr("Select device")
     property string removeCurrentDevice: qsTr("Remove current device")
@@ -797,10 +797,10 @@ Item {
     property string invitationViewAcceptedConversation: qsTr("You have accepted\nthe conversation invitation.")
     property string invitationViewWaitingForSync: qsTr("Waiting until %1\nconnects to synchronize the conversation.")
 
-    // SwarmDetailsPanel
+    // SwarmDetailsPanel (group conversation panel)
     property string members: qsTr("%1 Members")
     property string member: qsTr("Member")
-    property string swarmName: qsTr("Swarm name")
+    property string groupName: qsTr("Group name")
     property string contactName: qsTr("Contact name")
     property string addDescription: qsTr("Add description")
 
@@ -812,8 +812,7 @@ Item {
     property string typeOfSwarm: qsTr("Type")
     property string none: qsTr("None")
 
-    // NewSwarmPage
-    property string createSwarm: qsTr("Create swarm")
+    // NewSwarmPage (new group conversation page)
     property string goToConversation: qsTr("Go to conversation")
     property string kickMember: qsTr("Kick member")
     property string reinstateMember: qsTr("Reinstate member")