diff --git a/lib/Command/Group.php b/lib/Command/Group.php
index 6951fb30a..1f0356bc1 100644
--- a/lib/Command/Group.php
+++ b/lib/Command/Group.php
@@ -83,7 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			$output->writeln('<error>Unable to parse permissions input: ' . implode(' ', $permissionsString) . '</error>');
 			return -1;
 		}
-		$output->writeln('<error>group/circle not found: ' . $groupString . '</error>');
+		$output->writeln('<error>group/team not found: ' . $groupString . '</error>');
 		return -1;
 	}
 
diff --git a/src/settings/App.tsx b/src/settings/App.tsx
index 6d5659bf2..a4942d21f 100644
--- a/src/settings/App.tsx
+++ b/src/settings/App.tsx
@@ -208,7 +208,7 @@ export class App extends Component<{}, AppState> implements OC.Plugin<OC.Search.
 	render() {
 		const isCirclesEnabled = loadState('groupfolders', 'isCirclesEnabled', false)
 		const groupHeader = isCirclesEnabled
-			? t('groupfolders', 'Group or circle')
+			? t('groupfolders', 'Group or team')
 			: t('groupfolders', 'Group')
 
 		const rows = this.state.folders
diff --git a/src/settings/FolderGroups.tsx b/src/settings/FolderGroups.tsx
index b2da8e6fd..370a9e39c 100644
--- a/src/settings/FolderGroups.tsx
+++ b/src/settings/FolderGroups.tsx
@@ -24,7 +24,7 @@ export interface FolderGroupsProps {
 export function FolderGroups({groups, allGroups = [], allCircles = [], onAddGroup, removeGroup, edit, showEdit, onSetPermissions}: FolderGroupsProps) {
 	const isCirclesEnabled = loadState('groupfolders', 'isCirclesEnabled', false)
 	const groupHeader = isCirclesEnabled
-		? t('groupfolders', 'Group or circle')
+		? t('groupfolders', 'Group or team')
 		: t('groupfolders', 'Group')
 
 	// Format the selected groups with the displayName
@@ -114,7 +114,7 @@ interface CircleGroupSelectProps {
 function AdminGroupSelect({allGroups, allCircles, onChange}: CircleGroupSelectProps) {
 	const isCirclesEnabled = loadState('groupfolders', 'isCirclesEnabled', false)
 	const emptyGroups = isCirclesEnabled
-		? t('groupfolders', 'No other groups or circles available')
+		? t('groupfolders', 'No other groups or teams available')
 		: t('groupfolders', 'No other groups available')
 
 	if (allGroups.length === 0 && allCircles.length === 0) {
@@ -131,13 +131,13 @@ function AdminGroupSelect({allGroups, allCircles, onChange}: CircleGroupSelectPr
 	const circles = allCircles.map(circle => {
 		return {
 			value: circle.singleId,
-			label: t('groupfolders', '{displayName} (circle)', {...circle})
+			label: t('groupfolders', '{displayName} (team)', {...circle})
 		};
 	});
 	const options = [...groups, ...circles]
 
 	const placeholder = isCirclesEnabled
-		? t('groupfolders', 'Add group or circle')
+		? t('groupfolders', 'Add group or team')
 		: t('groupfolders', 'Add group')
 
 	/* @ts-expect-error Typescript error due to async react component */