diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml
index 4ae4d28a58b90..1347b4e8668a4 100644
--- a/src/gui/tray/TrayFoldersMenuButton.qml
+++ b/src/gui/tray/TrayFoldersMenuButton.qml
@@ -55,7 +55,7 @@ HeaderButton {
         id: tooltip
         popupType: Qt.platform.os === "windows" ? Popup.Item : Popup.Native
         visible: root.hovered && !foldersMenuLoader.isMenuVisible
-        text: root.userHasGroupFolders ? qsTr("Open local or group folders") : qsTr("Open local folder")
+        text: root.userHasGroupFolders ? qsTr("Open local or team folders") : qsTr("Open local folder")
     }
 
 
@@ -169,7 +169,7 @@ HeaderButton {
                         property bool isGroupFolder: model.modelData.isGroupFolder
 
                         text: model.modelData.name
-                        toolTipText: !isGroupFolder ? qsTr("Open local folder \"%1\"").arg(model.modelData.fullPath) : qsTr("Open group folder \"%1\"").arg(model.modelData.fullPath)
+                        toolTipText: !isGroupFolder ? qsTr("Open local folder \"%1\"").arg(model.modelData.fullPath) : qsTr("Open team folder \"%1\"").arg(model.modelData.fullPath)
                         subline: model.modelData.parentPath
                         width: foldersMenuListView.width
                         height: Style.standardPrimaryButtonHeight
diff --git a/src/gui/tray/TrayWindowHeader.qml b/src/gui/tray/TrayWindowHeader.qml
index bcc1260f648de..f095063e1e8ab 100644
--- a/src/gui/tray/TrayWindowHeader.qml
+++ b/src/gui/tray/TrayWindowHeader.qml
@@ -63,7 +63,7 @@ Rectangle {
             onFolderEntryTriggered: isGroupFolder ? UserModel.openCurrentAccountFolderFromTrayInfo(fullFolderPath) : UserModel.openCurrentAccountLocalFolder()
 
             Accessible.role: Accessible.Graphic
-            Accessible.name: qsTr("Open local or group folders")
+            Accessible.name: qsTr("Open local or team folders")
             Accessible.onPressAction: openLocalFolderButton.userHasGroupFolders ? openLocalFolderButton.toggleMenuOpen() : UserModel.openCurrentAccountLocalFolder() 
         }
 
diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
index f7a26ac88d455..87ad26a850cab 100644
--- a/src/gui/tray/usermodel.cpp
+++ b/src/gui/tray/usermodel.cpp
@@ -1241,7 +1241,7 @@ void User::slotGroupFoldersFetched(QNetworkReply *reply)
 {
     Q_ASSERT(reply);
     if (!reply) {
-        qCWarning(lcActivity) << "Group folders fetch error";
+        qCWarning(lcActivity) << "Team folders fetch error";
         return;
     }
 
@@ -1254,7 +1254,7 @@ void User::slotGroupFoldersFetched(QNetworkReply *reply)
         if (oldSize != _trayFolderInfos.size()) {
             emit groupFoldersChanged();
         }
-        qCWarning(lcActivity) << "Group folders fetch error" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() << replyData;
+        qCWarning(lcActivity) << "Team folders fetch error" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() << replyData;
         return;
     }
 
@@ -1262,7 +1262,7 @@ void User::slotGroupFoldersFetched(QNetworkReply *reply)
     const auto json = QJsonDocument::fromJson(replyData, &jsonParseError);
 
     if (jsonParseError.error != QJsonParseError::NoError) {
-        qCWarning(lcActivity) << "Group folders JSON parse error" << jsonParseError.error << jsonParseError.errorString();
+        qCWarning(lcActivity) << "Team folders JSON parse error" << jsonParseError.error << jsonParseError.errorString();
         if (oldSize != _trayFolderInfos.size()) {
             emit groupFoldersChanged();
         }