diff --git a/src/app/component/activity-description/activity-description.component.html b/src/app/component/activity-description/activity-description.component.html
index 28fcc4228..d141e8336 100644
--- a/src/app/component/activity-description/activity-description.component.html
+++ b/src/app/component/activity-description/activity-description.component.html
@@ -288,7 +288,7 @@ <h3><b>Usefulness</b></h3>
     <!-- <mat-expansion-panel>
       <mat-expansion-panel-header>
         <mat-panel-title>
-          <b>Teams Evidence</b>
+          <b>{{ settings.getTeamLabelPlural() }} Evidence</b>
         </mat-panel-title>
       </mat-expansion-panel-header>
       <mat-accordion multi="true">
@@ -349,7 +349,10 @@ <h4 class="tool-name" [innerHTML]="implement['name']"></h4>
               </span>
             </span>
             <span class="ref-section" *ngIf="teamsImplemented.size === 0">
-              <span class="ref-values">No teams have started this activity yet</span>
+              <span class="ref-values"
+                >No {{ settings.getTeamLabelPlural() | lowercase }} have started this activity
+                yet</span
+              >
             </span>
           </div>
         </mat-panel-title>
@@ -367,7 +370,10 @@ <h4 class="tool-name" [innerHTML]="implement['name']"></h4>
         </div>
       </div>
       <ng-template #noTeamsBlock>
-        <p>No teams have started implementing this activity yet.</p>
+        <p>
+          No {{ settings.getTeamLabelPlural() | lowercase }} have started implementing this activity
+          yet.
+        </p>
       </ng-template>
     </mat-expansion-panel>
   </mat-accordion>
diff --git a/src/app/component/activity-description/activity-description.component.ts b/src/app/component/activity-description/activity-description.component.ts
index 2a583a7b7..77a1aa9bc 100644
--- a/src/app/component/activity-description/activity-description.component.ts
+++ b/src/app/component/activity-description/activity-description.component.ts
@@ -14,6 +14,7 @@ import { MatAccordion } from '@angular/material/expansion';
 import { Activity } from '../../model/activity-store';
 import { LoaderService } from '../../service/loader/data-loader.service';
 import { TeamName, ProgressTitle } from '../../model/types';
+import { SettingsService } from 'src/app/service/settings/settings.service';
 
 @Component({
   selector: 'app-activity-description',
@@ -43,7 +44,7 @@ export class ActivityDescriptionComponent implements OnInit, OnChanges {
 
   @ViewChildren(MatAccordion) accordion!: QueryList<MatAccordion>;
 
-  constructor(private loader: LoaderService) {}
+  constructor(private loader: LoaderService, public settings: SettingsService) {}
 
   ngOnInit() {
     // Set activity data if provided
diff --git a/src/app/component/report-config-modal/report-config-modal.component.html b/src/app/component/report-config-modal/report-config-modal.component.html
index e2fc14c36..0890ca49d 100644
--- a/src/app/component/report-config-modal/report-config-modal.component.html
+++ b/src/app/component/report-config-modal/report-config-modal.component.html
@@ -12,7 +12,7 @@ <h3>Display Configuration</h3>
         [value]="config.columnGrouping"
         (change)="setColumnGrouping($event.value)">
         <mat-button-toggle value="byProgress">By Progress Stage</mat-button-toggle>
-        <mat-button-toggle value="byTeam">By Team</mat-button-toggle>
+        <mat-button-toggle value="byTeam">By {{ settings.getTeamLabel() }}</mat-button-toggle>
       </mat-button-toggle-group>
     </div>
   </div>
diff --git a/src/app/component/report-config-modal/report-config-modal.component.ts b/src/app/component/report-config-modal/report-config-modal.component.ts
index 43a85f308..fa63d11d3 100644
--- a/src/app/component/report-config-modal/report-config-modal.component.ts
+++ b/src/app/component/report-config-modal/report-config-modal.component.ts
@@ -8,6 +8,7 @@ import {
 } from '../../model/report-config';
 import { Activity } from '../../model/activity-store';
 import { ProgressTitle, TeamGroups } from '../../model/types';
+import { SettingsService } from 'src/app/service/settings/settings.service';
 
 export interface ReportConfigModalData {
   config: ReportConfig;
@@ -37,7 +38,8 @@ export class ReportConfigModalComponent {
 
   constructor(
     public dialogRef: MatDialogRef<ReportConfigModalComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: ReportConfigModalData
+    @Inject(MAT_DIALOG_DATA) public data: ReportConfigModalData,
+    public settings: SettingsService
   ) {
     // Deep copy config to avoid mutating the original until save
     this.config = JSON.parse(JSON.stringify(data.config));
diff --git a/src/app/component/team-selector/team-selector.component.html b/src/app/component/team-selector/team-selector.component.html
index be96913b7..39efbae48 100644
--- a/src/app/component/team-selector/team-selector.component.html
+++ b/src/app/component/team-selector/team-selector.component.html
@@ -1,14 +1,16 @@
 <div class="config-section">
-  <h3>Teams</h3>
-  <p class="config-hint">Select which teams to include in the report.</p>
+  <h3>{{ settings.getTeamLabelPlural() }}</h3>
+  <p class="config-hint">
+    Select which {{ settings.getTeamLabelPlural() | lowercase }} to include in the report.
+  </p>
   <div class="select-all-actions">
     <button mat-button color="primary" (click)="selectAllTeams()">Select All</button>
     <button mat-button (click)="deselectAllTeams()">Deselect All</button>
     <span *ngIf="groupNames.length > 0" class="group-section">
-      <span class="group-label">Group:</span>
+      <span class="group-label">{{ settings.getGroupLabel() }}:</span>
       <button mat-stroked-button [matMenuTriggerFor]="groupMenu" class="group-dropdown-btn">
         <mat-icon>group</mat-icon>
-        {{ selectedGroupName || 'Select Group' }}
+        {{ selectedGroupName || 'Select ' + settings.getGroupLabel() }}
         <mat-icon>arrow_drop_down</mat-icon>
       </button>
     </span>
diff --git a/src/app/component/team-selector/team-selector.component.ts b/src/app/component/team-selector/team-selector.component.ts
index 52eef4a32..951ea00d3 100644
--- a/src/app/component/team-selector/team-selector.component.ts
+++ b/src/app/component/team-selector/team-selector.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, Output, EventEmitter } from '@angular/core';
 import { TeamGroups } from '../../model/types';
+import { SettingsService } from 'src/app/service/settings/settings.service';
 
 @Component({
   selector: 'app-team-selector',
@@ -15,6 +16,8 @@ export class TeamSelectorComponent {
 
   selectedGroupName: string = '';
 
+  constructor(public settings: SettingsService) {}
+
   isTeamSelected(team: string): boolean {
     return this.selectedTeams.includes(team);
   }
diff --git a/src/app/component/teams-groups-editor/teams-groups-editor.component.html b/src/app/component/teams-groups-editor/teams-groups-editor.component.html
index cc1614ed3..1e6df9c0c 100644
--- a/src/app/component/teams-groups-editor/teams-groups-editor.component.html
+++ b/src/app/component/teams-groups-editor/teams-groups-editor.component.html
@@ -2,7 +2,7 @@
 <div class="editor-container">
   <div class="editor-list-panel">
     <app-selectable-list
-      title="Groups"
+      [title]="settings.getGroupLabelPlural()"
       [items]="keys(localCopyTeamGroups)"
       [selectedItem]="selectedGroup"
       [highlightedItems]="highlightedGroups"
@@ -20,7 +20,7 @@
   </div>
   <div class="editor-list-panel">
     <app-selectable-list
-      title="Teams"
+      [title]="settings.getTeamLabelPlural()"
       [items]="localCopyTeams"
       [selectedItem]="selectedTeam"
       [highlightedItems]="highlightedTeams"
diff --git a/src/app/component/teams-groups-editor/teams-groups-editor.component.ts b/src/app/component/teams-groups-editor/teams-groups-editor.component.ts
index 8b2c5266a..3324932be 100644
--- a/src/app/component/teams-groups-editor/teams-groups-editor.component.ts
+++ b/src/app/component/teams-groups-editor/teams-groups-editor.component.ts
@@ -2,6 +2,7 @@
 import { Component, Input, Output, EventEmitter, OnChanges } from '@angular/core';
 import { GroupName, TeamGroups, TeamName, TeamNames } from 'src/app/model/types';
 import { perfNow, renameArrayElement } from 'src/app/util/util';
+import { SettingsService } from 'src/app/service/settings/settings.service';
 
 enum EditMode {
   NONE,
@@ -49,6 +50,8 @@ export class TeamsGroupsEditorComponent implements OnChanges {
   localCopyTeamsRenamed: Record<TeamName, TeamName> = {};
   localCopyTeamGroups: TeamGroups = {};
 
+  constructor(public settings: SettingsService) {}
+
   ngOnChanges() {
     this.makeLocalCopy();
 
@@ -159,7 +162,7 @@ export class TeamsGroupsEditorComponent implements OnChanges {
   }
 
   onAddTeam() {
-    let newName: string = this.findNextName(this.localCopyTeams, 'Team');
+    let newName: string = this.findNextName(this.localCopyTeams, this.settings.getTeamLabel());
     this.localCopyTeams.push(newName);
     this.onTeamSelected(newName);
   }
@@ -194,7 +197,10 @@ export class TeamsGroupsEditorComponent implements OnChanges {
   }
 
   onAddGroup() {
-    let newName: string = this.findNextName(this.keys(this.localCopyTeamGroups), 'Group');
+    let newName: string = this.findNextName(
+      this.keys(this.localCopyTeamGroups),
+      this.settings.getGroupLabel()
+    );
     this.localCopyTeamGroups[newName] = [];
     this.onGroupSelected(newName);
   }
diff --git a/src/app/model/meta-store.ts b/src/app/model/meta-store.ts
index d36ab2383..0c39ce770 100644
--- a/src/app/model/meta-store.ts
+++ b/src/app/model/meta-store.ts
@@ -4,12 +4,16 @@ import { ProgressDefinitions, TeamNames, TeamGroups } from './types';
 import { perfNow } from 'src/app/util/util';
 
 export interface MetaStrings {
+  team: string;
+  group: string;
   allTeamsGroupName: string;
   labels: string[];
   maturityLevels: string[];
   knowledgeLabels: string[];
 }
 const fallbackMetaStrings: MetaStrings = {
+  team: 'Team',
+  group: 'Group',
   allTeamsGroupName: 'All',
   maturityLevels: ['Level 1', 'Level 2'],
   labels: ['Easy', 'Medium', 'Hard'],
diff --git a/src/app/pages/circular-heatmap/circular-heatmap.component.html b/src/app/pages/circular-heatmap/circular-heatmap.component.html
index 6e970187d..8d713e4e7 100644
--- a/src/app/pages/circular-heatmap/circular-heatmap.component.html
+++ b/src/app/pages/circular-heatmap/circular-heatmap.component.html
@@ -35,7 +35,9 @@ <h2>Nothing to show</h2>
           </button>
           <div class="team-filter" [class.hidden]="!showFilters">
             <mat-form-field class="team-chip-list">
-              <mat-label>Team Group Filter</mat-label>
+              <mat-label
+                >{{ settings.getTeamLabel() }} {{ settings.getGroupLabel() }} Filter</mat-label
+              >
               <mat-chip-list selectable>
                 <mat-chip
                   #chip="matChip"
@@ -47,7 +49,7 @@ <h2>Nothing to show</h2>
               </mat-chip-list>
             </mat-form-field>
             <mat-form-field>
-              <mat-label>Team Filter</mat-label>
+              <mat-label>{{ settings.getTeamLabel() }} Filter</mat-label>
               <mat-chip-list selectable multiple>
                 <mat-chip
                   #chip="matChip"
@@ -116,14 +118,14 @@ <h2>Nothing to show</h2>
             mat-raised-button
             class="downloadButtonClass"
             (click)="exportTeamProgress()">
-            Download team progress
+            Download {{ settings.getTeamLabel() | lowercase }} progress
           </button>
           <button
             class="normal-button"
             mat-raised-button
             class="resetButtonClass"
             (click)="deleteLocalTeamsProgress()">
-            Delete team progress
+            Delete {{ settings.getTeamLabel() | lowercase }} progress
           </button>
         </div>
       </div>
diff --git a/src/app/pages/circular-heatmap/circular-heatmap.component.ts b/src/app/pages/circular-heatmap/circular-heatmap.component.ts
index f871f4493..1c6897dd0 100644
--- a/src/app/pages/circular-heatmap/circular-heatmap.component.ts
+++ b/src/app/pages/circular-heatmap/circular-heatmap.component.ts
@@ -64,7 +64,7 @@ export class CircularHeatmapComponent implements OnInit, OnDestroy {
   constructor(
     private loader: LoaderService,
     private sectorService: SectorService,
-    private settings: SettingsService,
+    public settings: SettingsService,
     private themeService: ThemeService,
     private titleService: TitleService,
     private router: Router,
diff --git a/src/app/pages/report/report.component.html b/src/app/pages/report/report.component.html
index d5eb45295..0fec8bba4 100644
--- a/src/app/pages/report/report.component.html
+++ b/src/app/pages/report/report.component.html
@@ -13,7 +13,7 @@
     <span class="activity-count" *ngIf="!isLoading">
       {{ totalFilteredActivities }} activities
       <span *ngIf="reportConfig.selectedTeams.length > 0">
-        · {{ reportConfig.selectedTeams.length }} teams
+        · {{ reportConfig.selectedTeams.length }} {{ settings.getTeamLabelPlural() | lowercase }}
       </span>
     </span>
   </div>
diff --git a/src/app/pages/report/report.component.ts b/src/app/pages/report/report.component.ts
index 51d9c1476..40cb24073 100644
--- a/src/app/pages/report/report.component.ts
+++ b/src/app/pages/report/report.component.ts
@@ -62,7 +62,7 @@ export class ReportComponent implements OnInit {
 
   constructor(
     private loader: LoaderService,
-    private settings: SettingsService,
+    public settings: SettingsService,
     private dialog: MatDialog
   ) {
     this.reportConfig = getReportConfig();
diff --git a/src/app/pages/settings/settings.component.css b/src/app/pages/settings/settings.component.css
index 7047e848b..a70d62eb5 100644
--- a/src/app/pages/settings/settings.component.css
+++ b/src/app/pages/settings/settings.component.css
@@ -248,3 +248,31 @@ mat-icon.mandatory-icon {
   margin-left: 0.5rem;
   font-weight: 500;
 }
+
+/* Terminology section */
+.terminology-section {
+  margin-top: 1rem;
+}
+
+.terminology-description {
+  color: #666;
+  font-size: 0.9em;
+  margin-bottom: 1em;
+}
+
+.terminology-grid {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5em;
+}
+
+.terminology-row {
+  display: flex;
+  gap: 16px;
+  flex-wrap: wrap;
+}
+
+.terminology-row mat-form-field {
+  flex: 1;
+  min-width: 180px;
+}
diff --git a/src/app/pages/settings/settings.component.html b/src/app/pages/settings/settings.component.html
index 6eb5eb387..ecef9111a 100644
--- a/src/app/pages/settings/settings.component.html
+++ b/src/app/pages/settings/settings.component.html
@@ -156,6 +156,56 @@ <h2>Progress Definitions</h2>
       </div>
     </div>
   </mat-card>
+
+  <mat-card class="terminology-section">
+    <h2>Terminology</h2>
+    <p class="terminology-description">
+      Customize the terminology to how you organize your "teams" and how you group them (e.g. 'Apps'
+      and 'Portfolios').
+    </p>
+    <div class="terminology-grid">
+      <div class="terminology-row">
+        <mat-form-field appearance="fill">
+          <mat-label>Team (singular)</mat-label>
+          <input
+            matInput
+            placeholder="e.g. App"
+            name="customTeamLabel"
+            [(ngModel)]="customTeamLabel"
+            (ngModelChange)="onTeamLabelChange()" />
+        </mat-form-field>
+        <mat-form-field appearance="fill" floatLabel="always">
+          <mat-label>Team (plural)</mat-label>
+          <input
+            matInput
+            [placeholder]="getTeamPluralPlaceholder()"
+            name="customTeamLabelPlural"
+            [(ngModel)]="customTeamLabelPlural"
+            (ngModelChange)="onTeamLabelPluralChange()" />
+        </mat-form-field>
+      </div>
+      <div class="terminology-row">
+        <mat-form-field appearance="fill">
+          <mat-label>Group (singular)</mat-label>
+          <input
+            matInput
+            placeholder="e.g. Portfolio"
+            name="customGroupLabel"
+            [(ngModel)]="customGroupLabel"
+            (ngModelChange)="onGroupLabelChange()" />
+        </mat-form-field>
+        <mat-form-field appearance="fill" floatLabel="always">
+          <mat-label>Group (plural)</mat-label>
+          <input
+            matInput
+            [placeholder]="getGroupPluralPlaceholder()"
+            name="customGroupLabelPlural"
+            [(ngModel)]="customGroupLabelPlural"
+            (ngModelChange)="onGroupLabelPluralChange()" />
+        </mat-form-field>
+      </div>
+    </div>
+  </mat-card>
   <mat-card class="settings-about-section">
     <h2>About the DSOMM Model</h2>
     <div class="card-content">
diff --git a/src/app/pages/settings/settings.component.spec.ts b/src/app/pages/settings/settings.component.spec.ts
index 599bcfca8..47e50ccfc 100644
--- a/src/app/pages/settings/settings.component.spec.ts
+++ b/src/app/pages/settings/settings.component.spec.ts
@@ -43,7 +43,18 @@ describe('SettingsComponent', () => {
       'setMaxLevel',
       'getDateFormat',
       'setDateFormat',
+      'getTeamLabel',
+      'getTeamLabelPlural',
+      'getGroupLabel',
+      'getGroupLabelPlural',
+      'setTeamLabel',
+      'setGroupLabel',
+      'initFromMeta',
     ]);
+    settingsService.getTeamLabel.and.returnValue('Team');
+    settingsService.getTeamLabelPlural.and.returnValue('Teams');
+    settingsService.getGroupLabel.and.returnValue('Group');
+    settingsService.getGroupLabelPlural.and.returnValue('Groups');
     modalComponent = jasmine.createSpyObj('ModalMessageComponent', ['openDialog']);
 
     await TestBed.configureTestingModule({
diff --git a/src/app/pages/settings/settings.component.ts b/src/app/pages/settings/settings.component.ts
index f11c66b11..8c3e65b8b 100644
--- a/src/app/pages/settings/settings.component.ts
+++ b/src/app/pages/settings/settings.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, FormArray, AbstractControl } from '@angular/forms';
-import { SettingsService } from '../../service/settings/settings.service';
+import { SettingsService, LabelParts } from '../../service/settings/settings.service';
 import { GithubService, GithubReleaseInfo } from 'src/app/service/settings/github.service';
 import { LoaderService } from 'src/app/service/loader/data-loader.service';
 import { DataStore } from 'src/app/model/data-store';
@@ -61,6 +61,11 @@ export class SettingsComponent implements OnInit {
   ];
   selectedDateFormat: string = this.BROWSER_LOCALE;
 
+  customTeamLabel: string = 'Team';
+  customTeamLabelPlural: string = '';
+  customGroupLabel: string = 'Group';
+  customGroupLabelPlural: string = '';
+
   // GitHub release check state
   checkingLatest: boolean = false;
   latestReleaseInfo: GithubReleaseInfo | null = null;
@@ -145,6 +150,19 @@ export class SettingsComponent implements OnInit {
 
   initialize(): void {
     this.selectedDateFormat = this.settings.getDateFormat() || this.BROWSER_LOCALE;
+    this.customTeamLabel = this.settings.getTeamLabel();
+    this.customTeamLabelPlural = this.settings.getTeamLabelPlural();
+    this.customGroupLabel = this.settings.getGroupLabel();
+    this.customGroupLabelPlural = this.settings.getGroupLabelPlural();
+
+    // If the plural is just the auto-generated default (singular + 's'),
+    // leave the field empty so the dynamic placeholder shows instead.
+    if (this.customTeamLabelPlural === this.customTeamLabel + 's') {
+      this.customTeamLabelPlural = '';
+    }
+    if (this.customGroupLabelPlural === this.customGroupLabel + 's') {
+      this.customGroupLabelPlural = '';
+    }
 
     // Init dates
     let date: Date = new Date();
@@ -179,6 +197,41 @@ export class SettingsComponent implements OnInit {
     this.settings.setDateFormat(value);
   }
 
+  onTeamLabelChange(): void {
+    this.settings.setTeamLabel(this.customTeamLabel, this.customTeamLabelPlural);
+    // Update plural placeholder when singular changes
+    if (!this.customTeamLabelPlural || this.customTeamLabelPlural === this.customTeamLabel + 's') {
+      this.customTeamLabelPlural = '';
+    }
+  }
+
+  onTeamLabelPluralChange(): void {
+    this.settings.setTeamLabel(this.customTeamLabel, this.customTeamLabelPlural);
+  }
+
+  onGroupLabelChange(): void {
+    this.settings.setGroupLabel(this.customGroupLabel, this.customGroupLabelPlural);
+    // Update plural placeholder when singular changes
+    if (
+      !this.customGroupLabelPlural ||
+      this.customGroupLabelPlural === this.customGroupLabel + 's'
+    ) {
+      this.customGroupLabelPlural = '';
+    }
+  }
+
+  onGroupLabelPluralChange(): void {
+    this.settings.setGroupLabel(this.customGroupLabel, this.customGroupLabelPlural);
+  }
+
+  getTeamPluralPlaceholder(): string {
+    return (this.customTeamLabel || 'Team') + 's';
+  }
+
+  getGroupPluralPlaceholder(): string {
+    return (this.customGroupLabel || 'Group') + 's';
+  }
+
   onMaxLevelChange(value: number | null): void {
     if (value == null) value = this.dataStoreMaxLevel;
     if (value == this.dataStoreMaxLevel) {
diff --git a/src/app/pages/teams/teams.component.html b/src/app/pages/teams/teams.component.html
index 9dce214e1..60d8f8a22 100644
--- a/src/app/pages/teams/teams.component.html
+++ b/src/app/pages/teams/teams.component.html
@@ -1,4 +1,7 @@
-<app-top-header section="Teams &amp; Groups"></app-top-header>
+<app-top-header
+  [section]="
+    settings.getTeamLabelPlural() + ' & ' + settings.getGroupLabelPlural()
+  "></app-top-header>
 <div class="team-section">
   <app-teams-groups-editor
     [teams]="teams"
@@ -8,8 +11,12 @@
     (namesChanged)="onTeamsChanged($event)"
     (click)="$event.stopPropagation()"></app-teams-groups-editor>
   <div class="button-container" *ngIf="dataStore?.meta?.hasLocalStorage">
-    <button mat-raised-button (click)="onExportTeamGroups()">Download team setup</button>
-    <button mat-raised-button (click)="onResetTeamGroups()">Reset team setup</button>
+    <button mat-raised-button (click)="onExportTeamGroups()">
+      Download {{ settings.getTeamLabel() | lowercase }} setup
+    </button>
+    <button mat-raised-button (click)="onResetTeamGroups()">
+      Reset {{ settings.getTeamLabel() | lowercase }} setup
+    </button>
   </div>
 
   <div class="team-info">
@@ -37,7 +44,9 @@ <h2>{{ infoTitle }}</h2>
     <h3>Activities in progress</h3>
     <table mat-table matSort [dataSource]="dataSource || []" class="mat-elevation-z8 teams-table">
       <ng-container matColumnDef="Team">
-        <th mat-header-cell mat-sort-header *matHeaderCellDef class="table-small-width">Team</th>
+        <th mat-header-cell mat-sort-header *matHeaderCellDef class="table-small-width">
+          {{ settings.getTeamLabel() }}
+        </th>
         <td mat-cell *matCellDef="let element" class="table-small-width">
           {{ element?.team }}
         </td>
diff --git a/src/app/pages/teams/teams.component.ts b/src/app/pages/teams/teams.component.ts
index c16b10b6f..5f238c8f8 100644
--- a/src/app/pages/teams/teams.component.ts
+++ b/src/app/pages/teams/teams.component.ts
@@ -161,7 +161,12 @@ export class TeamsComponent implements OnInit, AfterViewInit {
 
     if (!yamlStr) {
       this.displayMessage(
-        new DialogInfo('No team and groups names stored locally in the browser', 'Export Error')
+        new DialogInfo(
+          `No ${this.settings.getTeamLabel().toLowerCase()} and ${this.settings
+            .getGroupLabelPlural()
+            .toLowerCase()} names stored locally in the browser`,
+          'Export Error'
+        )
       );
       return;
     }
@@ -182,7 +187,9 @@ export class TeamsComponent implements OnInit, AfterViewInit {
     return new Promise((resolve, reject) => {
       let title: string = 'Delete local browser data';
       let message: string =
-        'Do you want to reset all team and group names?' +
+        `Do you want to reset all ${this.settings.getTeamLabel().toLowerCase()} and ${this.settings
+          .getGroupLabel()
+          .toLowerCase()} names?` +
         '\n\nThis will revert the names to the names stored in the yaml file on the server.';
       let buttons: string[] = ['Cancel', 'Delete'];
       this.modal
diff --git a/src/app/service/loader/data-loader.service.ts b/src/app/service/loader/data-loader.service.ts
index 0e5686325..80932eed8 100644
--- a/src/app/service/loader/data-loader.service.ts
+++ b/src/app/service/loader/data-loader.service.ts
@@ -13,6 +13,7 @@ import {
 } from 'src/app/model/activity-store';
 import { DataStore } from 'src/app/model/data-store';
 import { NotificationService } from '../notification.service';
+import { SettingsService } from '../settings/settings.service';
 
 export class DataValidationError extends Error {
   constructor(message: string) {
@@ -38,7 +39,8 @@ export class LoaderService {
   constructor(
     private yamlService: YamlService,
     private githubService: GithubService,
-    private notificationService: NotificationService
+    private notificationService: NotificationService,
+    private settingsService: SettingsService
   ) {
     this.DSOMM_MODEL_URL = this.githubService.getDsommModelUrl() + '/tree/main/generated';
   }
@@ -62,6 +64,9 @@ export class LoaderService {
       this.dataStore.meta = await this.loadMeta();
       this.dataStore.progressStore?.init(this.dataStore.meta.progressDefinition);
 
+      // Initialize SettingsService with meta.yaml defaults for team/group terminology
+      this.settingsService.initFromMeta(this.dataStore.getMetaStrings());
+
       // Then load activities
       this.dataStore.addActivities(await this.loadActivities(this.dataStore.meta));
 
diff --git a/src/app/service/settings/settings.service.spec.ts b/src/app/service/settings/settings.service.spec.ts
index 14962f813..0a64fff2a 100644
--- a/src/app/service/settings/settings.service.spec.ts
+++ b/src/app/service/settings/settings.service.spec.ts
@@ -1,16 +1,13 @@
 import { TestBed } from '@angular/core/testing';
-import { SettingsService } from './settings.service';
+import { SettingsService, LabelParts } from './settings.service';
 
 describe('SettingsService', () => {
   let service: SettingsService;
-  let localStorageSpy: any;
 
   beforeEach(() => {
-    // Clear all mocks and create fresh instance for each test
     localStorage.clear();
     TestBed.configureTestingModule({});
     service = TestBed.inject(SettingsService);
-    localStorageSpy = spyOn(localStorage, 'setItem').and.callThrough();
   });
 
   afterEach(() => {
@@ -21,6 +18,150 @@ describe('SettingsService', () => {
     expect(service).toBeTruthy();
   });
 
+  describe('parseLabelParts', () => {
+    it('should parse a simple label without pipe', () => {
+      const result: LabelParts = SettingsService.parseLabelParts('Team');
+      expect(result).toEqual({ singular: 'Team', plural: 'Teams' });
+    });
+
+    it('should parse a pipe-separated label', () => {
+      const result: LabelParts = SettingsService.parseLabelParts('Industry|Industries');
+      expect(result).toEqual({ singular: 'Industry', plural: 'Industries' });
+    });
+
+    it('should handle empty string', () => {
+      const result: LabelParts = SettingsService.parseLabelParts('');
+      expect(result).toEqual({ singular: '', plural: '' });
+    });
+
+    it('should handle pipe with empty plural (fallback to +s)', () => {
+      const result: LabelParts = SettingsService.parseLabelParts('App|');
+      expect(result).toEqual({ singular: 'App', plural: 'Apps' });
+    });
+
+    it('should trim whitespace', () => {
+      const result: LabelParts = SettingsService.parseLabelParts(' Client | Clients ');
+      expect(result).toEqual({ singular: 'Client', plural: 'Clients' });
+    });
+  });
+
+  describe('encodeLabelParts', () => {
+    it('should encode without pipe when plural is default +s', () => {
+      expect(SettingsService.encodeLabelParts('Team', 'Teams')).toBe('Team');
+    });
+
+    it('should encode with pipe when plural is custom', () => {
+      expect(SettingsService.encodeLabelParts('Industry', 'Industries')).toBe(
+        'Industry|Industries'
+      );
+    });
+
+    it('should encode without pipe when plural is empty', () => {
+      expect(SettingsService.encodeLabelParts('App', '')).toBe('App');
+    });
+  });
+
+  describe('migrateOldKeys', () => {
+    it('should migrate legacy team label key', () => {
+      localStorage.clear();
+      localStorage.setItem('settings.teamLabel', JSON.stringify('Client'));
+      // Create a new service instance to trigger migration
+      const freshService = new SettingsService();
+      expect(localStorage.getItem('settings.teamLabel')).toBeNull();
+      expect(freshService.getTeamLabel()).toBe('Client');
+    });
+
+    it('should migrate legacy group label key', () => {
+      localStorage.clear();
+      localStorage.setItem('settings.groupLabel', JSON.stringify('Portfolio'));
+      const freshService = new SettingsService();
+      expect(localStorage.getItem('settings.groupLabel')).toBeNull();
+      expect(freshService.getGroupLabel()).toBe('Portfolio');
+    });
+
+    it('should not overwrite existing consolidated key', () => {
+      localStorage.clear();
+      localStorage.setItem('settings.labels', JSON.stringify({ team: 'Existing', group: '' }));
+      localStorage.setItem('settings.teamLabel', JSON.stringify('ShouldBeIgnored'));
+      const freshService = new SettingsService();
+      expect(freshService.getTeamLabel()).toBe('Existing');
+    });
+  });
+
+  describe('initFromMeta', () => {
+    it('should set meta defaults for team and group', () => {
+      service.initFromMeta({
+        team: 'App',
+        group: 'Portfolio|Portfolios',
+        allTeamsGroupName: 'All',
+        labels: [],
+        maturityLevels: [],
+        knowledgeLabels: [],
+      });
+      // Without any localStorage override, getters should return meta defaults
+      expect(service.getTeamLabel()).toBe('App');
+      expect(service.getTeamLabelPlural()).toBe('Apps');
+      expect(service.getGroupLabel()).toBe('Portfolio');
+      expect(service.getGroupLabelPlural()).toBe('Portfolios');
+    });
+
+    it('should be overridden by localStorage values', () => {
+      service.initFromMeta({
+        team: 'App',
+        group: 'Portfolio',
+        allTeamsGroupName: 'All',
+        labels: [],
+        maturityLevels: [],
+        knowledgeLabels: [],
+      });
+      service.setTeamLabel('Client', 'Clients');
+      expect(service.getTeamLabel()).toBe('Client');
+      expect(service.getTeamLabelPlural()).toBe('Clients');
+    });
+  });
+
+  describe('Consolidated labels round-trip', () => {
+    it('should store and retrieve team label', () => {
+      service.setTeamLabel('App');
+      expect(service.getTeamLabel()).toBe('App');
+      expect(service.getTeamLabelPlural()).toBe('Apps');
+    });
+
+    it('should store and retrieve team label with custom plural', () => {
+      service.setTeamLabel('Category', 'Categories');
+      expect(service.getTeamLabel()).toBe('Category');
+      expect(service.getTeamLabelPlural()).toBe('Categories');
+    });
+
+    it('should store and retrieve group label', () => {
+      service.setGroupLabel('Division');
+      expect(service.getGroupLabel()).toBe('Division');
+      expect(service.getGroupLabelPlural()).toBe('Divisions');
+    });
+
+    it('should store and retrieve group label with custom plural', () => {
+      service.setGroupLabel('Industry', 'Industries');
+      expect(service.getGroupLabel()).toBe('Industry');
+      expect(service.getGroupLabelPlural()).toBe('Industries');
+    });
+
+    it('should use localStorage key settings.labels', () => {
+      service.setTeamLabel('Foo');
+      service.setGroupLabel('Bar', 'Bars');
+      const stored = JSON.parse(localStorage.getItem('settings.labels')!);
+      expect(stored.team).toBe('Foo');
+      expect(stored.group).toBe('Bar');
+    });
+
+    it('should clear labels from localStorage when reset to default', () => {
+      service.setTeamLabel('Custom');
+      expect(localStorage.getItem('settings.labels')).not.toBeNull();
+      service.setTeamLabel('Team');
+      service.setGroupLabel('Group');
+      expect(localStorage.getItem('settings.labels')).toBeNull();
+    });
+  });
+
   describe('General Settings Operations', () => {
     it('should handle empty string settings', () => {
       service.saveSettings('test.key', '');
diff --git a/src/app/service/settings/settings.service.ts b/src/app/service/settings/settings.service.ts
index 89fe9bce8..c1900ed5f 100644
--- a/src/app/service/settings/settings.service.ts
+++ b/src/app/service/settings/settings.service.ts
@@ -1,4 +1,15 @@
 import { Injectable } from '@angular/core';
+import { MetaStrings } from 'src/app/model/meta-store';
+
+export interface LabelParts {
+  singular: string;
+  plural: string;
+}
+
+export interface Labels {
+  team: string;
+  group: string;
+}
 
 @Injectable({
   providedIn: 'root',
@@ -6,9 +17,206 @@ import { Injectable } from '@angular/core';
 export class SettingsService {
   private readonly KEY_DATEFORMAT = 'settings.dateformat';
   private readonly KEY_MAX_LEVEL = 'settings.maxlevel';
+  private readonly KEY_LABELS = 'settings.labels';
+
+  // Legacy keys for migration
+  private readonly LEGACY_KEY_TEAM_LABEL = 'settings.teamLabel';
+  private readonly LEGACY_KEY_GROUP_LABEL = 'settings.groupLabel';
 
   private dateformat: string | null = null;
   private maxLevel: number | null = null;
+  private _labels: Labels | null = null;
+
+  // Server-level defaults from meta.yaml (set via initFromMeta)
+  private _metaTeam: LabelParts = { singular: 'Team', plural: 'Teams' };
+  private _metaGroup: LabelParts = { singular: 'Group', plural: 'Groups' };
+  private _metaInitialized: boolean = false;
+
+  constructor() {
+    this.migrateOldKeys();
+  }
+
+  // --- Meta initialization ---
+
+  /**
+   * Called by LoaderService after loading meta.yaml to set server-level defaults.
+   */
+  initFromMeta(metaStrings: MetaStrings): void {
+    if (metaStrings.team) {
+      this._metaTeam = SettingsService.parseLabelParts(metaStrings.team);
+    }
+    if (metaStrings.group) {
+      this._metaGroup = SettingsService.parseLabelParts(metaStrings.group);
+    }
+    this._metaInitialized = true;
+    // Reset cached labels so next get reads fresh values with new defaults
+    this._labels = null;
+  }
+
+  // --- Label parsing ---
+
+  /**
+   * Parse a |-split label string into singular and plural parts.
+   * "Industry|Industries" => { singular: "Industry", plural: "Industries" }
+   * "Team" => { singular: "Team", plural: "Teams" }
+   */
+  static parseLabelParts(value: string): LabelParts {
+    if (!value || value.trim().length === 0) {
+      return { singular: '', plural: '' };
+    }
+    const parts = value.split('|');
+    const singular = parts[0].trim();
+    const plural =
+      parts.length > 1 && parts[1].trim().length > 0 ? parts[1].trim() : singular + 's';
+    return { singular, plural };
+  }
+
+  /**
+   * Encode singular + plural into a |-split string.
+   * If plural === singular + 's', omit the plural part (store just singular).
+   */
+  static encodeLabelParts(singular: string, plural: string): string {
+    if (!singular || singular.trim().length === 0) return '';
+    singular = singular.trim();
+    plural = plural.trim();
+    if (!plural || plural === singular + 's') {
+      return singular;
+    }
+    return `${singular}|${plural}`;
+  }
+
+  // --- Migration ---
+
+  /**
+   * Migrate old separate localStorage keys into the consolidated settings.labels key.
+   */
+  migrateOldKeys(): void {
+    const oldTeam = localStorage.getItem(this.LEGACY_KEY_TEAM_LABEL);
+    const oldGroup = localStorage.getItem(this.LEGACY_KEY_GROUP_LABEL);
+
+    if (oldTeam !== null || oldGroup !== null) {
+      // Only migrate if we don't already have the consolidated key
+      const existing = localStorage.getItem(this.KEY_LABELS);
+      if (existing === null) {
+        const labels: Labels = { team: '', group: '' };
+        if (oldTeam !== null) {
+          try {
+            labels.team = JSON.parse(oldTeam);
+          } catch {
+            labels.team = oldTeam;
+          }
+        }
+        if (oldGroup !== null) {
+          try {
+            labels.group = JSON.parse(oldGroup);
+          } catch {
+            labels.group = oldGroup;
+          }
+        }
+        // Only save if there's actually custom data
+        if (labels.team || labels.group) {
+          localStorage.setItem(this.KEY_LABELS, JSON.stringify(labels));
+        }
+      }
+      // Remove legacy keys
+      localStorage.removeItem(this.LEGACY_KEY_TEAM_LABEL);
+      localStorage.removeItem(this.LEGACY_KEY_GROUP_LABEL);
+    }
+  }
+
+  // --- Labels (consolidated) ---
+
+  private loadLabels(): Labels {
+    if (this._labels !== null) return this._labels;
+
+    const stored = localStorage.getItem(this.KEY_LABELS);
+    if (stored) {
+      try {
+        this._labels = JSON.parse(stored);
+        return this._labels!;
+      } catch {
+        // Invalid JSON — ignore
+      }
+    }
+    this._labels = { team: '', group: '' };
+    return this._labels;
+  }
+
+  private saveLabels(labels: Labels): void {
+    this._labels = labels;
+    // Remove from storage if both are empty/default
+    if (!labels.team && !labels.group) {
+      localStorage.removeItem(this.KEY_LABELS);
+    } else {
+      localStorage.setItem(this.KEY_LABELS, JSON.stringify(labels));
+    }
+  }
+
+  // --- Team label ---
+
+  getTeamLabel(): string {
+    const labels = this.loadLabels();
+    if (labels.team) {
+      return SettingsService.parseLabelParts(labels.team).singular;
+    }
+    return this._metaTeam.singular || 'Team';
+  }
+
+  getTeamLabelPlural(): string {
+    const labels = this.loadLabels();
+    if (labels.team) {
+      return SettingsService.parseLabelParts(labels.team).plural;
+    }
+    return this._metaTeam.plural || 'Teams';
+  }
+
+  setTeamLabel(singular: string | null, plural?: string | null): void {
+    const labels = this.loadLabels();
+    const s = singular?.trim() || '';
+    const p = plural?.trim() || '';
+
+    // If the value matches the meta default, don't store it
+    if (s === this._metaTeam.singular && (!p || p === this._metaTeam.plural)) {
+      labels.team = '';
+    } else {
+      labels.team = s ? SettingsService.encodeLabelParts(s, p) : '';
+    }
+    this.saveLabels(labels);
+  }
+
+  // --- Group label ---
+
+  getGroupLabel(): string {
+    const labels = this.loadLabels();
+    if (labels.group) {
+      return SettingsService.parseLabelParts(labels.group).singular;
+    }
+    return this._metaGroup.singular || 'Group';
+  }
+
+  getGroupLabelPlural(): string {
+    const labels = this.loadLabels();
+    if (labels.group) {
+      return SettingsService.parseLabelParts(labels.group).plural;
+    }
+    return this._metaGroup.plural || 'Groups';
+  }
+
+  setGroupLabel(singular: string | null, plural?: string | null): void {
+    const labels = this.loadLabels();
+    const s = singular?.trim() || '';
+    const p = plural?.trim() || '';
+
+    // If the value matches the meta default, don't store it
+    if (s === this._metaGroup.singular && (!p || p === this._metaGroup.plural)) {
+      labels.group = '';
+    } else {
+      labels.group = s ? SettingsService.encodeLabelParts(s, p) : '';
+    }
+    this.saveLabels(labels);
+  }
+
+  // --- Date format ---
 
   getDateFormat(): string | null {
     if (this.dateformat == null) {
@@ -22,6 +230,8 @@ export class SettingsService {
     this.saveSettings(this.KEY_DATEFORMAT, format);
   }
 
+  // --- Max level ---
+
   getMaxLevel(): number | null {
     if (this.maxLevel == null) {
       this.maxLevel = this.getSettingsNumber(this.KEY_MAX_LEVEL);
@@ -34,6 +244,8 @@ export class SettingsService {
     this.saveSettings(this.KEY_MAX_LEVEL, maxLevel);
   }
 
+  // --- Generic settings helpers ---
+
   getSettingsNumber(key: string): number | null {
     let setting: string | null = localStorage.getItem(key);
     if (setting == null) {
diff --git a/src/assets/YAML/meta.yaml b/src/assets/YAML/meta.yaml
index 088862a15..4e13b4ce2 100644
--- a/src/assets/YAML/meta.yaml
+++ b/src/assets/YAML/meta.yaml
@@ -36,6 +36,9 @@ activityFiles:
 lang: en
 strings:
   en:
+    # Optional: customize terminology (use 'singular|plural' for irregular plurals, e.g. 'Industry|Industries')
+    team: 'Team'
+    group: 'Group'
     allTeamsGroupName: 'All teams'
     maturityLevels:
       [