diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts
index 9cf153881..f04b61e30 100644
--- a/apps/red-ui/src/app/app-routing.module.ts
+++ b/apps/red-ui/src/app/app-routing.module.ts
@@ -13,7 +13,7 @@ import { CustomRouteReuseStrategy } from '@utils/custom-route-reuse.strategy';
 const routes = [
     {
         path: '',
-        redirectTo: 'main/projects',
+        redirectTo: 'main/dossiers',
         pathMatch: 'full'
     },
     {
@@ -41,10 +41,10 @@ const routes = [
         loadChildren: () => import('./modules/admin/admin.module').then((m) => m.AdminModule)
     },
     {
-        path: 'main/projects',
+        path: 'main/dossiers',
         component: BaseScreenComponent,
         loadChildren: () =>
-            import('./modules/projects/projects.module').then((m) => m.ProjectsModule)
+            import('./modules/dossiers/dossiers.module').then((m) => m.DossiersModule)
     },
     {
         path: 'main/downloads',
@@ -62,7 +62,7 @@ const routes = [
     },
     {
         path: '**',
-        redirectTo: 'main/projects',
+        redirectTo: 'main/dossiers',
         pathMatch: 'full'
     }
 ];
diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
index 5433c7e17..d9d38eca1 100644
--- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html
+++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
@@ -8,21 +8,21 @@
             <mat-menu #menuNav="matMenu">
                 <button
                     mat-menu-item
-                    routerLink="/main/projects"
-                    translate="top-bar.navigation-items.projects"
+                    routerLink="/main/dossiers"
+                    translate="top-bar.navigation-items.dossiers"
                 ></button>
                 <button
-                    *ngIf="appStateService.activeProject"
-                    [routerLink]="'/main/projects/' + appStateService.activeProjectId"
+                    *ngIf="appStateService.activeDossier"
+                    [routerLink]="'/main/dossiers/' + appStateService.activeDossierId"
                     mat-menu-item
                 >
-                    {{ appStateService.activeProject.project.projectName }}
+                    {{ appStateService.activeDossier.dossier.dossierName }}
                 </button>
                 <button
                     *ngIf="appStateService.activeFile"
                     [routerLink]="
-                        '/main/projects/' +
-                        appStateService.activeProjectId +
+                        '/main/dossiers/' +
+                        appStateService.activeDossierId +
                         '/file/' +
                         appStateService.activeFile.fileId
                     "
@@ -37,42 +37,42 @@
             class="menu flex-2 visible-lg breadcrumbs-container"
         >
             <a
-                *ngIf="projectsView"
+                *ngIf="dossiersView"
                 [routerLinkActiveOptions]="{ exact: true }"
                 class="breadcrumb"
-                routerLink="/main/projects"
+                routerLink="/main/dossiers"
                 routerLinkActive="active"
-                translate="top-bar.navigation-items.projects"
+                translate="top-bar.navigation-items.dossiers"
             ></a>
-            <a *ngIf="!projectsView" class="breadcrumb back" redactionNavigateLastProjectsScreen>
+            <a *ngIf="!dossiersView" class="breadcrumb back" redactionNavigateLastDossiersScreen>
                 <mat-icon svgIcon="red:expand"></mat-icon>
                 {{ 'top-bar.navigation-items.back' | translate }}
             </a>
-            <ng-container *ngIf="projectsView">
+            <ng-container *ngIf="dossiersView">
                 <mat-icon
-                    *ngIf="!appStateService.activeProject"
+                    *ngIf="!appStateService.activeDossier"
                     class="primary"
                     svgIcon="red:arrow-down"
                 ></mat-icon>
                 <mat-icon
-                    *ngIf="appStateService.activeProject"
+                    *ngIf="appStateService.activeDossier"
                     svgIcon="red:arrow-right"
                 ></mat-icon>
                 <a
-                    *ngIf="appStateService.activeProject"
+                    *ngIf="appStateService.activeDossier"
                     [routerLinkActiveOptions]="{ exact: true }"
-                    [routerLink]="'/main/projects/' + appStateService.activeProjectId"
+                    [routerLink]="'/main/dossiers/' + appStateService.activeDossierId"
                     class="breadcrumb"
                     routerLinkActive="active"
                 >
-                    {{ appStateService.activeProject.project.projectName }}
+                    {{ appStateService.activeDossier.dossier.dossierName }}
                 </a>
                 <mat-icon *ngIf="appStateService.activeFile" svgIcon="red:arrow-right"></mat-icon>
                 <a
                     *ngIf="appStateService.activeFile"
                     [routerLink]="
-                        '/main/projects/' +
-                        appStateService.activeProjectId +
+                        '/main/dossiers/' +
+                        appStateService.activeDossierId +
                         '/file/' +
                         appStateService.activeFile.fileId
                     "
diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts
index 444362088..9c17aa721 100644
--- a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts
+++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts
@@ -31,14 +31,14 @@ export class BaseScreenComponent {
         private readonly _translateService: TranslateService
     ) {
         _router.events.subscribe(() => {
-            this._projectsView = this._router.url.indexOf('/main/projects') === 0;
+            this._dossiersView = this._router.url.indexOf('/main/dossiers') === 0;
         });
     }
 
-    private _projectsView: boolean;
+    private _dossiersView: boolean;
 
-    get projectsView() {
-        return this._projectsView;
+    get dossiersView() {
+        return this._dossiersView;
     }
 
     get user() {
diff --git a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html
index 2a490f50c..34990b3c9 100644
--- a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html
+++ b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html
@@ -3,7 +3,7 @@
         <div class="actions flex-1">
             <redaction-circle-button
                 icon="red:close"
-                redactionNavigateLastProjectsScreen
+                redactionNavigateLastDossiersScreen
                 tooltip="common.close"
                 tooltipPosition="below"
             ></redaction-circle-button>
diff --git a/apps/red-ui/src/app/models/file/file-status.wrapper.ts b/apps/red-ui/src/app/models/file/file-status.wrapper.ts
index 61a746819..d763f1944 100644
--- a/apps/red-ui/src/app/models/file/file-status.wrapper.ts
+++ b/apps/red-ui/src/app/models/file/file-status.wrapper.ts
@@ -8,7 +8,7 @@ export class FileStatusWrapper {
     constructor(
         public fileStatus: FileStatus,
         public reviewerName: string,
-        public ruleSetId: string,
+        public dossierTemplateId: string,
         fileAttributesConfig?: FileAttributesConfig
     ) {
         this.searchField = fileStatus.filename;
@@ -111,8 +111,8 @@ export class FileStatusWrapper {
         return this.fileStatus.numberOfAnalyses;
     }
 
-    get projectId() {
-        return this.fileStatus.projectId;
+    get dossierId() {
+        return this.fileStatus.dossierId;
     }
 
     get isExcluded() {
diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts
index 516e2c601..03504d6ff 100644
--- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts
+++ b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts
@@ -3,7 +3,7 @@ import { AuthGuard } from '../auth/auth.guard';
 import { CompositeRouteGuard } from '@guards/composite-route.guard';
 import { RedRoleGuard } from '../auth/red-role.guard';
 import { AppStateGuard } from '@state/app-state.guard';
-import { RuleSetsListingScreenComponent } from './screens/rule-sets-listing/rule-sets-listing-screen.component';
+import { DossierTemplatesListingScreenComponent } from './screens/rule-sets-listing/rule-sets-listing-screen.component';
 import { DictionaryListingScreenComponent } from './screens/dictionary-listing/dictionary-listing-screen.component';
 import { DictionaryOverviewScreenComponent } from './screens/dictionary-overview/dictionary-overview-screen.component';
 import { PendingChangesGuard } from '@guards/can-deactivate.guard';
@@ -19,20 +19,20 @@ import { RouterModule } from '@angular/router';
 import { SmtpConfigScreenComponent } from './screens/smtp-config/smtp-config-screen.component';
 
 const routes = [
-    { path: '', redirectTo: 'project-templates', pathMatch: 'full' },
+    { path: '', redirectTo: 'dossier-templates', pathMatch: 'full' },
     {
-        path: 'project-templates',
+        path: 'dossier-templates',
         children: [
             {
                 path: '',
-                component: RuleSetsListingScreenComponent,
+                component: DossierTemplatesListingScreenComponent,
                 canActivate: [CompositeRouteGuard],
                 data: {
                     routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard]
                 }
             },
             {
-                path: ':ruleSetId',
+                path: ':dossierTemplateId',
                 children: [
                     {
                         path: 'dictionaries',
diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts
index ef5dd63ea..ad1ca3ca7 100644
--- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts
+++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts
@@ -9,7 +9,7 @@ import { AppStateService } from '@state/app-state.service';
     styleUrls: ['./admin-side-nav.component.scss']
 })
 export class AdminSideNavComponent {
-    @Input() type: 'settings' | 'project-templates';
+    @Input() type: 'settings' | 'dossier-templates';
 
     items: {
         [key: string]: {
@@ -21,14 +21,14 @@ export class AdminSideNavComponent {
         }[];
     } = {
         settings: [
-            { screen: 'project-templates', onlyAdmin: true },
+            { screen: 'dossier-templates', onlyAdmin: true },
             { screen: 'digital-signature', onlyAdmin: true },
             { screen: 'license-info', label: 'license-information', onlyAdmin: true },
             { screen: 'audit', onlyAdmin: true },
             { screen: 'users', label: 'user-management', userManagerOnly: true },
             { screen: 'smtp-config', label: 'configurations', onlyAdmin: true }
         ],
-        'project-templates': [
+        'dossier-templates': [
             { screen: 'dictionaries' },
             { screen: 'rules', onlyDevMode: true, label: 'rule-editor' },
             { screen: 'default-colors' },
diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts
index 42e561b77..78b20878c 100644
--- a/apps/red-ui/src/app/modules/admin/admin.module.ts
+++ b/apps/red-ui/src/app/modules/admin/admin.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 import { AdminRoutingModule } from './admin-routing.module';
 import { RulesScreenComponent } from './screens/rules/rules-screen.component';
 import { SharedModule } from '@shared/shared.module';
-import { RuleSetsListingScreenComponent } from './screens/rule-sets-listing/rule-sets-listing-screen.component';
+import { DossierTemplatesListingScreenComponent } from './screens/rule-sets-listing/rule-sets-listing-screen.component';
 import { AuditScreenComponent } from './screens/audit/audit-screen.component';
 import { DefaultColorsScreenComponent } from './screens/default-colors/default-colors-screen.component';
 import { DictionaryListingScreenComponent } from './screens/dictionary-listing/dictionary-listing-screen.component';
@@ -14,10 +14,10 @@ import { LicenseInformationScreenComponent } from './screens/license-information
 import { UserListingScreenComponent } from './screens/user-listing/user-listing-screen.component';
 import { WatermarkScreenComponent } from './screens/watermark/watermark-screen.component';
 import { AdminBreadcrumbsComponent } from './components/breadcrumbs/admin-breadcrumbs.component';
-import { RuleSetActionsComponent } from './components/rule-set-actions/rule-set-actions.component';
+import { DossierTemplateActionsComponent } from './components/rule-set-actions/rule-set-actions.component';
 import { ColorPickerModule } from 'ngx-color-picker';
 import { AddEditFileAttributeDialogComponent } from './dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component';
-import { AddEditRuleSetDialogComponent } from './dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component';
+import { AddEditDossierTemplateDialogComponent } from './dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component';
 import { AddEditDictionaryDialogComponent } from './dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component';
 import { ConfirmDeleteFileAttributeDialogComponent } from './dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component';
 import { EditColorDialogComponent } from './dialogs/edit-color-dialog/edit-color-dialog.component';
@@ -35,7 +35,7 @@ import { AdminSideNavComponent } from './admin-side-nav/admin-side-nav.component
 import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
 
 const dialogs = [
-    AddEditRuleSetDialogComponent,
+    AddEditDossierTemplateDialogComponent,
     AddEditDictionaryDialogComponent,
     AddEditFileAttributeDialogComponent,
     ConfirmDeleteFileAttributeDialogComponent,
@@ -48,7 +48,7 @@ const dialogs = [
 ];
 
 const screens = [
-    RuleSetsListingScreenComponent,
+    DossierTemplatesListingScreenComponent,
     RulesScreenComponent,
     AuditScreenComponent,
     DefaultColorsScreenComponent,
@@ -64,7 +64,7 @@ const screens = [
 
 const components = [
     AdminBreadcrumbsComponent,
-    RuleSetActionsComponent,
+    DossierTemplateActionsComponent,
     ComboChartComponent,
     ComboSeriesVerticalComponent,
     UsersStatsComponent,
diff --git a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html b/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html
index 791984c80..5efc4111a 100644
--- a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html
+++ b/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html
@@ -1,19 +1,21 @@
 <div class="menu flex-2 visible-lg breadcrumbs-container">
     <a
-        *ngIf="root || !!appStateService.activeRuleSet"
-        [routerLink]="'/main/admin/project-templates'"
+        *ngIf="root || !!appStateService.activeDossierTemplate"
+        [routerLink]="'/main/admin/dossier-templates'"
         class="breadcrumb"
-        translate="project-templates"
+        translate="dossier-templates"
     ></a>
 
-    <ng-container *ngIf="appStateService.activeRuleSet">
+    <ng-container *ngIf="appStateService.activeDossierTemplate">
         <mat-icon svgIcon="red:arrow-right"></mat-icon>
         <a
             [class.active]="!appStateService.activeDictionaryType"
-            [routerLink]="'/main/admin/project-templates/' + appStateService.activeRuleSetId"
+            [routerLink]="
+                '/main/admin/dossier-templates/' + appStateService.activeDossierTemplateId
+            "
             class="breadcrumb ml-0"
         >
-            {{ appStateService.activeRuleSet.name }}
+            {{ appStateService.activeDossierTemplate.name }}
         </a>
     </ng-container>
 
@@ -21,8 +23,8 @@
         <mat-icon svgIcon="red:arrow-right"></mat-icon>
         <a
             [routerLink]="
-                '/main/admin/project-templates/' +
-                appStateService.activeRuleSetId +
+                '/main/admin/dossier-templates/' +
+                appStateService.activeDossierTemplateId +
                 '/dictionaries/' +
                 appStateService.activeDictionaryType
             "
diff --git a/apps/red-ui/src/app/modules/admin/components/rule-set-actions/rule-set-actions.component.html b/apps/red-ui/src/app/modules/admin/components/rule-set-actions/rule-set-actions.component.html
index 0f59fbe3b..b8cc0482b 100644
--- a/apps/red-ui/src/app/modules/admin/components/rule-set-actions/rule-set-actions.component.html
+++ b/apps/red-ui/src/app/modules/admin/components/rule-set-actions/rule-set-actions.component.html
@@ -1,18 +1,18 @@
 <div class="action-buttons">
     <redaction-circle-button
-        (action)="openDeleteRuleSetDialog($event)"
+        (action)="openDeleteDossierTemplateDialog($event)"
         *ngIf="permissionsService.isAdmin()"
         icon="red:trash"
-        tooltip="project-templates-listing.action.delete"
+        tooltip="dossier-templates-listing.action.delete"
         type="dark-bg"
     >
     </redaction-circle-button>
 
     <redaction-circle-button
-        (action)="openEditRuleSetDialog($event)"
+        (action)="openEditDossierTemplateDialog($event)"
         *ngIf="permissionsService.isAdmin()"
         icon="red:edit"
-        tooltip="project-templates-listing.action.edit"
+        tooltip="dossier-templates-listing.action.edit"
         type="dark-bg"
     >
     </redaction-circle-button>
diff --git a/apps/red-ui/src/app/modules/admin/components/rule-set-actions/rule-set-actions.component.ts b/apps/red-ui/src/app/modules/admin/components/rule-set-actions/rule-set-actions.component.ts
index b3a9f2741..36a3e1496 100644
--- a/apps/red-ui/src/app/modules/admin/components/rule-set-actions/rule-set-actions.component.ts
+++ b/apps/red-ui/src/app/modules/admin/components/rule-set-actions/rule-set-actions.component.ts
@@ -9,9 +9,9 @@ import { AdminDialogService } from '../../services/admin-dialog.service';
     templateUrl: './rule-set-actions.component.html',
     styleUrls: ['./rule-set-actions.component.scss']
 })
-export class RuleSetActionsComponent {
-    @Input() ruleSetId: string;
-    @Output() loadRuleSetsData = new EventEmitter<any>();
+export class DossierTemplateActionsComponent {
+    @Input() dossierTemplateId: string;
+    @Output() loadDossierTemplatesData = new EventEmitter<any>();
 
     constructor(
         private readonly _dialogService: AdminDialogService,
@@ -19,32 +19,39 @@ export class RuleSetActionsComponent {
         private readonly _router: Router,
         readonly permissionsService: PermissionsService
     ) {
-        if (!this.ruleSetId) {
-            this.ruleSetId = this._appStateService.activeRuleSetId;
+        if (!this.dossierTemplateId) {
+            this.dossierTemplateId = this._appStateService.activeDossierTemplateId;
         }
     }
 
-    get ruleSet() {
-        return this._appStateService.getRuleSetById(this.ruleSetId);
+    get dossierTemplate() {
+        return this._appStateService.getDossierTemplateById(this.dossierTemplateId);
     }
 
-    openEditRuleSetDialog($event: any) {
+    openEditDossierTemplateDialog($event: any) {
         $event.stopPropagation();
-        this._dialogService.openAddEditRuleSetDialog(this.ruleSet, async (newRuleSet) => {
-            if (newRuleSet && this.loadRuleSetsData) {
-                this.loadRuleSetsData.emit();
+        this._dialogService.openAddEditDossierTemplateDialog(
+            this.dossierTemplate,
+            async (newDossierTemplate) => {
+                if (newDossierTemplate && this.loadDossierTemplatesData) {
+                    this.loadDossierTemplatesData.emit();
+                }
             }
-        });
+        );
     }
 
-    openDeleteRuleSetDialog($event: any) {
-        this._dialogService.openDeleteRuleSetDialog($event, this.ruleSet, async () => {
-            await this._appStateService.loadAllRuleSets();
-            await this._appStateService.loadDictionaryData();
-            await this._router.navigate(['main', 'admin']);
-            if (this.loadRuleSetsData) {
-                this.loadRuleSetsData.emit();
+    openDeleteDossierTemplateDialog($event: any) {
+        this._dialogService.openDeleteDossierTemplateDialog(
+            $event,
+            this.dossierTemplate,
+            async () => {
+                await this._appStateService.loadAllDossierTemplates();
+                await this._appStateService.loadDictionaryData();
+                await this._router.navigate(['main', 'admin']);
+                if (this.loadDossierTemplatesData) {
+                    this.loadDossierTemplatesData.emit();
+                }
             }
-        });
+        );
     }
 }
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts
index 2a74568ae..2929b7244 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts
@@ -15,7 +15,7 @@ import { TranslateService } from '@ngx-translate/core';
 export class AddEditDictionaryDialogComponent {
     dictionaryForm: FormGroup;
     readonly dictionary: TypeValue;
-    private readonly _ruleSetId: string;
+    private readonly _dossierTemplateId: string;
 
     constructor(
         private readonly _dictionaryControllerService: DictionaryControllerService,
@@ -24,10 +24,10 @@ export class AddEditDictionaryDialogComponent {
         private readonly _notificationService: NotificationService,
         private readonly _translateService: TranslateService,
         public dialogRef: MatDialogRef<AddEditDictionaryDialogComponent>,
-        @Inject(MAT_DIALOG_DATA) public data: { dictionary: TypeValue; ruleSetId: string }
+        @Inject(MAT_DIALOG_DATA) public data: { dictionary: TypeValue; dossierTemplateId: string }
     ) {
         this.dictionary = data.dictionary;
-        this._ruleSetId = data.ruleSetId;
+        this._dossierTemplateId = data.dossierTemplateId;
         this.dictionaryForm = this._formBuilder.group({
             type: [this.dictionary?.type, [Validators.required, Validators.minLength(3)]],
             description: [this.dictionary?.description],
@@ -68,11 +68,11 @@ export class AddEditDictionaryDialogComponent {
             observable = this._dictionaryControllerService.updateType(
                 typeValue,
                 typeValue.type,
-                this._ruleSetId
+                this._dossierTemplateId
             );
         } else {
             // create mode
-            typeValue.ruleSetId = this._ruleSetId;
+            typeValue.dossierTemplateId = this._dossierTemplateId;
             observable = this._dictionaryControllerService.addType(typeValue);
         }
 
@@ -109,7 +109,7 @@ export class AddEditDictionaryDialogComponent {
             type: this.dictionaryForm.get('type').value,
             rank: this.dictionaryForm.get('rank').value,
             addToDictionaryAction: this.dictionaryForm.get('addToDictionaryAction').value,
-            ruleSetId: this._ruleSetId
+            dossierTemplateId: this._dossierTemplateId
         };
     }
 }
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts
index 51ace3704..f707f6332 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts
@@ -12,7 +12,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 export class AddEditFileAttributeDialogComponent {
     fileAttributeForm: FormGroup;
     fileAttribute: FileAttributeConfig;
-    ruleSetId: string;
+    dossierTemplateId: string;
     readonly typeOptions = [
         FileAttributeConfig.TypeEnum.TEXT,
         FileAttributeConfig.TypeEnum.NUMBER,
@@ -24,10 +24,10 @@ export class AddEditFileAttributeDialogComponent {
         private readonly _formBuilder: FormBuilder,
         public dialogRef: MatDialogRef<AddEditFileAttributeDialogComponent>,
         @Inject(MAT_DIALOG_DATA)
-        public data: { fileAttribute: FileAttributeConfig; ruleSetId: string }
+        public data: { fileAttribute: FileAttributeConfig; dossierTemplateId: string }
     ) {
         this.fileAttribute = data.fileAttribute;
-        this.ruleSetId = data.ruleSetId;
+        this.dossierTemplateId = data.dossierTemplateId;
 
         this.fileAttributeForm = this._formBuilder.group({
             label: [this.fileAttribute?.label, Validators.required],
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.html
index b17a80f9e..313b74132 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.html
@@ -1,34 +1,34 @@
 <section class="dialog">
     <div class="dialog-header heading-l">
         {{
-            (ruleSet
-                ? 'add-edit-project-template.title.edit'
-                : 'add-edit-project-template.title.new'
-            ) | translate: { name: ruleSet?.name }
+            (dossierTemplate
+                ? 'add-edit-dossier-template.title.edit'
+                : 'add-edit-dossier-template.title.new'
+            ) | translate: { name: dossierTemplate?.name }
         }}
     </div>
 
-    <form (submit)="saveRuleSet()" [formGroup]="ruleSetForm">
+    <form (submit)="saveDossierTemplate()" [formGroup]="dossierTemplateForm">
         <div class="dialog-content">
             <div class="red-input-group required w-300">
-                <label translate="add-edit-project-template.form.name"></label>
+                <label translate="add-edit-dossier-template.form.name"></label>
                 <input
                     formControlName="name"
                     name="name"
                     placeholder="{{
-                        'add-edit-project-template.form.name-placeholder' | translate
+                        'add-edit-dossier-template.form.name-placeholder' | translate
                     }}"
                     type="text"
                 />
             </div>
 
             <div class="red-input-group w-400">
-                <label translate="add-edit-project-template.form.description"></label>
+                <label translate="add-edit-dossier-template.form.description"></label>
                 <textarea
                     formControlName="description"
                     name="description"
                     placeholder="{{
-                        'add-edit-project-template.form.description-placeholder' | translate
+                        'add-edit-dossier-template.form.description-placeholder' | translate
                     }}"
                     rows="4"
                     type="text"
@@ -43,7 +43,7 @@
                         class="filter-menu-checkbox"
                         color="primary"
                     >
-                        {{ 'add-edit-project-template.form.valid-from' | translate }}
+                        {{ 'add-edit-dossier-template.form.valid-from' | translate }}
                     </mat-checkbox>
 
                     <mat-checkbox
@@ -52,7 +52,7 @@
                         class="filter-menu-checkbox"
                         color="primary"
                     >
-                        {{ 'add-edit-project-template.form.valid-to' | translate }}
+                        {{ 'add-edit-dossier-template.form.valid-to' | translate }}
                     </mat-checkbox>
                 </div>
 
@@ -93,7 +93,10 @@
                     [label]="
                         'report-type.label'
                             | translate
-                                : { length: this.ruleSetForm.controls['reportTypes'].value.length }
+                                : {
+                                      length: this.dossierTemplateForm.controls['reportTypes'].value
+                                          .length
+                                  }
                     "
                     [options]="reportTypesEnum"
                     [translatePrefix]="'report-type.'"
@@ -105,8 +108,8 @@
                         'download-type.label'
                             | translate
                                 : {
-                                      length: this.ruleSetForm.controls['downloadFileTypes'].value
-                                          .length
+                                      length: this.dossierTemplateForm.controls['downloadFileTypes']
+                                          .value.length
                                   }
                     "
                     [options]="downloadTypesEnum"
@@ -118,12 +121,12 @@
 
         <div class="dialog-actions">
             <button
-                [disabled]="ruleSetForm.invalid || !changed"
+                [disabled]="dossierTemplateForm.invalid || !changed"
                 color="primary"
                 mat-flat-button
                 type="submit"
             >
-                {{ 'add-edit-project-template.save' | translate }}
+                {{ 'add-edit-dossier-template.save' | translate }}
             </button>
         </div>
     </form>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.ts
index 5532c8bba..d82e4f2f1 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.ts
@@ -4,7 +4,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import * as moment from 'moment';
 import { Moment } from 'moment';
-import { RuleSetControllerService, RuleSetModel } from '@redaction/red-ui-http';
+import { DossierTemplateControllerService, DossierTemplateModel } from '@redaction/red-ui-http';
 import { applyIntervalConstraints } from '@utils/date-inputs-utils';
 
 @Component({
@@ -12,12 +12,12 @@ import { applyIntervalConstraints } from '@utils/date-inputs-utils';
     templateUrl: './add-edit-rule-set-dialog.component.html',
     styleUrls: ['./add-edit-rule-set-dialog.component.scss']
 })
-export class AddEditRuleSetDialogComponent {
-    ruleSetForm: FormGroup;
+export class AddEditDossierTemplateDialogComponent {
+    dossierTemplateForm: FormGroup;
     hasValidFrom: boolean;
     hasValidTo: boolean;
     downloadTypesEnum = ['ORIGINAL', 'PREVIEW', 'REDACTED'];
-    reportTypesEnum = Object.values(RuleSetModel.ReportTypesEnum);
+    reportTypesEnum = Object.values(DossierTemplateModel.ReportTypesEnum);
 
     private _previousValidFrom: Moment;
     private _previousValidTo: Moment;
@@ -25,27 +25,29 @@ export class AddEditRuleSetDialogComponent {
     constructor(
         private readonly _appStateService: AppStateService,
         private readonly _formBuilder: FormBuilder,
-        private readonly _ruleSetController: RuleSetControllerService,
-        public dialogRef: MatDialogRef<AddEditRuleSetDialogComponent>,
-        @Inject(MAT_DIALOG_DATA) public ruleSet: RuleSetModel
+        private readonly _dossierTemplateController: DossierTemplateControllerService,
+        public dialogRef: MatDialogRef<AddEditDossierTemplateDialogComponent>,
+        @Inject(MAT_DIALOG_DATA) public dossierTemplate: DossierTemplateModel
     ) {
-        this.ruleSetForm = this._formBuilder.group({
-            name: [this.ruleSet?.name, Validators.required],
-            description: [this.ruleSet?.description],
+        this.dossierTemplateForm = this._formBuilder.group({
+            name: [this.dossierTemplate?.name, Validators.required],
+            description: [this.dossierTemplate?.description],
             validFrom: [
-                this.ruleSet?.validFrom ? moment(this.ruleSet?.validFrom) : null,
+                this.dossierTemplate?.validFrom ? moment(this.dossierTemplate?.validFrom) : null,
                 this._requiredIfValidator(() => this.hasValidFrom)
             ],
             validTo: [
-                this.ruleSet?.validTo ? moment(this.ruleSet?.validTo) : null,
+                this.dossierTemplate?.validTo ? moment(this.dossierTemplate?.validTo) : null,
                 this._requiredIfValidator(() => this.hasValidTo)
             ],
             downloadFileTypes: [
-                this.ruleSet ? this.ruleSet.downloadFileTypes : ['PREVIEW', 'REDACTED']
+                this.dossierTemplate
+                    ? this.dossierTemplate.downloadFileTypes
+                    : ['PREVIEW', 'REDACTED']
             ],
             reportTypes: [
-                this.ruleSet
-                    ? this.ruleSet.reportTypes
+                this.dossierTemplate
+                    ? this.dossierTemplate.reportTypes
                     : [
                           'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE',
                           'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE',
@@ -54,46 +56,46 @@ export class AddEditRuleSetDialogComponent {
                 Validators.required
             ]
         });
-        this.hasValidFrom = !!this.ruleSet?.validFrom;
-        this.hasValidTo = !!this.ruleSet?.validTo;
+        this.hasValidFrom = !!this.dossierTemplate?.validFrom;
+        this.hasValidTo = !!this.dossierTemplate?.validTo;
 
-        this._previousValidFrom = this.ruleSetForm.get('validFrom').value;
-        this._previousValidTo = this.ruleSetForm.get('validTo').value;
+        this._previousValidFrom = this.dossierTemplateForm.get('validFrom').value;
+        this._previousValidTo = this.dossierTemplateForm.get('validTo').value;
 
-        this.ruleSetForm.valueChanges.subscribe((value) => {
+        this.dossierTemplateForm.valueChanges.subscribe((value) => {
             this._applyValidityIntervalConstraints(value);
         });
     }
 
     get changed(): boolean {
-        if (!this.ruleSet) return true;
+        if (!this.dossierTemplate) return true;
 
-        for (const key of Object.keys(this.ruleSetForm.getRawValue())) {
+        for (const key of Object.keys(this.dossierTemplateForm.getRawValue())) {
             if (key === 'validFrom') {
-                if (this.hasValidFrom !== !!this.ruleSet.validFrom) {
+                if (this.hasValidFrom !== !!this.dossierTemplate.validFrom) {
                     return true;
                 }
                 if (
                     this.hasValidFrom &&
-                    !moment(this.ruleSet.validFrom).isSame(
-                        moment(this.ruleSetForm.get('validFrom').value)
+                    !moment(this.dossierTemplate.validFrom).isSame(
+                        moment(this.dossierTemplateForm.get('validFrom').value)
                     )
                 ) {
                     return true;
                 }
             } else if (key === 'validTo') {
-                if (this.hasValidTo !== !!this.ruleSet.validTo) {
+                if (this.hasValidTo !== !!this.dossierTemplate.validTo) {
                     return true;
                 }
                 if (
                     this.hasValidTo &&
-                    !moment(this.ruleSet.validTo).isSame(
-                        moment(this.ruleSetForm.get('validTo').value)
+                    !moment(this.dossierTemplate.validTo).isSame(
+                        moment(this.dossierTemplateForm.get('validTo').value)
                     )
                 ) {
                     return true;
                 }
-            } else if (this.ruleSet[key] !== this.ruleSetForm.get(key).value) {
+            } else if (this.dossierTemplate[key] !== this.dossierTemplateForm.get(key).value) {
                 return true;
             }
         }
@@ -101,17 +103,19 @@ export class AddEditRuleSetDialogComponent {
         return false;
     }
 
-    async saveRuleSet() {
-        const ruleSet = {
-            ruleSetId: this.ruleSet?.ruleSetId,
-            ...this.ruleSetForm.getRawValue(),
-            validFrom: this.hasValidFrom ? this.ruleSetForm.get('validFrom').value : null,
-            validTo: this.hasValidTo ? this.ruleSetForm.get('validTo').value : null
+    async saveDossierTemplate() {
+        const dossierTemplate = {
+            dossierTemplateId: this.dossierTemplate?.dossierTemplateId,
+            ...this.dossierTemplateForm.getRawValue(),
+            validFrom: this.hasValidFrom ? this.dossierTemplateForm.get('validFrom').value : null,
+            validTo: this.hasValidTo ? this.dossierTemplateForm.get('validTo').value : null
         };
-        await this._ruleSetController.createOrUpdateRuleSet(ruleSet).toPromise();
-        await this._appStateService.loadAllRuleSets();
+        await this._dossierTemplateController
+            .createOrUpdateDossierTemplate(dossierTemplate)
+            .toPromise();
+        await this._appStateService.loadAllDossierTemplates();
         await this._appStateService.loadDictionaryData();
-        this.dialogRef.close({ ruleSet });
+        this.dialogRef.close({ dossierTemplate });
     }
 
     private _applyValidityIntervalConstraints(value): boolean {
@@ -120,7 +124,7 @@ export class AddEditRuleSetDialogComponent {
                 value,
                 this._previousValidFrom,
                 this._previousValidTo,
-                this.ruleSetForm,
+                this.dossierTemplateForm,
                 'validFrom',
                 'validTo'
             )
@@ -128,8 +132,8 @@ export class AddEditRuleSetDialogComponent {
             return true;
         }
 
-        this._previousValidFrom = this.ruleSetForm.get('validFrom').value;
-        this._previousValidTo = this.ruleSetForm.get('validTo').value;
+        this._previousValidFrom = this.dossierTemplateForm.get('validFrom').value;
+        this._previousValidTo = this.dossierTemplateForm.get('validTo').value;
         return false;
     }
 
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.html
index d9c834355..c2e0d3bd0 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.html
@@ -19,7 +19,7 @@
         >
             {{
                 'confirm-delete-users.' + checkbox.label
-                    | translate: { projectsCount: projectsCount }
+                    | translate: { dossiersCount: dossiersCount }
             }}
         </mat-checkbox>
     </div>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts
index 46d8c05b6..eb3b95816 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts
@@ -10,18 +10,18 @@ import { AppStateService } from '@state/app-state.service';
 })
 export class ConfirmDeleteUsersDialogComponent {
     checkboxes = [
-        { value: false, label: 'impacted-projects' },
+        { value: false, label: 'impacted-dossiers' },
         { value: false, label: 'impacted-documents.' + this.type }
     ];
     showToast = false;
-    projectsCount: number;
+    dossiersCount: number;
 
     constructor(
         @Inject(MAT_DIALOG_DATA) public users: User[],
         private readonly _appStateService: AppStateService,
         public dialogRef: MatDialogRef<ConfirmDeleteUsersDialogComponent>
     ) {
-        this.projectsCount = this._appStateService.allProjects.filter((pw) => {
+        this.dossiersCount = this._appStateService.allDossiers.filter((pw) => {
             for (const user of this.users) {
                 if (pw.memberIds.indexOf(user.userId) !== -1) {
                     return true;
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts
index cd749fb06..94d786725 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts
@@ -15,7 +15,7 @@ export class EditColorDialogComponent {
     readonly colorKey: string;
     colorForm: FormGroup;
     private readonly _initialColor: string;
-    private readonly _ruleSetId: string;
+    private readonly _dossierTemplateId: string;
 
     constructor(
         private readonly _formBuilder: FormBuilder,
@@ -24,11 +24,11 @@ export class EditColorDialogComponent {
         private readonly _translateService: TranslateService,
         public dialogRef: MatDialogRef<EditColorDialogComponent>,
         @Inject(MAT_DIALOG_DATA)
-        public data: { colors: Colors; colorKey: string; ruleSetId: string }
+        public data: { colors: Colors; colorKey: string; dossierTemplateId: string }
     ) {
         this.colors = data.colors;
         this.colorKey = data.colorKey;
-        this._ruleSetId = data.ruleSetId;
+        this._dossierTemplateId = data.dossierTemplateId;
         this._initialColor = data.colors[this.colorKey];
 
         this.colorForm = this._formBuilder.group({
@@ -47,7 +47,9 @@ export class EditColorDialogComponent {
         };
 
         try {
-            await this._dictionaryControllerService.setColors(colors, this._ruleSetId).toPromise();
+            await this._dictionaryControllerService
+                .setColors(colors, this._dossierTemplateId)
+                .toPromise();
             this.dialogRef.close(true);
             this._notificationService.showToastNotification(
                 this._translateService.instant('edit-color-dialog.success', {
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
index 183db47cc..4efcc313e 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
@@ -33,7 +33,7 @@ export interface Field {
 })
 export class FileAttributesCsvImportDialogComponent extends BaseListingComponent<Field> {
     csvFile: File;
-    ruleSetId: string;
+    dossierTemplateId: string;
     parseResult: { data: any[]; errors: any[]; meta: any; fields: Field[] };
     hoveredColumn: string;
     activeFields: Field[] = [];
@@ -56,11 +56,15 @@ export class FileAttributesCsvImportDialogComponent extends BaseListingComponent
         public dialogRef: MatDialogRef<FileAttributesCsvImportDialogComponent>,
         protected readonly _injector: Injector,
         @Inject(MAT_DIALOG_DATA)
-        public data: { csv: File; ruleSetId: string; existingConfiguration: FileAttributesConfig }
+        public data: {
+            csv: File;
+            dossierTemplateId: string;
+            existingConfiguration: FileAttributesConfig;
+        }
     ) {
         super(_injector);
         this.csvFile = data.csv;
-        this.ruleSetId = data.ruleSetId;
+        this.dossierTemplateId = data.dossierTemplateId;
 
         this.baseConfigForm = this._formBuilder.group({
             filenameMappingColumnHeaderName: [
@@ -224,7 +228,7 @@ export class FileAttributesCsvImportDialogComponent extends BaseListingComponent
 
         try {
             await this._fileAttributesControllerService
-                .setFileAttributesConfig(fileAttributes, this.ruleSetId)
+                .setFileAttributesConfig(fileAttributes, this.dossierTemplateId)
                 .toPromise();
             this._notificationService.showToastNotification(
                 this._translateService.instant('file-attributes-csv-import.save.success', {
diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
index 8dde51fe2..d1b8c2b54 100644
--- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
@@ -12,7 +12,7 @@
                     *ngIf="permissionsService.isUser()"
                     class="ml-6"
                     icon="red:close"
-                    redactionNavigateLastProjectsScreen
+                    redactionNavigateLastDossiersScreen
                     tooltip="common.close"
                     tooltipPosition="below"
                 ></redaction-circle-button>
diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
index 7a9514dd2..9e36328ce 100644
--- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
@@ -17,7 +17,7 @@
     <div class="red-content-inner">
         <div class="overlay-shadow"></div>
 
-        <redaction-admin-side-nav type="project-templates"></redaction-admin-side-nav>
+        <redaction-admin-side-nav type="dossier-templates"></redaction-admin-side-nav>
 
         <div class="content-container">
             <div class="header-item">
diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
index 79f03f9a5..738ee0761 100644
--- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
@@ -28,12 +28,14 @@ export class DefaultColorsScreenComponent extends BaseListingComponent<{
         protected readonly _injector: Injector
     ) {
         super(_injector);
-        this._appStateService.activateRuleSet(_activatedRoute.snapshot.params.ruleSetId);
+        this._appStateService.activateDossierTemplate(
+            _activatedRoute.snapshot.params.dossierTemplateId
+        );
         this._loadColors();
     }
 
-    async loadRuleSetsData(): Promise<void> {
-        await this._appStateService.loadAllRuleSets();
+    async loadDossierTemplatesData(): Promise<void> {
+        await this._appStateService.loadAllDossierTemplates();
     }
 
     openEditColorDialog($event: any, color: { key: string; value: string }) {
@@ -41,7 +43,7 @@ export class DefaultColorsScreenComponent extends BaseListingComponent<{
         this._dialogService.openEditColorsDialog(
             this._colorsObj,
             color.key,
-            this._appStateService.activeRuleSetId,
+            this._appStateService.activeDossierTemplateId,
             async () => {
                 this._loadColors();
             }
@@ -50,7 +52,7 @@ export class DefaultColorsScreenComponent extends BaseListingComponent<{
 
     private _loadColors() {
         this._dictionaryControllerService
-            .getColors(this._appStateService.activeRuleSetId)
+            .getColors(this._appStateService.activeDossierTemplateId)
             .toPromise()
             .then((data) => {
                 this._colorsObj = data;
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html
index 89b842d01..8c795c914 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html
@@ -17,7 +17,7 @@
     <div class="red-content-inner">
         <div class="overlay-shadow"></div>
 
-        <redaction-admin-side-nav type="project-templates"></redaction-admin-side-nav>
+        <redaction-admin-side-nav type="dossier-templates"></redaction-admin-side-nav>
 
         <div class="content-container">
             <div class="header-item">
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts
index f07b18611..3a013d077 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts
@@ -33,7 +33,9 @@ export class DictionaryListingScreenComponent
         protected readonly _injector: Injector
     ) {
         super(_injector);
-        this._appStateService.activateRuleSet(_activatedRoute.snapshot.params.ruleSetId);
+        this._appStateService.activateDossierTemplate(
+            _activatedRoute.snapshot.params.dossierTemplateId
+        );
     }
 
     ngOnInit(): void {
@@ -44,7 +46,7 @@ export class DictionaryListingScreenComponent
         $event?.stopPropagation();
         this._dialogService.openAddEditDictionaryDialog(
             dict,
-            this._appStateService.activeRuleSetId,
+            this._appStateService.activeDossierTemplateId,
             async (newDictionary) => {
                 if (newDictionary) {
                     await this._appStateService.loadDictionaryData();
@@ -58,7 +60,7 @@ export class DictionaryListingScreenComponent
         this._dialogService.openDeleteDictionaryDialog(
             $event,
             dict,
-            this._appStateService.activeRuleSetId,
+            this._appStateService.activeDossierTemplateId,
             async () => {
                 await this._appStateService.loadDictionaryData();
                 this._loadDictionaryData();
@@ -68,14 +70,14 @@ export class DictionaryListingScreenComponent
 
     private _loadDictionaryData() {
         const appStateDictionaryData =
-            this._appStateService.dictionaryData[this._appStateService.activeRuleSetId];
+            this._appStateService.dictionaryData[this._appStateService.activeDossierTemplateId];
         this.allEntities = Object.keys(appStateDictionaryData)
             .map((key) => appStateDictionaryData[key])
             .filter((d) => !d.virtual);
         this.displayedEntities = [...this.allEntities];
         const dataObs = this.allEntities.map((dict) =>
             this._dictionaryControllerService
-                .getDictionaryForType(this._appStateService.activeRuleSetId, dict.type)
+                .getDictionaryForType(this._appStateService.activeDossierTemplateId, dict.type)
                 .pipe(
                     tap((values) => {
                         dict.entries = values.entries ? values.entries : [];
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html
index 16300d4e3..baba8c085 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html
@@ -60,7 +60,7 @@
     <div class="flex red-content-inner">
         <div class="overlay-shadow"></div>
 
-        <redaction-admin-side-nav type="project-templates"></redaction-admin-side-nav>
+        <redaction-admin-side-nav type="dossier-templates"></redaction-admin-side-nav>
 
         <redaction-dictionary-manager
             [initialEntries]="entries"
@@ -92,7 +92,7 @@
             <div class="indicator">
                 <redaction-dictionary-annotation-icon
                     [dictionaryKey]="dictionary.hint ? 'hint' : 'redaction'"
-                    [ruleSetId]="dictionary.ruleSetId"
+                    [dossierTemplateId]="dictionary.dossierTemplateId"
                 ></redaction-dictionary-annotation-icon>
                 <div class="large-label">
                     {{ (dictionary.hint ? 'hint' : 'redaction') | translate }}
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.ts
index e952312da..9a7c08811 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.ts
@@ -36,7 +36,7 @@ export class DictionaryOverviewScreenComponent extends ComponentHasChanges imple
         super(_translateService);
         this._appStateService.activateDictionary(
             this._activatedRoute.snapshot.params.type,
-            this._activatedRoute.snapshot.params.ruleSetId
+            this._activatedRoute.snapshot.params.dossierTemplateId
         );
     }
 
@@ -56,7 +56,7 @@ export class DictionaryOverviewScreenComponent extends ComponentHasChanges imple
         $event.stopPropagation();
         this._dialogService.openAddEditDictionaryDialog(
             this.dictionary,
-            this.dictionary.ruleSetId,
+            this.dictionary.dossierTemplateId,
             async () => {
                 await this._appStateService.loadDictionaryData();
             }
@@ -67,7 +67,7 @@ export class DictionaryOverviewScreenComponent extends ComponentHasChanges imple
         this._dialogService.openDeleteDictionaryDialog(
             $event,
             this.dictionary,
-            this.dictionary.ruleSetId,
+            this.dictionary.dossierTemplateId,
             async () => {
                 await this._appStateService.loadDictionaryData();
                 this._router.navigate(['..']);
@@ -102,7 +102,7 @@ export class DictionaryOverviewScreenComponent extends ComponentHasChanges imple
             .saveEntries(
                 entries,
                 this.entries,
-                this.dictionary.ruleSetId,
+                this.dictionary.dossierTemplateId,
                 this.dictionary.type,
                 null
             )
@@ -120,7 +120,7 @@ export class DictionaryOverviewScreenComponent extends ComponentHasChanges imple
     private _loadEntries() {
         this.processing = true;
         this._dictionaryControllerService
-            .getDictionaryForType(this.dictionary.ruleSetId, this.dictionary.type)
+            .getDictionaryForType(this.dictionary.dossierTemplateId, this.dictionary.type)
             .subscribe(
                 (data) => {
                     this.processing = false;
diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html
index 4dcd2727d..18b923648 100644
--- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html
@@ -12,7 +12,7 @@
                     *ngIf="permissionsService.isUser()"
                     class="ml-6"
                     icon="red:close"
-                    redactionNavigateLastProjectsScreen
+                    redactionNavigateLastDossiersScreen
                     tooltip="common.close"
                     tooltipPosition="below"
                 ></redaction-circle-button>
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
index 534485a2d..c72079254 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
@@ -15,7 +15,7 @@
     <div class="red-content-inner">
         <div class="overlay-shadow"></div>
 
-        <redaction-admin-side-nav type="project-templates"></redaction-admin-side-nav>
+        <redaction-admin-side-nav type="dossier-templates"></redaction-admin-side-nav>
 
         <div class="content-container">
             <div class="header-item">
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
index d22b8298d..d4d0d131e 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
@@ -37,7 +37,9 @@ export class FileAttributesListingScreenComponent
         protected readonly _injector: Injector
     ) {
         super(_injector);
-        this._appStateService.activateRuleSet(_activatedRoute.snapshot.params.ruleSetId);
+        this._appStateService.activateDossierTemplate(
+            _activatedRoute.snapshot.params.dossierTemplateId
+        );
     }
 
     async ngOnInit() {
@@ -48,11 +50,14 @@ export class FileAttributesListingScreenComponent
         $event.stopPropagation();
         this._dialogService.openAddEditFileAttributeDialog(
             fileAttribute,
-            this._appStateService.activeRuleSetId,
+            this._appStateService.activeDossierTemplateId,
             async (newValue: FileAttributeConfig) => {
                 this.loading = true;
                 await this._fileAttributesService
-                    .setFileAttributesConfiguration(newValue, this._appStateService.activeRuleSetId)
+                    .setFileAttributesConfiguration(
+                        newValue,
+                        this._appStateService.activeDossierTemplateId
+                    )
                     .toPromise();
                 await this._loadData();
             }
@@ -63,13 +68,13 @@ export class FileAttributesListingScreenComponent
         $event.stopPropagation();
         this._dialogService.openConfirmDeleteFileAttributeDialog(
             fileAttribute,
-            this._appStateService.activeRuleSetId,
+            this._appStateService.activeDossierTemplateId,
             async () => {
                 this.loading = true;
                 if (fileAttribute) {
                     await this._fileAttributesService
                         .deleteFileAttribute(
-                            this._appStateService.activeRuleSetId,
+                            this._appStateService.activeDossierTemplateId,
                             fileAttribute.id
                         )
                         .toPromise();
@@ -77,7 +82,7 @@ export class FileAttributesListingScreenComponent
                     await this._fileAttributesService
                         .deleteFileAttributes(
                             this.selectedEntitiesIds,
-                            this._appStateService.activeRuleSetId
+                            this._appStateService.activeDossierTemplateId
                         )
                         .toPromise();
                 }
@@ -92,7 +97,7 @@ export class FileAttributesListingScreenComponent
 
         this._dialogService.openImportFileAttributeCSVDialog(
             csvFile,
-            this._appStateService.activeRuleSetId,
+            this._appStateService.activeDossierTemplateId,
             this._existingConfiguration,
             async () => {
                 await this._loadData();
@@ -103,7 +108,7 @@ export class FileAttributesListingScreenComponent
     private async _loadData() {
         try {
             const response = await this._fileAttributesService
-                .getFileAttributesConfiguration(this._appStateService.activeRuleSetId)
+                .getFileAttributesConfiguration(this._appStateService.activeDossierTemplateId)
                 .toPromise();
             this._existingConfiguration = response;
             this.allEntities = response?.fileAttributeConfigs || [];
diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html
index dd4692bc2..9a1ef08de 100644
--- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html
@@ -18,7 +18,7 @@
                     *ngIf="permissionsService.isUser()"
                     class="ml-6"
                     icon="red:close"
-                    redactionNavigateLastProjectsScreen
+                    redactionNavigateLastDossiersScreen
                     tooltip="common.close"
                     tooltipPosition="below"
                 ></redaction-circle-button>
diff --git a/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.html
index d4d946aff..f0052b2db 100644
--- a/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.html
@@ -5,12 +5,12 @@
 
     <div>
         <div class="page-header">
-            <div class="breadcrumb" translate="project-templates"></div>
+            <div class="breadcrumb" translate="dossier-templates"></div>
 
             <redaction-circle-button
                 *ngIf="permissionsService.isUser()"
                 icon="red:close"
-                redactionNavigateLastProjectsScreen
+                redactionNavigateLastDossiersScreen
                 tooltip="common.close"
                 tooltipPosition="below"
             ></redaction-circle-button>
@@ -29,7 +29,7 @@
 
                     <span class="all-caps-label">
                         {{
-                            'project-templates-listing.table-header.title'
+                            'dossier-templates-listing.table-header.title'
                                 | translate: { length: displayedEntities.length }
                         }}
                     </span>
@@ -37,17 +37,17 @@
                     <div class="actions flex-1">
                         <redaction-search-input
                             [form]="searchForm"
-                            [placeholder]="'project-templates-listing.search'"
+                            [placeholder]="'dossier-templates-listing.search'"
                         ></redaction-search-input>
 
                         <redaction-icon-button
-                            (action)="openAddRuleSetDialog()"
+                            (action)="openAddDossierTemplateDialog()"
                             *ngIf="
                                 permissionsService.isAdmin() &&
                                 userPreferenceService.areDevFeaturesEnabled
                             "
                             icon="red:plus"
-                            text="project-templates-listing.add-new"
+                            text="dossier-templates-listing.add-new"
                             type="primary"
                         ></redaction-icon-button>
                     </div>
@@ -65,25 +65,25 @@
                         [activeSortingOption]="sortingOption"
                         [withSort]="true"
                         column="name"
-                        label="project-templates-listing.table-col-names.name"
+                        label="dossier-templates-listing.table-col-names.name"
                     ></redaction-table-col-name>
                     <redaction-table-col-name
                         class="user-column"
-                        label="project-templates-listing.table-col-names.created-by"
+                        label="dossier-templates-listing.table-col-names.created-by"
                     ></redaction-table-col-name>
                     <redaction-table-col-name
                         (toggleSort)="toggleSort($event)"
                         [activeSortingOption]="sortingOption"
                         [withSort]="true"
                         column="dateAdded"
-                        label="project-templates-listing.table-col-names.created-on"
+                        label="dossier-templates-listing.table-col-names.created-on"
                     ></redaction-table-col-name>
                     <redaction-table-col-name
                         (toggleSort)="toggleSort($event)"
                         [activeSortingOption]="sortingOption"
                         [withSort]="true"
                         column="dateModified"
-                        label="project-templates-listing.table-col-names.modified-on"
+                        label="dossier-templates-listing.table-col-names.modified-on"
                     ></redaction-table-col-name>
                     <div class="scrollbar-placeholder"></div>
                 </div>
@@ -91,43 +91,44 @@
                 <redaction-empty-state
                     *ngIf="!allEntities.length"
                     icon="red:template"
-                    screen="project-templates-listing"
+                    screen="dossier-templates-listing"
                 ></redaction-empty-state>
 
                 <redaction-empty-state
                     *ngIf="allEntities.length && !displayedEntities.length"
-                    screen="project-templates-listing"
+                    screen="dossier-templates-listing"
                     type="no-match"
                 ></redaction-empty-state>
 
                 <cdk-virtual-scroll-viewport [itemSize]="100" redactionHasScrollbar>
                     <div
                         *cdkVirtualFor="
-                            let ruleSet of displayedEntities
+                            let dossierTemplate of displayedEntities
                                 | sortBy: sortingOption.order:sortingOption.column
                         "
-                        [routerLink]="[ruleSet.ruleSetId, 'dictionaries']"
+                        [routerLink]="[dossierTemplate.dossierTemplateId, 'dictionaries']"
                         class="table-item pointer"
                     >
                         <div
-                            (click)="toggleEntitySelected($event, ruleSet)"
+                            (click)="toggleEntitySelected($event, dossierTemplate)"
                             class="selection-column"
                         >
                             <redaction-round-checkbox
-                                [active]="isEntitySelected(ruleSet)"
+                                [active]="isEntitySelected(dossierTemplate)"
                             ></redaction-round-checkbox>
                         </div>
 
                         <div>
                             <div class="table-item-title heading">
-                                {{ ruleSet.name }}
+                                {{ dossierTemplate.name }}
                             </div>
                             <div class="small-label stats-subtitle">
                                 <div>
                                     <mat-icon svgIcon="red:dictionary"></mat-icon>
                                     {{
-                                        'project-templates-listing.dictionaries'
-                                            | translate: { length: ruleSet.dictionariesCount }
+                                        'dossier-templates-listing.dictionaries'
+                                            | translate
+                                                : { length: dossierTemplate.dictionariesCount }
                                     }}
                                 </div>
                             </div>
@@ -135,21 +136,21 @@
 
                         <div class="user-column">
                             <redaction-initials-avatar
-                                [userId]="ruleSet.createdBy"
+                                [userId]="dossierTemplate.createdBy"
                                 [withName]="true"
                             ></redaction-initials-avatar>
                         </div>
                         <div class="small-label">
-                            {{ ruleSet.dateAdded | date: 'd MMM. yyyy' }}
+                            {{ dossierTemplate.dateAdded | date: 'd MMM. yyyy' }}
                         </div>
                         <div>
                             <div class="small-label">
-                                {{ ruleSet.dateModified | date: 'd MMM. yyyy' }}
+                                {{ dossierTemplate.dateModified | date: 'd MMM. yyyy' }}
                             </div>
 
                             <redaction-rule-set-actions
-                                (loadRuleSetsData)="loadRuleSetsData()"
-                                [ruleSetId]="ruleSet.ruleSetId"
+                                (loadDossierTemplatesData)="loadDossierTemplatesData()"
+                                [dossierTemplateId]="dossierTemplate.dossierTemplateId"
                                 class="actions-container"
                             ></redaction-rule-set-actions>
                         </div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.ts
index f81ffe5b5..c18769eff 100644
--- a/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.ts
@@ -4,19 +4,19 @@ import { PermissionsService } from '@services/permissions.service';
 import { UserPreferenceService } from '@services/user-preference.service';
 import { AdminDialogService } from '../../services/admin-dialog.service';
 import { BaseListingComponent } from '@shared/base/base-listing.component';
-import { RuleSetModel } from '@redaction/red-ui-http';
+import { DossierTemplateModel } from '@redaction/red-ui-http';
 
 @Component({
     selector: 'redaction-rule-sets-listing-screen',
     templateUrl: './rule-sets-listing-screen.component.html',
     styleUrls: ['./rule-sets-listing-screen.component.scss']
 })
-export class RuleSetsListingScreenComponent
-    extends BaseListingComponent<RuleSetModel>
+export class DossierTemplatesListingScreenComponent
+    extends BaseListingComponent<DossierTemplateModel>
     implements OnInit
 {
     protected readonly _searchKey = 'name';
-    protected readonly _selectionKey = 'ruleSetId';
+    protected readonly _selectionKey = 'dossierTemplateId';
     protected readonly _sortKey = 'rule-sets-listing';
 
     constructor(
@@ -30,27 +30,27 @@ export class RuleSetsListingScreenComponent
     }
 
     ngOnInit(): void {
-        this.loadRuleSetsData();
+        this.loadDossierTemplatesData();
     }
 
-    loadRuleSetsData() {
+    loadDossierTemplatesData() {
         this._appStateService.reset();
-        this.allEntities = this._appStateService.ruleSets;
+        this.allEntities = this._appStateService.dossierTemplates;
         this._executeSearchImmediately();
-        this._loadRuleSetStats();
+        this._loadDossierTemplateStats();
     }
 
-    openAddRuleSetDialog() {
-        this._dialogService.openAddEditRuleSetDialog(null, async (newRuleSet) => {
-            if (newRuleSet) {
-                this.loadRuleSetsData();
+    openAddDossierTemplateDialog() {
+        this._dialogService.openAddEditDossierTemplateDialog(null, async (newDossierTemplate) => {
+            if (newDossierTemplate) {
+                this.loadDossierTemplatesData();
             }
         });
     }
 
-    private _loadRuleSetStats() {
+    private _loadDossierTemplateStats() {
         this.allEntities.forEach((rs) => {
-            const dictionaries = this._appStateService.dictionaryData[rs.ruleSetId];
+            const dictionaries = this._appStateService.dictionaryData[rs.dossierTemplateId];
             if (dictionaries) {
                 rs.dictionariesCount = Object.keys(dictionaries)
                     .map((key) => dictionaries[key])
diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html
index c04706a24..9d893b189 100644
--- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html
@@ -17,7 +17,7 @@
     <div class="red-content-inner">
         <div class="overlay-shadow"></div>
 
-        <redaction-admin-side-nav type="project-templates"></redaction-admin-side-nav>
+        <redaction-admin-side-nav type="dossier-templates"></redaction-admin-side-nav>
 
         <div class="editor-container">
             <ngx-monaco-editor
diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.ts
index 053d1452e..e8806a54e 100644
--- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.ts
@@ -44,7 +44,9 @@ export class RulesScreenComponent extends ComponentHasChanges {
         private readonly _activatedRoute: ActivatedRoute
     ) {
         super(_translateService);
-        this._appStateService.activateRuleSet(_activatedRoute.snapshot.params.ruleSetId);
+        this._appStateService.activateDossierTemplate(
+            _activatedRoute.snapshot.params.dossierTemplateId
+        );
         this._initialize();
     }
 
@@ -101,7 +103,7 @@ export class RulesScreenComponent extends ComponentHasChanges {
         this._rulesControllerService
             .uploadRules({
                 rules: this._codeEditor.getModel().getValue(),
-                ruleSetId: this._appStateService.activeRuleSetId
+                dossierTemplateId: this._appStateService.activeDossierTemplateId
             })
             .subscribe(
                 () => {
@@ -151,12 +153,14 @@ export class RulesScreenComponent extends ComponentHasChanges {
     }
 
     private _initialize() {
-        this._rulesControllerService.downloadRules(this._appStateService.activeRuleSetId).subscribe(
-            (rules) => {
-                this.currentLines = this.initialLines = rules.rules.split('\n');
-                this.revert();
-            },
-            () => (this.processing = false)
-        );
+        this._rulesControllerService
+            .downloadRules(this._appStateService.activeDossierTemplateId)
+            .subscribe(
+                (rules) => {
+                    this.currentLines = this.initialLines = rules.rules.split('\n');
+                    this.revert();
+                },
+                () => (this.processing = false)
+            );
     }
 }
diff --git a/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.html
index ebb986f5f..0f0bd198d 100644
--- a/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.html
@@ -12,7 +12,7 @@
                     *ngIf="permissionsService.isUser()"
                     class="ml-6"
                     icon="red:close"
-                    redactionNavigateLastProjectsScreen
+                    redactionNavigateLastDossiersScreen
                     tooltip="common.close"
                     tooltipPosition="below"
                 ></redaction-circle-button>
diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
index 297852b3c..257f3a5f1 100644
--- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
@@ -23,7 +23,7 @@
                     *ngIf="permissionsService.isUser()"
                     class="ml-6"
                     icon="red:close"
-                    redactionNavigateLastProjectsScreen
+                    redactionNavigateLastDossiersScreen
                     tooltip="common.close"
                     tooltipPosition="below"
                 ></redaction-circle-button>
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html
index 5ad2ec3a3..2d04e13e9 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html
@@ -15,7 +15,7 @@
     <div class="red-content-inner">
         <div class="overlay-shadow"></div>
 
-        <redaction-admin-side-nav type="project-templates"></redaction-admin-side-nav>
+        <redaction-admin-side-nav type="dossier-templates"></redaction-admin-side-nav>
 
         <div class="content-container">
             <div #viewer class="viewer"></div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts
index 6d40b9cbe..209051962 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts
@@ -47,7 +47,9 @@ export class WatermarkScreenComponent implements OnInit {
         private readonly _formBuilder: FormBuilder,
         private readonly _activatedRoute: ActivatedRoute
     ) {
-        this.appStateService.activateRuleSet(_activatedRoute.snapshot.params.ruleSetId);
+        this.appStateService.activateDossierTemplate(
+            _activatedRoute.snapshot.params.dossierTemplateId
+        );
         this._initForm();
     }
 
@@ -80,10 +82,10 @@ export class WatermarkScreenComponent implements OnInit {
         const observable = watermark.text
             ? this._watermarkControllerService.saveWatermark(
                   watermark,
-                  this.appStateService.activeRuleSetId
+                  this.appStateService.activeDossierTemplateId
               )
             : this._watermarkControllerService.deleteWatermark(
-                  this.appStateService.activeRuleSetId
+                  this.appStateService.activeDossierTemplateId
               );
 
         observable.subscribe(
@@ -125,7 +127,7 @@ export class WatermarkScreenComponent implements OnInit {
 
     private _loadWatermark() {
         this._watermarkControllerService
-            .getWatermark(this.appStateService.activeRuleSetId)
+            .getWatermark(this.appStateService.activeDossierTemplateId)
             .subscribe(
                 (watermark) => {
                     this._watermark = watermark;
diff --git a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts
index fa5d22c68..de38f97a1 100644
--- a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts
+++ b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts
@@ -7,15 +7,15 @@ import {
     FileAttributesConfig,
     FileManagementControllerService,
     ManualRedactionControllerService,
-    RuleSetControllerService,
-    RuleSetModel,
+    DossierTemplateControllerService,
+    DossierTemplateModel,
     SMTPConfigurationModel,
     TypeValue,
     User
 } from '@redaction/red-ui-http';
 import { AddEditFileAttributeDialogComponent } from '../dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component';
 import { AddEditDictionaryDialogComponent } from '../dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component';
-import { AddEditRuleSetDialogComponent } from '../dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component';
+import { AddEditDossierTemplateDialogComponent } from '../dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component';
 import { NotificationService } from '@services/notification.service';
 import { ConfirmationDialogComponent } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component';
 import { AppStateService } from '@state/app-state.service';
@@ -46,7 +46,7 @@ export class AdminDialogService {
         private readonly _dialog: MatDialog,
         private readonly _translateService: TranslateService,
         private readonly _appStateService: AppStateService,
-        private readonly _ruleSetControllerService: RuleSetControllerService,
+        private readonly _dossierTemplateControllerService: DossierTemplateControllerService,
         private readonly _dictionaryControllerService: DictionaryControllerService,
         private readonly _fileManagementControllerService: FileManagementControllerService,
         private readonly _notificationService: NotificationService,
@@ -56,7 +56,7 @@ export class AdminDialogService {
     openDeleteDictionaryDialog(
         $event: MouseEvent,
         dictionary: TypeValue,
-        ruleSetId: string,
+        dossierTemplateId: string,
         cb?: Function
     ): MatDialogRef<ConfirmationDialogComponent> {
         $event.stopPropagation();
@@ -64,7 +64,7 @@ export class AdminDialogService {
         ref.afterClosed().subscribe(async (result) => {
             if (result) {
                 await this._dictionaryControllerService
-                    .deleteType(dictionary.type, ruleSetId)
+                    .deleteType(dictionary.type, dossierTemplateId)
                     .toPromise();
                 if (cb) cb();
             }
@@ -72,16 +72,18 @@ export class AdminDialogService {
         return ref;
     }
 
-    openDeleteRuleSetDialog(
+    openDeleteDossierTemplateDialog(
         $event: MouseEvent,
-        ruleSet: RuleSetModel,
+        dossierTemplate: DossierTemplateModel,
         cb?: Function
     ): MatDialogRef<ConfirmationDialogComponent> {
         $event.stopPropagation();
         const ref = this._dialog.open(ConfirmationDialogComponent, dialogConfig);
         ref.afterClosed().subscribe(async (result) => {
             if (result) {
-                await this._ruleSetControllerService.getAllRuleSets(ruleSet.ruleSetId).toPromise();
+                await this._dossierTemplateControllerService
+                    .getAllDossierTemplates(dossierTemplate.dossierTemplateId)
+                    .toPromise();
                 if (cb) await cb();
             }
         });
@@ -90,12 +92,12 @@ export class AdminDialogService {
 
     openAddEditDictionaryDialog(
         dictionary: TypeValue,
-        ruleSetId: string,
+        dossierTemplateId: string,
         cb?: Function
     ): MatDialogRef<AddEditDictionaryDialogComponent> {
         const ref = this._dialog.open(AddEditDictionaryDialogComponent, {
             ...dialogConfig,
-            data: { dictionary, ruleSetId },
+            data: { dictionary, dossierTemplateId },
             autoFocus: true
         });
 
@@ -111,12 +113,12 @@ export class AdminDialogService {
     openEditColorsDialog(
         colors: Colors,
         colorKey: string,
-        ruleSetId: string,
+        dossierTemplateId: string,
         cb?: Function
     ): MatDialogRef<EditColorDialogComponent> {
         const ref = this._dialog.open(EditColorDialogComponent, {
             ...dialogConfig,
-            data: { colors, colorKey, ruleSetId },
+            data: { colors, colorKey, dossierTemplateId },
             autoFocus: true
         });
 
@@ -129,14 +131,14 @@ export class AdminDialogService {
         return ref;
     }
 
-    openAddEditRuleSetDialog(
-        ruleSet: RuleSetModel,
+    openAddEditDossierTemplateDialog(
+        dossierTemplate: DossierTemplateModel,
         cb?: Function
-    ): MatDialogRef<AddEditRuleSetDialogComponent> {
-        const ref = this._dialog.open(AddEditRuleSetDialogComponent, {
+    ): MatDialogRef<AddEditDossierTemplateDialogComponent> {
+        const ref = this._dialog.open(AddEditDossierTemplateDialogComponent, {
             ...dialogConfig,
             width: '900px',
-            data: ruleSet,
+            data: dossierTemplate,
             autoFocus: true
         });
 
@@ -151,13 +153,13 @@ export class AdminDialogService {
 
     openImportFileAttributeCSVDialog(
         csv: File,
-        ruleSetId: string,
+        dossierTemplateId: string,
         existingConfiguration: FileAttributesConfig,
         cb?: Function
     ): MatDialogRef<FileAttributesCsvImportDialogComponent> {
         const ref = this._dialog.open(FileAttributesCsvImportDialogComponent, {
             ...largeDialogConfig,
-            data: { csv, ruleSetId, existingConfiguration }
+            data: { csv, dossierTemplateId, existingConfiguration }
         });
 
         ref.afterClosed().subscribe((result) => {
@@ -171,12 +173,12 @@ export class AdminDialogService {
 
     openAddEditFileAttributeDialog(
         fileAttribute: FileAttributeConfig,
-        ruleSetId: string,
+        dossierTemplateId: string,
         cb?: Function
     ): MatDialogRef<AddEditFileAttributeDialogComponent> {
         const ref = this._dialog.open(AddEditFileAttributeDialogComponent, {
             ...dialogConfig,
-            data: { fileAttribute, ruleSetId },
+            data: { fileAttribute, dossierTemplateId },
             autoFocus: true
         });
 
@@ -191,7 +193,7 @@ export class AdminDialogService {
 
     openConfirmDeleteFileAttributeDialog(
         fileAttribute: FileAttributeConfig,
-        ruleSetId: string,
+        dossierTemplateId: string,
         cb?: Function
     ): MatDialogRef<ConfirmDeleteFileAttributeDialogComponent> {
         const ref = this._dialog.open(ConfirmDeleteFileAttributeDialogComponent, {
diff --git a/apps/red-ui/src/app/modules/auth/red-role.guard.ts b/apps/red-ui/src/app/modules/auth/red-role.guard.ts
index 1d9dfecc4..5fcf390a7 100644
--- a/apps/red-ui/src/app/modules/auth/red-role.guard.ts
+++ b/apps/red-ui/src/app/modules/auth/red-role.guard.ts
@@ -35,7 +35,7 @@ export class RedRoleGuard implements CanActivate {
                     return;
                 }
 
-                if (!this._userService.isUser() && state.url.startsWith('/main/projects')) {
+                if (!this._userService.isUser() && state.url.startsWith('/main/dossiers')) {
                     this._router.navigate(['/main/admin']);
                     obs.next(false);
                     obs.complete();
@@ -46,7 +46,7 @@ export class RedRoleGuard implements CanActivate {
                         obs.next(true);
                         obs.complete();
                     } else {
-                        this._router.navigate(['/main/projects']);
+                        this._router.navigate(['/main/dossiers']);
                         obs.next(false);
                         obs.complete();
                     }
diff --git a/apps/red-ui/src/app/modules/projects/components/bulk-actions/project-overview-bulk-actions.component.html b/apps/red-ui/src/app/modules/projects/components/bulk-actions/project-overview-bulk-actions.component.html
index bafe79c00..a1f8f4a46 100644
--- a/apps/red-ui/src/app/modules/projects/components/bulk-actions/project-overview-bulk-actions.component.html
+++ b/apps/red-ui/src/app/modules/projects/components/bulk-actions/project-overview-bulk-actions.component.html
@@ -3,7 +3,7 @@
         (action)="delete()"
         *ngIf="canDelete"
         icon="red:trash"
-        tooltip="project-overview.bulk.delete"
+        tooltip="dossier-overview.bulk.delete"
         type="dark-bg"
     ></redaction-circle-button>
 
@@ -19,7 +19,7 @@
         (action)="assignToMe()"
         *ngIf="canAssignToSelf"
         icon="red:assign-me"
-        tooltip="project-overview.assign-me"
+        tooltip="dossier-overview.assign-me"
         type="dark-bg"
     >
     </redaction-circle-button>
@@ -28,7 +28,7 @@
         (action)="setToUnderApproval()"
         *ngIf="canSetToUnderApproval"
         icon="red:ready-for-approval"
-        tooltip="project-overview.under-approval"
+        tooltip="dossier-overview.under-approval"
         type="dark-bg"
     >
     </redaction-circle-button>
@@ -37,14 +37,14 @@
         (action)="setToUnderReview()"
         *ngIf="canSetToUnderReview"
         icon="red:undo"
-        tooltip="project-overview.under-review"
+        tooltip="dossier-overview.under-review"
         type="dark-bg"
     >
     </redaction-circle-button>
 
     <redaction-file-download-btn
         [file]="selectedFiles"
-        [project]="project"
+        [dossier]="dossier"
     ></redaction-file-download-btn>
 
     <!-- Approved-->
@@ -52,7 +52,7 @@
         (action)="approveDocuments()"
         *ngIf="isReadyForApproval"
         [disabled]="!canApprove"
-        [tooltip]="canApprove ? 'project-overview.approve' : 'project-overview.approve-disabled'"
+        [tooltip]="canApprove ? 'dossier-overview.approve' : 'dossier-overview.approve-disabled'"
         icon="red:approved"
         type="dark-bg"
     >
@@ -63,7 +63,7 @@
         (action)="setToUnderApproval()"
         *ngIf="canUndoApproval"
         icon="red:undo"
-        tooltip="project-overview.under-approval"
+        tooltip="dossier-overview.under-approval"
         type="dark-bg"
     >
     </redaction-circle-button>
@@ -72,7 +72,7 @@
         (action)="ocr()"
         *ngIf="canOcr"
         icon="red:ocr"
-        tooltip="project-overview.ocr-file"
+        tooltip="dossier-overview.ocr-file"
         type="dark-bg"
     ></redaction-circle-button>
 
@@ -80,7 +80,7 @@
         (action)="reanalyse()"
         *ngIf="canReanalyse"
         icon="red:refresh"
-        tooltip="project-overview.bulk.reanalyse"
+        tooltip="dossier-overview.bulk.reanalyse"
         type="dark-bg"
     ></redaction-circle-button>
 </ng-container>
diff --git a/apps/red-ui/src/app/modules/projects/components/bulk-actions/project-overview-bulk-actions.component.ts b/apps/red-ui/src/app/modules/projects/components/bulk-actions/project-overview-bulk-actions.component.ts
index 83b7a9287..d3b1ca069 100644
--- a/apps/red-ui/src/app/modules/projects/components/bulk-actions/project-overview-bulk-actions.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/bulk-actions/project-overview-bulk-actions.component.ts
@@ -10,14 +10,14 @@ import { FileStatusWrapper } from '@models/file/file-status.wrapper';
 import { FileActionService } from '../../services/file-action.service';
 import { from, Observable } from 'rxjs';
 import { StatusOverlayService } from '@upload-download/services/status-overlay.service';
-import { ProjectsDialogService } from '../../services/projects-dialog.service';
+import { DossiersDialogService } from '../../services/dossiers-dialog.service';
 
 @Component({
-    selector: 'redaction-project-overview-bulk-actions',
-    templateUrl: './project-overview-bulk-actions.component.html',
-    styleUrls: ['./project-overview-bulk-actions.component.scss']
+    selector: 'redaction-dossier-overview-bulk-actions',
+    templateUrl: './dossier-overview-bulk-actions.component.html',
+    styleUrls: ['./dossier-overview-bulk-actions.component.scss']
 })
-export class ProjectOverviewBulkActionsComponent {
+export class DossierOverviewBulkActionsComponent {
     @Input()
     selectedFileIds: string[];
     @Output()
@@ -28,7 +28,7 @@ export class ProjectOverviewBulkActionsComponent {
     constructor(
         private readonly _appStateService: AppStateService,
         private readonly _userService: UserService,
-        private readonly _dialogService: ProjectsDialogService,
+        private readonly _dialogService: DossiersDialogService,
         private readonly _fileManagementControllerService: FileManagementControllerService,
         private readonly _reanalysisControllerService: ReanalysisControllerService,
         private readonly _permissionsService: PermissionsService,
@@ -37,14 +37,14 @@ export class ProjectOverviewBulkActionsComponent {
         private readonly _changeDetectorRef: ChangeDetectorRef
     ) {}
 
-    get project() {
-        return this._appStateService?.activeProject;
+    get dossier() {
+        return this._appStateService?.activeDossier;
     }
 
     get selectedFiles(): FileStatusWrapper[] {
         return this.selectedFileIds.map((fileId) =>
             this._appStateService.getFileById(
-                this._appStateService.activeProject.project.projectId,
+                this._appStateService.activeDossier.dossier.dossierId,
                 fileId
             )
         );
@@ -52,8 +52,8 @@ export class ProjectOverviewBulkActionsComponent {
 
     get areAllFilesSelected() {
         return (
-            this._appStateService.activeProject.files.length !== 0 &&
-            this.selectedFileIds.length === this._appStateService.activeProject.files.length
+            this._appStateService.activeDossier.files.length !== 0 &&
+            this.selectedFileIds.length === this._appStateService.activeDossier.files.length
         );
     }
 
@@ -167,15 +167,15 @@ export class ProjectOverviewBulkActionsComponent {
             true
         );
         return allFilesAreUnderApproval
-            ? 'project-overview.assign-approver'
-            : 'project-overview.assign-reviewer';
+            ? 'dossier-overview.assign-approver'
+            : 'dossier-overview.assign-reviewer';
     }
 
     delete() {
         this.loading = true;
         this._dialogService.openDeleteFilesDialog(
             null,
-            this._appStateService.activeProjectId,
+            this._appStateService.activeDossierId,
             this.selectedFileIds,
             () => {
                 this.reload.emit();
@@ -187,10 +187,10 @@ export class ProjectOverviewBulkActionsComponent {
 
     setToUnderApproval() {
         // If more than 1 approver - show dialog and ask who to assign
-        if (this._appStateService.activeProject.approverIds.length > 1) {
+        if (this._appStateService.activeDossier.approverIds.length > 1) {
             this.loading = true;
             const files = this.selectedFileIds.map((fileId) =>
-                this._appStateService.getFileById(this._appStateService.activeProjectId, fileId)
+                this._appStateService.getFileById(this._appStateService.activeDossierId, fileId)
             );
 
             this._dialogService.openAssignFileToUserDialog(
@@ -206,7 +206,7 @@ export class ProjectOverviewBulkActionsComponent {
             this._performBulkAction(
                 this._fileActionService.setFileUnderApproval(
                     this.selectedFiles,
-                    this._appStateService.activeProject.approverIds[0]
+                    this._appStateService.activeDossier.approverIds[0]
                 )
             );
         }
@@ -217,9 +217,9 @@ export class ProjectOverviewBulkActionsComponent {
             .filter((file) => this._permissionsService.fileRequiresReanalysis(file))
             .map((file) => file.fileId);
         this._performBulkAction(
-            this._reanalysisControllerService.reanalyzeFilesForProject(
+            this._reanalysisControllerService.reanalyzeFilesForDossier(
                 fileIds,
-                this._appStateService.activeProject.projectId
+                this._appStateService.activeDossier.dossierId
             )
         );
     }
@@ -251,7 +251,7 @@ export class ProjectOverviewBulkActionsComponent {
     assign() {
         this.loading = true;
         const files = this.selectedFileIds.map((fileId) =>
-            this._appStateService.getFileById(this._appStateService.activeProjectId, fileId)
+            this._appStateService.getFileById(this._appStateService.activeDossierId, fileId)
         );
 
         const mode = files[0].isUnderApproval ? 'approver' : 'reviewer';
diff --git a/apps/red-ui/src/app/modules/projects/components/document-info/document-info.component.html b/apps/red-ui/src/app/modules/projects/components/document-info/document-info.component.html
index afea53c5d..b45eaf546 100644
--- a/apps/red-ui/src/app/modules/projects/components/document-info/document-info.component.html
+++ b/apps/red-ui/src/app/modules/projects/components/document-info/document-info.component.html
@@ -27,8 +27,8 @@
         <div>
             <mat-icon svgIcon="red:folder"></mat-icon>
             <span>{{
-                'file-preview.tabs.document-info.details.project'
-                    | translate: { projectName: project.name }
+                'file-preview.tabs.document-info.details.dossier'
+                    | translate: { dossierName: dossier.name }
             }}</span>
         </div>
         <div>
@@ -45,16 +45,16 @@
                     | translate: { date: file.added | date: 'mediumDate' }
             }}</span>
         </div>
-        <div *ngIf="project.project.dueDate">
+        <div *ngIf="dossier.dossier.dueDate">
             <mat-icon svgIcon="red:lightning"></mat-icon>
             <span>{{
                 'file-preview.tabs.document-info.details.due'
-                    | translate: { date: project.project.dueDate | date: 'mediumDate' }
+                    | translate: { date: dossier.dossier.dueDate | date: 'mediumDate' }
             }}</span>
         </div>
         <div>
             <mat-icon svgIcon="red:template"></mat-icon>
-            {{ ruleSetName }}
+            {{ dossierTemplateName }}
         </div>
     </div>
 </div>
diff --git a/apps/red-ui/src/app/modules/projects/components/document-info/document-info.component.ts b/apps/red-ui/src/app/modules/projects/components/document-info/document-info.component.ts
index 5c3b73055..ff0d6ea2a 100644
--- a/apps/red-ui/src/app/modules/projects/components/document-info/document-info.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/document-info/document-info.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { FileAttributesConfig, FileStatus } from '@redaction/red-ui-http';
 import { AppStateService } from '@state/app-state.service';
-import { ProjectsDialogService } from '../../services/projects-dialog.service';
+import { DossiersDialogService } from '../../services/dossiers-dialog.service';
 
 @Component({
     selector: 'redaction-document-info',
@@ -16,17 +16,17 @@ export class DocumentInfoComponent {
 
     constructor(
         private readonly _appStateService: AppStateService,
-        private readonly _dialogService: ProjectsDialogService
+        private readonly _dialogService: DossiersDialogService
     ) {
         this.fileAttributesConfig = this._appStateService.activeFileAttributesConfig;
     }
 
-    get project() {
-        return this._appStateService.getProjectById(this.file.projectId);
+    get dossier() {
+        return this._appStateService.getDossierById(this.file.dossierId);
     }
 
-    get ruleSetName(): string {
-        return this._appStateService.getRuleSetById(this.project.ruleSetId).name;
+    get dossierTemplateName(): string {
+        return this._appStateService.getDossierTemplateById(this.dossier.dossierTemplateId).name;
     }
 
     edit() {
diff --git a/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.html
index ad86243aa..9346ea6d7 100644
--- a/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.html
+++ b/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="screen === 'project-overview'" [class.active]="actionMenuOpen" class="action-buttons">
+<div *ngIf="screen === 'dossier-overview'" [class.active]="actionMenuOpen" class="action-buttons">
     <ng-container *ngTemplateOutlet="actions"></ng-container>
     <redaction-status-bar
         *ngIf="fileStatus.isWorkable"
@@ -24,13 +24,13 @@
             [tooltipPosition]="tooltipPosition"
             [type]="buttonType"
             icon="red:trash"
-            tooltip="project-overview.delete.action"
+            tooltip="dossier-overview.delete.action"
         >
         </redaction-circle-button>
 
         <redaction-circle-button
             (action)="assign($event)"
-            *ngIf="canAssign && screen === 'project-overview'"
+            *ngIf="canAssign && screen === 'dossier-overview'"
             icon="red:assign"
             [tooltip]="assignTooltip"
             [tooltipPosition]="tooltipPosition"
@@ -39,9 +39,9 @@
 
         <redaction-circle-button
             (action)="assignToMe($event)"
-            *ngIf="canAssignToSelf && screen === 'project-overview'"
+            *ngIf="canAssignToSelf && screen === 'dossier-overview'"
             icon="red:assign-me"
-            tooltip="project-overview.assign-me"
+            tooltip="dossier-overview.assign-me"
             [tooltipPosition]="tooltipPosition"
             [type]="buttonType"
         >
@@ -50,7 +50,7 @@
         <!-- download redacted file-->
         <redaction-file-download-btn
             [file]="fileStatus"
-            [project]="appStateService.activeProject"
+            [dossier]="appStateService.activeDossier"
             [tooltipClass]="'small'"
             [tooltipPosition]="tooltipPosition"
             [type]="buttonType"
@@ -73,7 +73,7 @@
             [tooltipPosition]="tooltipPosition"
             [type]="buttonType"
             icon="red:ready-for-approval"
-            tooltip="project-overview.under-approval"
+            tooltip="dossier-overview.under-approval"
         >
         </redaction-circle-button>
 
@@ -84,7 +84,7 @@
             [tooltipPosition]="tooltipPosition"
             [type]="buttonType"
             icon="red:undo"
-            tooltip="project-overview.under-review"
+            tooltip="dossier-overview.under-review"
         >
         </redaction-circle-button>
 
@@ -96,8 +96,8 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="
                 permissionsService.canApprove(fileStatus)
-                    ? 'project-overview.approve'
-                    : 'project-overview.approve-disabled'
+                    ? 'dossier-overview.approve'
+                    : 'dossier-overview.approve-disabled'
             "
             [type]="buttonType"
             icon="red:approved"
@@ -111,7 +111,7 @@
             [tooltipPosition]="tooltipPosition"
             [type]="buttonType"
             icon="red:undo"
-            tooltip="project-overview.under-approval"
+            tooltip="dossier-overview.under-approval"
         >
         </redaction-circle-button>
 
@@ -121,7 +121,7 @@
             [tooltipPosition]="tooltipPosition"
             [type]="buttonType"
             icon="red:ocr"
-            tooltip="project-overview.ocr-file"
+            tooltip="dossier-overview.ocr-file"
         >
         </redaction-circle-button>
 
@@ -140,10 +140,10 @@
         <!-- reanalyse file listing -->
         <redaction-circle-button
             (action)="reanalyseFile($event)"
-            *ngIf="canReanalyse && screen === 'project-overview'"
+            *ngIf="canReanalyse && screen === 'dossier-overview'"
             [tooltipPosition]="tooltipPosition"
             icon="red:refresh"
-            tooltip="project-overview.reanalyse.action"
+            tooltip="dossier-overview.reanalyse.action"
             type="dark-bg"
         >
         </redaction-circle-button>
@@ -153,7 +153,7 @@
             <mat-slide-toggle
                 (click)="toggleAnalysis($event)"
                 [checked]="!fileStatus?.isExcluded"
-                [class.mr-24]="screen === 'project-overview'"
+                [class.mr-24]="screen === 'dossier-overview'"
                 [disabled]="!permissionsService.isManager()"
                 [matTooltipPosition]="tooltipPosition"
                 [matTooltip]="toggleTooltip | translate"
diff --git a/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.ts
index a74bc1ad7..9446d4504 100644
--- a/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/file-actions/file-actions.component.ts
@@ -3,7 +3,7 @@ import { PermissionsService } from '@services/permissions.service';
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
 import { AppStateService } from '@state/app-state.service';
 import { FileActionService } from '../../services/file-action.service';
-import { ProjectsDialogService } from '../../services/projects-dialog.service';
+import { DossiersDialogService } from '../../services/dossiers-dialog.service';
 
 @Component({
     selector: 'redaction-file-actions',
@@ -16,12 +16,12 @@ export class FileActionsComponent implements OnInit {
     @Output() actionPerformed = new EventEmitter<string>();
     actionMenuOpen: boolean;
 
-    screen: 'file-preview' | 'project-overview';
+    screen: 'file-preview' | 'dossier-overview';
 
     constructor(
         readonly permissionsService: PermissionsService,
         readonly appStateService: AppStateService,
-        private readonly _dialogService: ProjectsDialogService,
+        private readonly _dialogService: DossiersDialogService,
         private readonly _fileActionService: FileActionService
     ) {}
 
@@ -89,8 +89,8 @@ export class FileActionsComponent implements OnInit {
 
     get assignTooltip() {
         return this.fileStatus.isUnderApproval
-            ? 'project-overview.assign-approver'
-            : 'project-overview.assign-reviewer';
+            ? 'dossier-overview.assign-approver'
+            : 'dossier-overview.assign-reviewer';
     }
 
     ngOnInit(): void {
@@ -103,7 +103,7 @@ export class FileActionsComponent implements OnInit {
                 }
             });
         } else {
-            this.screen = 'project-overview';
+            this.screen = 'dossier-overview';
         }
     }
 
@@ -114,7 +114,7 @@ export class FileActionsComponent implements OnInit {
     openDeleteFileDialog($event: MouseEvent) {
         this._dialogService.openDeleteFilesDialog(
             $event,
-            this.fileStatus.projectId,
+            this.fileStatus.dossierId,
             [this.fileStatus.fileId],
             () => {
                 this.actionPerformed.emit('delete');
@@ -136,28 +136,28 @@ export class FileActionsComponent implements OnInit {
         $event.stopPropagation();
 
         await this._fileActionService.assignToMe(this.fileStatus, () => {
-            this.reloadProjects('reanalyse');
+            this.reloadDossiers('reanalyse');
         });
     }
 
     reanalyseFile($event: MouseEvent, priority = -1) {
         $event.stopPropagation();
         this._fileActionService.reanalyseFile(this.fileStatus, priority).subscribe(() => {
-            this.reloadProjects('reanalyse');
+            this.reloadDossiers('reanalyse');
         });
     }
 
     setFileUnderApproval($event: MouseEvent) {
         $event.stopPropagation();
-        if (this.appStateService.activeProject.approverIds.length > 1) {
-            this._fileActionService.assignProjectApprover(
+        if (this.appStateService.activeDossier.approverIds.length > 1) {
+            this._fileActionService.assignDossierApprover(
                 this.fileStatus,
                 () => this.actionPerformed.emit('assign-reviewer'),
                 true
             );
         } else {
             this._fileActionService.setFileUnderApproval(this.fileStatus).subscribe(() => {
-                this.reloadProjects('set-under-approval');
+                this.reloadDossiers('set-under-approval');
             });
         }
     }
@@ -165,27 +165,27 @@ export class FileActionsComponent implements OnInit {
     setFileApproved($event: MouseEvent) {
         $event.stopPropagation();
         this._fileActionService.setFileApproved(this.fileStatus).subscribe(() => {
-            this.reloadProjects('set-approved');
+            this.reloadDossiers('set-approved');
         });
     }
 
     ocrFile($event: MouseEvent) {
         $event.stopPropagation();
         this._fileActionService.ocrFile(this.fileStatus).subscribe(() => {
-            this.reloadProjects('ocr-file');
+            this.reloadDossiers('ocr-file');
         });
     }
 
     setFileUnderReview($event: MouseEvent, ignoreDialogChanges = false) {
         $event.stopPropagation();
-        this._fileActionService.assignProjectReviewer(
+        this._fileActionService.assignDossierReviewer(
             this.fileStatus,
             () => this.actionPerformed.emit('assign-reviewer'),
             ignoreDialogChanges
         );
     }
 
-    reloadProjects(action: string) {
+    reloadDossiers(action: string) {
         this.appStateService.getFiles().then(() => {
             this.actionPerformed.emit(action);
         });
diff --git a/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.ts b/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.ts
index 45dd53f38..75c2e520b 100644
--- a/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.ts
@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 import { AppStateService } from '@state/app-state.service';
 import { PermissionsService } from '@services/permissions.service';
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 
 @Component({
     selector: 'redaction-needs-work-badge',
@@ -10,7 +10,7 @@ import { ProjectWrapper } from '@state/model/project.wrapper';
     styleUrls: ['./needs-work-badge.component.scss']
 })
 export class NeedsWorkBadgeComponent {
-    @Input() needsWorkInput: FileStatusWrapper | ProjectWrapper;
+    @Input() needsWorkInput: FileStatusWrapper | DossierWrapper;
 
     constructor(
         private readonly _appStateService: AppStateService,
@@ -57,19 +57,19 @@ export class NeedsWorkBadgeComponent {
     }
 
     reanalysisRequired() {
-        if (this.needsWorkInput instanceof ProjectWrapper) {
-            return this._permissionsService.projectReanalysisRequired(this.needsWorkInput);
+        if (this.needsWorkInput instanceof DossierWrapper) {
+            return this._permissionsService.dossierReanalysisRequired(this.needsWorkInput);
         } else {
             return this._permissionsService.fileRequiresReanalysis(this.needsWorkInput);
         }
     }
 
     private _getDictionaryColor(type: string) {
-        let ruleSetId = null;
-        if (this.needsWorkInput instanceof ProjectWrapper) {
-            ruleSetId = this.needsWorkInput.ruleSetId;
+        let dossierTemplateId = null;
+        if (this.needsWorkInput instanceof DossierWrapper) {
+            dossierTemplateId = this.needsWorkInput.dossierTemplateId;
         }
 
-        return this._appStateService.getDictionaryColor(type, ruleSetId);
+        return this._appStateService.getDictionaryColor(type, dossierTemplateId);
     }
 }
diff --git a/apps/red-ui/src/app/modules/projects/components/page-indicator/page-indicator.component.ts b/apps/red-ui/src/app/modules/projects/components/page-indicator/page-indicator.component.ts
index 95f63ad02..ef232df41 100644
--- a/apps/red-ui/src/app/modules/projects/components/page-indicator/page-indicator.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/page-indicator/page-indicator.component.ts
@@ -106,7 +106,7 @@ export class PageIndicatorComponent implements OnChanges, OnInit, OnDestroy {
         this._viewedPagesControllerService
             .addPage(
                 { page: this.number },
-                this._appStateService.activeProjectId,
+                this._appStateService.activeDossierId,
                 this._appStateService.activeFileId
             )
             .subscribe(() => {
@@ -117,7 +117,7 @@ export class PageIndicatorComponent implements OnChanges, OnInit, OnDestroy {
     private _markPageUnread() {
         this._viewedPagesControllerService
             .removePage(
-                this._appStateService.activeProjectId,
+                this._appStateService.activeDossierId,
                 this._appStateService.activeFileId,
                 this.number
             )
diff --git a/apps/red-ui/src/app/modules/projects/components/project-details/project-details.component.html b/apps/red-ui/src/app/modules/projects/components/project-details/project-details.component.html
index b3039a9e1..578f47291 100644
--- a/apps/red-ui/src/app/modules/projects/components/project-details/project-details.component.html
+++ b/apps/red-ui/src/app/modules/projects/components/project-details/project-details.component.html
@@ -1,29 +1,29 @@
-<ng-container *ngIf="appStateService.activeProject">
+<ng-container *ngIf="appStateService.activeDossier">
     <div class="collapsed-wrapper">
         <redaction-circle-button
             (action)="toggleCollapse.emit()"
             icon="red:expand"
-            tooltip="project-details.expand"
+            tooltip="dossier-details.expand"
             tooltipPosition="before"
         ></redaction-circle-button>
-        <div class="all-caps-label" translate="project-details.title"></div>
+        <div class="all-caps-label" translate="dossier-details.title"></div>
     </div>
 
     <div class="header-wrapper mt-8">
-        <div class="heading-xl flex-1">{{ appStateService.activeProject.project.projectName }}</div>
+        <div class="heading-xl flex-1">{{ appStateService.activeDossier.dossier.dossierName }}</div>
         <redaction-circle-button
             (action)="toggleCollapse.emit()"
             icon="red:collapse"
-            tooltip="project-details.collapse"
+            tooltip="dossier-details.collapse"
             tooltipPosition="before"
         ></redaction-circle-button>
     </div>
 
     <div class="mt-24">
-        <div class="all-caps-label" translate="project-details.owner"></div>
+        <div class="all-caps-label" translate="dossier-details.owner"></div>
         <div class="mt-12">
             <redaction-initials-avatar
-                [userId]="appStateService.activeProject.project.ownerId"
+                [userId]="appStateService.activeDossier.dossier.ownerId"
                 [withName]="true"
                 color="gray"
                 size="large"
@@ -32,9 +32,9 @@
     </div>
 
     <div class="mt-16">
-        <div class="all-caps-label" translate="project-details.members"></div>
+        <div class="all-caps-label" translate="dossier-details.members"></div>
         <redaction-team-members
-            (openAssignProjectMembersDialog)="openAssignProjectMembersDialog.emit()"
+            (openAssignDossierMembersDialog)="openAssignDossierMembersDialog.emit()"
             [memberIds]="memberIds"
             [perLine]="9"
         ></redaction-team-members>
@@ -47,7 +47,7 @@
             [filter]="filters.statusFilters"
             [radius]="63"
             [strokeWidth]="15"
-            [subtitle]="'project-overview.project-details.charts.documents-in-project'"
+            [subtitle]="'dossier-overview.dossier-details.charts.documents-in-dossier'"
             direction="row"
         ></redaction-simple-doughnut-chart>
     </div>
@@ -66,47 +66,47 @@
         <div>
             <mat-icon svgIcon="red:document"></mat-icon>
             <span>{{
-                'project-overview.project-details.stats.documents'
-                    | translate: { count: appStateService.activeProject.files.length }
+                'dossier-overview.dossier-details.stats.documents'
+                    | translate: { count: appStateService.activeDossier.files.length }
             }}</span>
         </div>
         <div>
             <mat-icon svgIcon="red:user"></mat-icon>
             <span>{{
-                'project-overview.project-details.stats.people'
-                    | translate: { count: appStateService.activeProject.memberCount }
+                'dossier-overview.dossier-details.stats.people'
+                    | translate: { count: appStateService.activeDossier.memberCount }
             }}</span>
         </div>
         <div>
             <mat-icon svgIcon="red:pages"></mat-icon>
             <span>{{
-                'project-overview.project-details.stats.analysed-pages'
+                'dossier-overview.dossier-details.stats.analysed-pages'
                     | translate
-                        : { count: appStateService.activeProject.totalNumberOfPages | number }
+                        : { count: appStateService.activeDossier.totalNumberOfPages | number }
             }}</span>
         </div>
         <div>
             <mat-icon svgIcon="red:calendar"></mat-icon>
             <span
                 >{{
-                    'project-overview.project-details.stats.created-on'
+                    'dossier-overview.dossier-details.stats.created-on'
                         | translate
                             : {
                                   date:
-                                      appStateService.activeProject.project.date
+                                      appStateService.activeDossier.dossier.date
                                       | date: 'd MMM. yyyy'
                               }
                 }}
             </span>
         </div>
-        <div *ngIf="appStateService.activeProject.project.dueDate">
+        <div *ngIf="appStateService.activeDossier.dossier.dueDate">
             <mat-icon svgIcon="red:lightning"></mat-icon>
             <span>{{
-                'project-overview.project-details.stats.due-date'
+                'dossier-overview.dossier-details.stats.due-date'
                     | translate
                         : {
                               date:
-                                  appStateService.activeProject.project.dueDate
+                                  appStateService.activeDossier.dossier.dueDate
                                   | date: 'd MMM. yyyy'
                           }
             }}</span>
@@ -114,21 +114,25 @@
         <div>
             <mat-icon svgIcon="red:template"></mat-icon>
             <span
-                >{{ appStateService.getRuleSetById(appStateService.activeProject.ruleSetId)?.name }}
+                >{{
+                    appStateService.getDossierTemplateById(
+                        appStateService.activeDossier.dossierTemplateId
+                    )?.name
+                }}
             </span>
         </div>
         <div
-            *ngIf="appStateService.activeProject.type"
+            *ngIf="appStateService.activeDossier.type"
             class="pointer"
             (click)="openDossierDictionaryDialog.emit()"
         >
             <mat-icon svgIcon="red:dictionary"></mat-icon>
-            <span>{{ 'project-overview.project-details.dictionary' | translate }} </span>
+            <span>{{ 'dossier-overview.dossier-details.dictionary' | translate }} </span>
         </div>
     </div>
 
-    <div *ngIf="!!appStateService.activeProject.project.description" class="pb-32">
-        <div class="heading" translate="project-overview.project-details.description"></div>
-        <div class="mt-8">{{ appStateService.activeProject.project.description }}</div>
+    <div *ngIf="!!appStateService.activeDossier.dossier.description" class="pb-32">
+        <div class="heading" translate="dossier-overview.dossier-details.description"></div>
+        <div class="mt-8">{{ appStateService.activeDossier.dossier.description }}</div>
     </div>
 </ng-container>
diff --git a/apps/red-ui/src/app/modules/projects/components/project-details/project-details.component.ts b/apps/red-ui/src/app/modules/projects/components/project-details/project-details.component.ts
index 0535bbc2f..f9f2061de 100644
--- a/apps/red-ui/src/app/modules/projects/components/project-details/project-details.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/project-details/project-details.component.ts
@@ -7,18 +7,18 @@ import { FilterModel } from '@shared/components/filter/model/filter.model';
 import { PermissionsService } from '@services/permissions.service';
 import { TranslateChartService } from '@services/translate-chart.service';
 import { StatusSorter } from '@utils/sorters/status-sorter';
-import { ProjectsDialogService } from '../../services/projects-dialog.service';
+import { DossiersDialogService } from '../../services/dossiers-dialog.service';
 
 @Component({
-    selector: 'redaction-project-details',
-    templateUrl: './project-details.component.html',
-    styleUrls: ['./project-details.component.scss']
+    selector: 'redaction-dossier-details',
+    templateUrl: './dossier-details.component.html',
+    styleUrls: ['./dossier-details.component.scss']
 })
-export class ProjectDetailsComponent implements OnInit {
+export class DossierDetailsComponent implements OnInit {
     documentsChartData: DoughnutChartConfig[] = [];
     @Input() filters: { needsWorkFilters: FilterModel[]; statusFilters: FilterModel[] };
     @Output() filtersChanged = new EventEmitter();
-    @Output() openAssignProjectMembersDialog = new EventEmitter();
+    @Output() openAssignDossierMembersDialog = new EventEmitter();
     @Output() openDossierDictionaryDialog = new EventEmitter();
     @Output() toggleCollapse = new EventEmitter();
 
@@ -27,16 +27,16 @@ export class ProjectDetailsComponent implements OnInit {
         readonly translateChartService: TranslateChartService,
         readonly permissionsService: PermissionsService,
         private readonly _changeDetectorRef: ChangeDetectorRef,
-        private readonly _dialogService: ProjectsDialogService,
+        private readonly _dialogService: DossiersDialogService,
         private readonly _router: Router
     ) {}
 
     get memberIds(): string[] {
-        return this.appStateService.activeProject.project.memberIds;
+        return this.appStateService.activeDossier.dossier.memberIds;
     }
 
     get hasFiles(): boolean {
-        return this.appStateService.activeProject.hasFiles;
+        return this.appStateService.activeDossier.hasFiles;
     }
 
     ngOnInit(): void {
@@ -47,8 +47,8 @@ export class ProjectDetailsComponent implements OnInit {
     }
 
     calculateChartConfig(): void {
-        if (this.appStateService.activeProject) {
-            const groups = groupBy(this.appStateService.activeProject?.files, 'status');
+        if (this.appStateService.activeDossier) {
+            const groups = groupBy(this.appStateService.activeDossier?.files, 'status');
             this.documentsChartData = [];
             for (const key of Object.keys(groups)) {
                 this.documentsChartData.push({
diff --git a/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.html b/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.html
index 1e5d886e0..8b5896cda 100644
--- a/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.html
+++ b/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.html
@@ -1,35 +1,35 @@
-<redaction-status-bar [config]="getProjectStatusConfig(project)"></redaction-status-bar>
+<redaction-status-bar [config]="getDossierStatusConfig(dossier)"></redaction-status-bar>
 <div [class.active]="actionMenuOpen" class="action-buttons">
     <redaction-circle-button
-        (action)="openDeleteProjectDialog($event, project)"
-        *ngIf="permissionsService.canDeleteProject(project)"
+        (action)="openDeleteDossierDialog($event, dossier)"
+        *ngIf="permissionsService.canDeleteDossier(dossier)"
         icon="red:trash"
-        tooltip="project-listing.delete.action"
+        tooltip="dossier-listing.delete.action"
         type="dark-bg"
     >
     </redaction-circle-button>
 
     <redaction-circle-button
-        (action)="openEditProjectDialog($event, project)"
+        (action)="openEditDossierDialog($event, dossier)"
         *ngIf="permissionsService.isManager()"
         icon="red:edit"
-        tooltip="project-listing.edit.action"
+        tooltip="dossier-listing.edit.action"
         type="dark-bg"
     >
     </redaction-circle-button>
 
     <redaction-circle-button
-        (action)="reanalyseProject($event, project)"
-        *ngIf="permissionsService.displayReanalyseBtn(project)"
+        (action)="reanalyseDossier($event, dossier)"
+        *ngIf="permissionsService.displayReanalyseBtn(dossier)"
         icon="red:refresh"
-        tooltip="project-listing.reanalyse.action"
+        tooltip="dossier-listing.reanalyse.action"
         type="dark-bg"
     >
     </redaction-circle-button>
 
     <redaction-file-download-btn
-        [file]="project.files"
-        [project]="project"
+        [file]="dossier.files"
+        [dossier]="dossier"
         type="dark-bg"
     ></redaction-file-download-btn>
 </div>
diff --git a/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.ts b/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.ts
index 82c0f20e7..5c4f99666 100644
--- a/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.ts
@@ -1,75 +1,75 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { PermissionsService } from '@services/permissions.service';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 import { StatusSorter } from '@utils/sorters/status-sorter';
 import { download } from '@utils/file-download-utils';
 import { computerize } from '@utils/functions';
 import { FileManagementControllerService } from '@redaction/red-ui-http';
 import { AppStateService } from '@state/app-state.service';
-import { ProjectsDialogService } from '../../services/projects-dialog.service';
+import { DossiersDialogService } from '../../services/dossiers-dialog.service';
 
 @Component({
-    selector: 'redaction-project-listing-actions',
-    templateUrl: './project-listing-actions.component.html',
-    styleUrls: ['./project-listing-actions.component.scss']
+    selector: 'redaction-dossier-listing-actions',
+    templateUrl: './dossier-listing-actions.component.html',
+    styleUrls: ['./dossier-listing-actions.component.scss']
 })
-export class ProjectListingActionsComponent {
-    @Input() project: ProjectWrapper;
-    @Output() actionPerformed = new EventEmitter<ProjectWrapper | undefined>();
+export class DossierListingActionsComponent {
+    @Input() dossier: DossierWrapper;
+    @Output() actionPerformed = new EventEmitter<DossierWrapper | undefined>();
     actionMenuOpen = false;
 
     constructor(
         readonly permissionsService: PermissionsService,
         readonly appStateService: AppStateService,
-        private readonly _dialogService: ProjectsDialogService,
+        private readonly _dialogService: DossiersDialogService,
         private readonly _fileManagementControllerService: FileManagementControllerService
     ) {}
 
-    openDeleteProjectDialog($event: MouseEvent, project: ProjectWrapper) {
-        this._dialogService.openDeleteProjectDialog($event, project, () => {
+    openDeleteDossierDialog($event: MouseEvent, dossier: DossierWrapper) {
+        this._dialogService.openDeleteDossierDialog($event, dossier, () => {
             this.actionPerformed.emit();
         });
     }
 
-    openEditProjectDialog($event: MouseEvent, project: ProjectWrapper) {
-        this._dialogService.openEditProjectDialog($event, project, () => {
+    openEditDossierDialog($event: MouseEvent, dossier: DossierWrapper) {
+        this._dialogService.openEditDossierDialog($event, dossier, () => {
             this.actionPerformed.emit();
         });
     }
 
-    reanalyseProject($event: MouseEvent, project: ProjectWrapper) {
+    reanalyseDossier($event: MouseEvent, dossier: DossierWrapper) {
         $event.stopPropagation();
-        this.appStateService.reanalyzeProject(project).then(() => {
-            this.appStateService.loadAllProjects().then(() => this.actionPerformed.emit());
+        this.appStateService.reanalyzeDossier(dossier).then(() => {
+            this.appStateService.loadAllDossiers().then(() => this.actionPerformed.emit());
         });
     }
 
     // Download Files
-    downloadRedactedFiles($event: MouseEvent, project: ProjectWrapper) {
+    downloadRedactedFiles($event: MouseEvent, dossier: DossierWrapper) {
         $event.stopPropagation();
         this._fileManagementControllerService
             .downloadRedactedFiles(
-                { fileIds: project.files.map((file) => file.fileId) },
-                project.projectId,
+                { fileIds: dossier.files.map((file) => file.fileId) },
+                dossier.dossierId,
                 false,
                 'response'
             )
             .subscribe((data) => {
-                download(data, 'redacted_files_' + computerize(project.name) + '.zip');
+                download(data, 'redacted_files_' + computerize(dossier.name) + '.zip');
             });
     }
 
-    canDownloadRedactedFiles(project: ProjectWrapper) {
+    canDownloadRedactedFiles(dossier: DossierWrapper) {
         return (
-            project.files.length > 0 &&
-            project.files.reduce(
+            dossier.files.length > 0 &&
+            dossier.files.reduce(
                 (acc, file) => acc && this.permissionsService.canDownloadRedactedFile(file),
                 true
             )
         );
     }
 
-    getProjectStatusConfig(pw: ProjectWrapper) {
+    getDossierStatusConfig(pw: DossierWrapper) {
         const obj = pw.files.reduce((acc, file) => {
             const status = file.status;
             if (!acc[status]) {
diff --git a/apps/red-ui/src/app/modules/projects/components/project-listing-details/project-listing-details.component.html b/apps/red-ui/src/app/modules/projects/components/project-listing-details/project-listing-details.component.html
index 257783794..3a56278b7 100644
--- a/apps/red-ui/src/app/modules/projects/components/project-listing-details/project-listing-details.component.html
+++ b/apps/red-ui/src/app/modules/projects/components/project-listing-details/project-listing-details.component.html
@@ -1,25 +1,25 @@
 <div>
     <redaction-simple-doughnut-chart
-        [config]="projectsChartData"
+        [config]="dossiersChartData"
         [radius]="80"
         [strokeWidth]="15"
-        [subtitle]="'project-listing.stats.charts.projects'"
+        [subtitle]="'dossier-listing.stats.charts.dossiers'"
     ></redaction-simple-doughnut-chart>
 
-    <div class="project-stats-container">
-        <div class="project-stats-item">
+    <div class="dossier-stats-container">
+        <div class="dossier-stats-item">
             <mat-icon svgIcon="red:needs-work"></mat-icon>
             <div>
                 <div class="heading">{{ totalPages | number }}</div>
-                <div translate="project-listing.stats.analyzed-pages"></div>
+                <div translate="dossier-listing.stats.analyzed-pages"></div>
             </div>
         </div>
 
-        <div class="project-stats-item">
+        <div class="dossier-stats-item">
             <mat-icon svgIcon="red:user"></mat-icon>
             <div>
                 <div class="heading">{{ totalPeople }}</div>
-                <div translate="project-listing.stats.total-people"></div>
+                <div translate="dossier-listing.stats.total-people"></div>
             </div>
         </div>
     </div>
@@ -31,6 +31,6 @@
         [filter]="filters.statusFilters"
         [radius]="80"
         [strokeWidth]="15"
-        [subtitle]="'project-listing.stats.charts.total-documents'"
+        [subtitle]="'dossier-listing.stats.charts.total-documents'"
     ></redaction-simple-doughnut-chart>
 </div>
diff --git a/apps/red-ui/src/app/modules/projects/components/project-listing-details/project-listing-details.component.scss b/apps/red-ui/src/app/modules/projects/components/project-listing-details/project-listing-details.component.scss
index cce2276b1..6f60af2c5 100644
--- a/apps/red-ui/src/app/modules/projects/components/project-listing-details/project-listing-details.component.scss
+++ b/apps/red-ui/src/app/modules/projects/components/project-listing-details/project-listing-details.component.scss
@@ -12,8 +12,8 @@
         align-items: center;
         padding-top: 50px;
 
-        .project-stats-container {
-            .project-stats-item {
+        .dossier-stats-container {
+            .dossier-stats-item {
                 display: flex;
                 width: fit-content;
                 margin-top: 25px;
diff --git a/apps/red-ui/src/app/modules/projects/components/project-listing-details/project-listing-details.component.ts b/apps/red-ui/src/app/modules/projects/components/project-listing-details/project-listing-details.component.ts
index 3feac5296..90c29627b 100644
--- a/apps/red-ui/src/app/modules/projects/components/project-listing-details/project-listing-details.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/project-listing-details/project-listing-details.component.ts
@@ -4,12 +4,12 @@ import { AppStateService } from '@state/app-state.service';
 import { FilterModel } from '@shared/components/filter/model/filter.model';
 
 @Component({
-    selector: 'redaction-project-listing-details',
-    templateUrl: './project-listing-details.component.html',
-    styleUrls: ['./project-listing-details.component.scss']
+    selector: 'redaction-dossier-listing-details',
+    templateUrl: './dossier-listing-details.component.html',
+    styleUrls: ['./dossier-listing-details.component.scss']
 })
-export class ProjectListingDetailsComponent {
-    @Input() projectsChartData: DoughnutChartConfig[];
+export class DossierListingDetailsComponent {
+    @Input() dossiersChartData: DoughnutChartConfig[];
     @Input() documentsChartData: DoughnutChartConfig[];
     @Input() filters: { statusFilters: FilterModel[] };
     @Output() filtersChanged = new EventEmitter();
diff --git a/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.html b/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.html
index c1569318c..9268676a6 100644
--- a/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.html
+++ b/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.html
@@ -1,7 +1,7 @@
 <form (submit)="saveMembers()" [formGroup]="teamForm">
     <div class="red-input-group w-300">
         <mat-form-field floatLabel="always">
-            <mat-label>{{ 'assign-project-owner.dialog.single-user' | translate }}</mat-label>
+            <mat-label>{{ 'assign-dossier-owner.dialog.single-user' | translate }}</mat-label>
             <mat-select formControlName="owner">
                 <mat-option *ngFor="let userId of ownersSelectOptions" [value]="userId">
                     {{ userService.getNameForId(userId) }}
@@ -9,7 +9,7 @@
             </mat-select>
         </mat-form-field>
     </div>
-    <div [translate]="'assign-project-owner.dialog.approvers'" class="all-caps-label mt-16"></div>
+    <div [translate]="'assign-dossier-owner.dialog.approvers'" class="all-caps-label mt-16"></div>
     <redaction-team-members
         (remove)="toggleSelected($event)"
         [canAdd]="false"
@@ -22,11 +22,11 @@
 
     <pre
         *ngIf="selectedApproversList.length === 0"
-        [innerHTML]="'assign-project-owner.dialog.no-approvers' | translate"
+        [innerHTML]="'assign-dossier-owner.dialog.no-approvers' | translate"
         class="info"
     ></pre>
 
-    <div [translate]="'assign-project-owner.dialog.reviewers'" class="all-caps-label mt-16"></div>
+    <div [translate]="'assign-dossier-owner.dialog.reviewers'" class="all-caps-label mt-16"></div>
     <redaction-team-members
         (remove)="toggleSelected($event)"
         [canAdd]="false"
@@ -39,13 +39,13 @@
 
     <pre
         *ngIf="selectedReviewersList.length === 0"
-        [innerHTML]="'assign-project-owner.dialog.no-reviewers' | translate"
+        [innerHTML]="'assign-dossier-owner.dialog.no-reviewers' | translate"
         class="info"
     ></pre>
 
     <redaction-search-input
         [form]="searchForm"
-        [placeholder]="'assign-project-owner.dialog.search' | translate"
+        [placeholder]="'assign-dossier-owner.dialog.search' | translate"
         [width]="560"
         class="search-container"
     ></redaction-search-input>
@@ -71,7 +71,7 @@
                         [active]="isApprover(userId)"
                         class="mr-8"
                     ></redaction-round-checkbox>
-                    <span [translate]="'assign-project-owner.dialog.make-approver'"></span>
+                    <span [translate]="'assign-dossier-owner.dialog.make-approver'"></span>
                 </div>
                 <mat-icon *ngIf="!isOwner(userId)" svgIcon="red:check"></mat-icon>
             </div>
diff --git a/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.ts b/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.ts
index a3fdcb81c..3676101f9 100644
--- a/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.ts
@@ -1,10 +1,10 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { Project, ProjectControllerService, StatusControllerService } from '@redaction/red-ui-http';
+import { Dossier, DossierControllerService, StatusControllerService } from '@redaction/red-ui-http';
 import { AppStateService } from '@state/app-state.service';
 import { UserService } from '@services/user.service';
 import { NotificationService, NotificationType } from '@services/notification.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 
 @Component({
     selector: 'redaction-team-members-manager',
@@ -15,13 +15,13 @@ export class TeamMembersManagerComponent implements OnInit {
     teamForm: FormGroup;
     searchForm: FormGroup;
 
-    @Input() projectWrapper: ProjectWrapper;
+    @Input() dossierWrapper: DossierWrapper;
 
-    @Output() save = new EventEmitter<Project>();
+    @Output() save = new EventEmitter<Dossier>();
 
     constructor(
         readonly userService: UserService,
-        private readonly _projectControllerService: ProjectControllerService,
+        private readonly _dossierControllerService: DossierControllerService,
         private readonly _notificationService: NotificationService,
         private readonly _formBuilder: FormBuilder,
         private readonly _statusControllerService: StatusControllerService,
@@ -66,14 +66,14 @@ export class TeamMembersManagerComponent implements OnInit {
     }
 
     get changed(): boolean {
-        if (this.projectWrapper.ownerId !== this.selectedOwnerId) {
+        if (this.dossierWrapper.ownerId !== this.selectedOwnerId) {
             return true;
         }
 
-        const initialMembers = this.projectWrapper.memberIds.sort();
+        const initialMembers = this.dossierWrapper.memberIds.sort();
         const currentMembers = this.selectedMembersList.sort();
 
-        const initialApprovers = this.projectWrapper.approverIds.sort();
+        const initialApprovers = this.dossierWrapper.approverIds.sort();
         const currentApprovers = this.selectedApproversList.sort();
 
         return (
@@ -92,11 +92,11 @@ export class TeamMembersManagerComponent implements OnInit {
             const ownerId = this.selectedOwnerId;
             const memberIds = this.selectedMembersList;
             const approverIds = this.selectedApproversList;
-            const pw = Object.assign({}, this.projectWrapper);
-            pw.project.memberIds = memberIds;
-            pw.project.approverIds = approverIds;
-            pw.project.ownerId = ownerId;
-            result = await this._appStateService.addOrUpdateProject(pw.project);
+            const pw = Object.assign({}, this.dossierWrapper);
+            pw.dossier.memberIds = memberIds;
+            pw.dossier.approverIds = approverIds;
+            pw.dossier.ownerId = ownerId;
+            result = await this._appStateService.addOrUpdateDossier(pw.dossier);
             this.save.emit(result);
         } catch (error) {
             this._notificationService.showToastNotification(
@@ -154,9 +154,9 @@ export class TeamMembersManagerComponent implements OnInit {
 
     private _loadData() {
         this.teamForm = this._formBuilder.group({
-            owner: [this.projectWrapper?.ownerId, Validators.required],
-            approvers: [[...this.projectWrapper?.approverIds]],
-            members: [[...this.projectWrapper?.memberIds]]
+            owner: [this.dossierWrapper?.ownerId, Validators.required],
+            approvers: [[...this.dossierWrapper?.approverIds]],
+            members: [[...this.dossierWrapper?.memberIds]]
         });
         this.searchForm = this._formBuilder.group({
             query: ['']
diff --git a/apps/red-ui/src/app/modules/projects/components/team-members/team-members.component.html b/apps/red-ui/src/app/modules/projects/components/team-members/team-members.component.html
index 625cdb6b8..eb7b0be55 100644
--- a/apps/red-ui/src/app/modules/projects/components/team-members/team-members.component.html
+++ b/apps/red-ui/src/app/modules/projects/components/team-members/team-members.component.html
@@ -23,13 +23,13 @@
         <div (click)="toggleExpandedTeam()" class="oval large white-dark">+{{ overflowCount }}</div>
     </div>
     <redaction-circle-button
-        (action)="openAssignProjectMembersDialog.emit()"
+        (action)="openAssignDossierMembersDialog.emit()"
         *ngIf="permissionsService.isManager() && canAdd"
         [class.large-spacing]="largeSpacing"
         [small]="true"
         class="member"
         icon="red:plus"
-        tooltip="project-details.assign-members"
+        tooltip="dossier-details.assign-members"
         type="primary"
     >
     </redaction-circle-button>
@@ -38,5 +38,5 @@
     (click)="toggleExpandedTeam()"
     *ngIf="expandedTeam"
     class="all-caps-label see-less pointer"
-    translate="project-details.see-less"
+    translate="dossier-details.see-less"
 ></div>
diff --git a/apps/red-ui/src/app/modules/projects/components/team-members/team-members.component.ts b/apps/red-ui/src/app/modules/projects/components/team-members/team-members.component.ts
index 0df0e7e19..1e873e6a8 100644
--- a/apps/red-ui/src/app/modules/projects/components/team-members/team-members.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/team-members/team-members.component.ts
@@ -13,7 +13,7 @@ export class TeamMembersComponent {
     @Input() largeSpacing = false;
     @Input() canRemove = false;
     @Input() unremovableMembers: string[] = [];
-    @Output() openAssignProjectMembersDialog = new EventEmitter();
+    @Output() openAssignDossierMembersDialog = new EventEmitter();
     @Output() remove = new EventEmitter<string>();
 
     @ViewChild('container', { static: true }) container: ElementRef;
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.html b/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.html
index c543779b5..b4e8b2f0c 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.html
+++ b/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.html
@@ -1,42 +1,46 @@
 <section class="dialog">
-    <form (submit)="saveProject()" [formGroup]="projectForm">
-        <div class="dialog-header heading-l" translate="add-project-dialog.header-new"></div>
+    <form (submit)="saveDossier()" [formGroup]="dossierForm">
+        <div class="dialog-header heading-l" translate="add-dossier-dialog.header-new"></div>
 
         <div class="dialog-content">
             <div class="red-input-group required w-300">
-                <label translate="add-project-dialog.form.name.label"></label>
+                <label translate="add-dossier-dialog.form.name.label"></label>
                 <input
-                    [placeholder]="'add-project-dialog.form.name.placeholder' | translate"
-                    formControlName="projectName"
-                    name="projectName"
+                    [placeholder]="'add-dossier-dialog.form.name.placeholder' | translate"
+                    formControlName="dossierName"
+                    name="dossierName"
                     type="text"
                 />
             </div>
 
             <div class="red-input-group required w-400">
                 <mat-form-field floatLabel="always">
-                    <mat-label>{{ 'add-project-dialog.form.template' | translate }}</mat-label>
+                    <mat-label>{{ 'add-dossier-dialog.form.template' | translate }}</mat-label>
                     <mat-select
-                        (valueChange)="ruleSetChanged($event)"
-                        formControlName="ruleSetId"
+                        (valueChange)="dossierTemplateChanged($event)"
+                        formControlName="dossierTemplateId"
                         style="width: 100%"
                     >
                         <mat-option
-                            *ngFor="let ruleSet of ruleSets"
-                            [matTooltip]="ruleSet.description ? ruleSet.description : ruleSet.name"
-                            [value]="ruleSet.ruleSetId"
+                            *ngFor="let dossierTemplate of dossierTemplates"
+                            [matTooltip]="
+                                dossierTemplate.description
+                                    ? dossierTemplate.description
+                                    : dossierTemplate.name
+                            "
+                            [value]="dossierTemplate.dossierTemplateId"
                             matTooltipPosition="after"
                         >
-                            {{ ruleSet.name }}
+                            {{ dossierTemplate.name }}
                         </mat-option>
                     </mat-select>
                 </mat-form-field>
             </div>
 
             <div class="red-input-group w-400">
-                <label translate="add-project-dialog.form.description.label"></label>
+                <label translate="add-dossier-dialog.form.description.label"></label>
                 <textarea
-                    [placeholder]="'add-project-dialog.form.description.placeholder' | translate"
+                    [placeholder]="'add-dossier-dialog.form.description.placeholder' | translate"
                     formControlName="description"
                     name="description"
                     redactionHasScrollbar
@@ -52,7 +56,7 @@
                     class="filter-menu-checkbox"
                     color="primary"
                 >
-                    {{ 'add-project-dialog.form.due-date' | translate }}
+                    {{ 'add-dossier-dialog.form.due-date' | translate }}
                 </mat-checkbox>
 
                 <div *ngIf="hasDueDate" class="red-input-group datepicker-wrapper">
@@ -88,14 +92,14 @@
 
         <div class="dialog-actions">
             <button [disabled]="disabled" color="primary" mat-flat-button type="submit">
-                {{ 'add-project-dialog.actions.save' | translate }}
+                {{ 'add-dossier-dialog.actions.save' | translate }}
             </button>
 
             <redaction-icon-button
-                (action)="saveProjectAndAddMembers()"
+                (action)="saveDossierAndAddMembers()"
                 [disabled]="disabled"
                 icon="red:assign"
-                text="add-project-dialog.actions.save-and-add-members"
+                text="add-dossier-dialog.actions.save-and-add-members"
                 type="show-bg"
             ></redaction-icon-button>
         </div>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.ts
index f233a44d6..261d2188a 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.ts
@@ -1,31 +1,31 @@
 import { Component } from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
-import { Project, RuleSetModel } from '@redaction/red-ui-http';
+import { Dossier, DossierTemplateModel } from '@redaction/red-ui-http';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { AppStateService } from '@state/app-state.service';
 import * as moment from 'moment';
 
 @Component({
-    selector: 'redaction-add-project-dialog',
-    templateUrl: './add-project-dialog.component.html',
-    styleUrls: ['./add-project-dialog.component.scss']
+    selector: 'redaction-add-dossier-dialog',
+    templateUrl: './add-dossier-dialog.component.html',
+    styleUrls: ['./add-dossier-dialog.component.scss']
 })
-export class AddProjectDialogComponent {
-    projectForm: FormGroup;
+export class AddDossierDialogComponent {
+    dossierForm: FormGroup;
     hasDueDate = false;
     downloadTypesEnum = ['ORIGINAL', 'PREVIEW', 'REDACTED'];
-    reportTypesEnum = Object.values(RuleSetModel.ReportTypesEnum);
-    ruleSets: RuleSetModel[];
+    reportTypesEnum = Object.values(DossierTemplateModel.ReportTypesEnum);
+    dossierTemplates: DossierTemplateModel[];
 
     constructor(
         private readonly _appStateService: AppStateService,
         private readonly _formBuilder: FormBuilder,
-        public dialogRef: MatDialogRef<AddProjectDialogComponent>
+        public dialogRef: MatDialogRef<AddDossierDialogComponent>
     ) {
-        this._filterInvalidRuleSets();
-        this.projectForm = this._formBuilder.group({
-            projectName: [null, Validators.required],
-            ruleSetId: [null, Validators.required],
+        this._filterInvalidDossierTemplates();
+        this.dossierForm = this._formBuilder.group({
+            dossierName: [null, Validators.required],
+            dossierTemplateId: [null, Validators.required],
             downloadFileTypes: [null],
             reportTypes: [null, Validators.required],
             description: [null],
@@ -34,80 +34,82 @@ export class AddProjectDialogComponent {
     }
 
     get reportTypesLength() {
-        return this.projectForm.controls['reportTypes']?.value?.length
-            ? this.projectForm.controls['reportTypes'].value.length
+        return this.dossierForm.controls['reportTypes']?.value?.length
+            ? this.dossierForm.controls['reportTypes'].value.length
             : 0;
     }
 
     get downloadFileTypesLength() {
-        return this.projectForm.controls['downloadFileTypes']?.value?.length
-            ? this.projectForm.controls['downloadFileTypes'].value.length
+        return this.dossierForm.controls['downloadFileTypes']?.value?.length
+            ? this.dossierForm.controls['downloadFileTypes'].value.length
             : 0;
     }
 
     get disabled() {
-        if (this.hasDueDate && this.projectForm.get('dueDate').value === null) {
+        if (this.hasDueDate && this.dossierForm.get('dueDate').value === null) {
             return true;
         }
 
-        return this.projectForm.invalid;
+        return this.dossierForm.invalid;
     }
 
-    async saveProject() {
-        const project: Project = this._formToObject();
+    async saveDossier() {
+        const dossier: Dossier = this._formToObject();
 
-        const foundProject = this._appStateService.allProjects.find(
-            (p) => p.project.projectId === project.projectId
+        const foundDossier = this._appStateService.allDossiers.find(
+            (p) => p.dossier.dossierId === dossier.dossierId
         );
-        if (foundProject) {
-            project.memberIds = foundProject.memberIds;
+        if (foundDossier) {
+            dossier.memberIds = foundDossier.memberIds;
         }
 
-        const savedProject = await this._appStateService.addOrUpdateProject(project);
-        if (savedProject) {
-            this.dialogRef.close({ project: savedProject });
+        const savedDossier = await this._appStateService.addOrUpdateDossier(dossier);
+        if (savedDossier) {
+            this.dialogRef.close({ dossier: savedDossier });
         }
     }
 
-    async saveProjectAndAddMembers() {
-        const project: Project = this._formToObject();
-        const savedProject = await this._appStateService.addOrUpdateProject(project);
-        if (savedProject) {
-            this.dialogRef.close({ addMembers: true, project: savedProject });
+    async saveDossierAndAddMembers() {
+        const dossier: Dossier = this._formToObject();
+        const savedDossier = await this._appStateService.addOrUpdateDossier(dossier);
+        if (savedDossier) {
+            this.dialogRef.close({ addMembers: true, dossier: savedDossier });
         }
     }
 
-    ruleSetChanged(ruleSetId) {
-        // get current selected ruleSet
-        const ruleSet = this.ruleSets.find((r) => r.ruleSetId === ruleSetId);
-        if (ruleSet) {
+    dossierTemplateChanged(dossierTemplateId) {
+        // get current selected dossierTemplate
+        const dossierTemplate = this.dossierTemplates.find(
+            (r) => r.dossierTemplateId === dossierTemplateId
+        );
+        if (dossierTemplate) {
             // update dropdown values
-            this.projectForm.patchValue(
+            this.dossierForm.patchValue(
                 {
-                    downloadFileTypes: ruleSet.downloadFileTypes,
-                    reportTypes: ruleSet.reportTypes
+                    downloadFileTypes: dossierTemplate.downloadFileTypes,
+                    reportTypes: dossierTemplate.reportTypes
                 },
                 { emitEvent: false }
             );
         }
     }
 
-    private _filterInvalidRuleSets() {
-        this.ruleSets = this._appStateService.ruleSets.filter((r) => {
+    private _filterInvalidDossierTemplates() {
+        this.dossierTemplates = this._appStateService.dossierTemplates.filter((r) => {
             const notYetValid = !!r.validFrom && moment(r.validFrom).isAfter(moment());
             const notValidAnymore = !!r.validTo && moment(r.validTo).add(1, 'd').isBefore(moment());
             return !(notYetValid || notValidAnymore);
         });
     }
 
-    private _formToObject(): Project {
+    private _formToObject(): Dossier {
         return {
-            projectName: this.projectForm.get('projectName').value,
-            description: this.projectForm.get('description').value,
-            dueDate: this.hasDueDate ? this.projectForm.get('dueDate').value : undefined,
-            ruleSetId: this.projectForm.get('ruleSetId').value,
-            downloadFileTypes: this.projectForm.get('downloadFileTypes').value,
-            reportTypes: this.projectForm.get('reportTypes').value
+            dossierName: this.dossierForm.get('dossierName').value,
+            description: this.dossierForm.get('description').value,
+            dueDate: this.hasDueDate ? this.dossierForm.get('dueDate').value : undefined,
+            dossierTemplateId: this.dossierForm.get('dossierTemplateId').value,
+            downloadFileTypes: this.dossierForm.get('downloadFileTypes').value,
+            reportTypes: this.dossierForm.get('reportTypes').value
         };
     }
 }
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
index 20bd67017..9f8a11da4 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
@@ -1,22 +1,22 @@
 import { Component, Inject } from '@angular/core';
-import { ProjectControllerService, StatusControllerService } from '@redaction/red-ui-http';
+import { DossierControllerService, StatusControllerService } from '@redaction/red-ui-http';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { AppStateService } from '@state/app-state.service';
 import { UserService } from '@services/user.service';
 import { NotificationService, NotificationType } from '@services/notification.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 
 class DialogData {
     mode: 'approver' | 'reviewer';
-    project?: ProjectWrapper;
+    dossier?: DossierWrapper;
     files?: FileStatusWrapper[];
     ignoreChanged?: boolean;
 }
 
 @Component({
-    selector: 'redaction-project-details-dialog',
+    selector: 'redaction-dossier-details-dialog',
     templateUrl: './assign-reviewer-approver-dialog.component.html',
     styleUrls: ['./assign-reviewer-approver-dialog.component.scss']
 })
@@ -26,7 +26,7 @@ export class AssignReviewerApproverDialogComponent {
 
     constructor(
         readonly userService: UserService,
-        private readonly _projectControllerService: ProjectControllerService,
+        private readonly _dossierControllerService: DossierControllerService,
         private readonly _notificationService: NotificationService,
         private readonly _formBuilder: FormBuilder,
         private readonly _statusControllerService: StatusControllerService,
@@ -43,8 +43,8 @@ export class AssignReviewerApproverDialogComponent {
 
     get singleUsersSelectOptions() {
         return this.data.mode === 'approver'
-            ? this._appStateService.activeProject.approverIds
-            : this._appStateService.activeProject.memberIds;
+            ? this._appStateService.activeDossier.approverIds
+            : this._appStateService.activeDossier.memberIds;
     }
 
     get changed(): boolean {
@@ -75,7 +75,7 @@ export class AssignReviewerApproverDialogComponent {
                 await this._statusControllerService
                     .setFileReviewerForList(
                         this.data.files.map((f) => f.fileId),
-                        this._appStateService.activeProjectId,
+                        this._appStateService.activeDossierId,
                         selectedUser
                     )
                     .toPromise();
@@ -83,7 +83,7 @@ export class AssignReviewerApproverDialogComponent {
                 await this._statusControllerService
                     .setStatusUnderApprovalForList(
                         this.data.files.map((f) => f.fileId),
-                        this._appStateService.activeProjectId,
+                        this._appStateService.activeDossierId,
                         selectedUser
                     )
                     .toPromise();
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/document-info-dialog/document-info-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/document-info-dialog/document-info-dialog.component.ts
index 6a855e060..7a615df32 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/document-info-dialog/document-info-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/document-info-dialog/document-info-dialog.component.ts
@@ -7,7 +7,7 @@ import {
 } from '@redaction/red-ui-http';
 import { AppStateService } from '@state/app-state.service';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 
 @Component({
     selector: 'redaction-document-info-dialog',
@@ -19,7 +19,7 @@ export class DocumentInfoDialogComponent implements OnInit {
     file: FileStatus;
     attributes: FileAttributeConfig[];
 
-    private _project: ProjectWrapper;
+    private _dossier: DossierWrapper;
 
     constructor(
         private readonly _appStateService: AppStateService,
@@ -29,13 +29,13 @@ export class DocumentInfoDialogComponent implements OnInit {
         @Inject(MAT_DIALOG_DATA) public data: FileStatus
     ) {
         this.file = this.data;
-        this._project = this._appStateService.getProjectById(this.file.projectId);
+        this._dossier = this._appStateService.getDossierById(this.file.dossierId);
     }
 
     async ngOnInit() {
         this.attributes = (
             await this._fileAttributesService
-                .getFileAttributesConfiguration(this._project.ruleSetId)
+                .getFileAttributesConfiguration(this._dossier.dossierTemplateId)
                 .toPromise()
         ).fileAttributeConfigs.filter((attr) => attr.editable);
         const formConfig = this.attributes.reduce(
@@ -54,7 +54,7 @@ export class DocumentInfoDialogComponent implements OnInit {
             ...this.documentInfoForm.getRawValue()
         };
         await this._fileAttributesService
-            .setFileAttributes({ attributeIdToValue }, this.file.projectId, this.file.fileId)
+            .setFileAttributes({ attributeIdToValue }, this.file.dossierId, this.file.fileId)
             .toPromise();
         this.file.fileAttributes = { attributeIdToValue };
         this.dialogRef.close(true);
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.html b/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.html
index 2f61b1b69..f3888fe6b 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.html
+++ b/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.html
@@ -7,7 +7,7 @@
                 #dictionaryManager
                 [withFloatingActions]="false"
                 [canEdit]="canEdit"
-                [initialEntries]="project.type?.entries"
+                [initialEntries]="dossier.type?.entries"
             ></redaction-dictionary-manager>
         </div>
 
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.ts
index 900fb9966..5032c4f56 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.ts
@@ -1,6 +1,6 @@
 import { Component, Inject, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { ProjectWrapper } from '../../../../state/model/project.wrapper';
+import { DossierWrapper } from '../../../../state/model/dossier.wrapper';
 import { DictionaryManagerComponent } from '../../../shared/components/dictionary-manager/dictionary-manager.component';
 import { DictionarySaveService } from '../../../shared/services/dictionary-save.service';
 import { AppStateService } from '../../../../state/app-state.service';
@@ -19,12 +19,12 @@ export class DossierDictionaryDialogComponent {
     constructor(
         public permissionsService: PermissionsService,
         public dialogRef: MatDialogRef<DossierDictionaryDialogComponent>,
-        @Inject(MAT_DIALOG_DATA) public project: ProjectWrapper,
+        @Inject(MAT_DIALOG_DATA) public dossier: DossierWrapper,
         private readonly _appStateService: AppStateService,
         private readonly _dictionarySaveService: DictionarySaveService
     ) {
         this.canEdit =
-            this.permissionsService.isProjectMember(this.project) ||
+            this.permissionsService.isDossierMember(this.dossier) ||
             this.permissionsService.isAdmin();
     }
 
@@ -33,15 +33,15 @@ export class DossierDictionaryDialogComponent {
             .saveEntries(
                 this._dictionaryManager.currentEntries,
                 this._dictionaryManager.initialEntries,
-                this.project.ruleSetId,
+                this.dossier.dossierTemplateId,
                 'dossier_redaction',
-                this.project.projectId
+                this.dossier.dossierId
             )
             .subscribe(async () => {
-                await this._appStateService.reloadActiveProjectFiles();
-                this._appStateService.updateProjectDictionary(
-                    this.project.ruleSetId,
-                    this.project.projectId
+                await this._appStateService.reloadActiveDossierFiles();
+                this._appStateService.updateDossierDictionary(
+                    this.dossier.dossierTemplateId,
+                    this.dossier.dossierId
                 );
                 this.dialogRef.close();
             });
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.html b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.html
index bc28e0f49..cba8cddd7 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.html
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.html
@@ -1,5 +1,5 @@
 <redaction-dictionary-manager
     [canEdit]="canEdit"
-    [initialEntries]="projectWrapper.type?.entries || []"
+    [initialEntries]="dossierWrapper.type?.entries || []"
     [withFloatingActions]="false"
 ></redaction-dictionary-manager>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.ts
index 8c00c41f0..05718d395 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.ts
@@ -1,19 +1,19 @@
 import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
 import { AppStateService } from '../../../../../state/app-state.service';
-import { ProjectWrapper } from '../../../../../state/model/project.wrapper';
-import { EditProjectSectionInterface } from '../edit-project-section.interface';
+import { DossierWrapper } from '../../../../../state/model/dossier.wrapper';
+import { EditDossierSectionInterface } from '../edit-dossier-section.interface';
 import { DictionarySaveService } from '../../../../shared/services/dictionary-save.service';
 import { DictionaryManagerComponent } from '../../../../shared/components/dictionary-manager/dictionary-manager.component';
 import { PermissionsService } from '../../../../../services/permissions.service';
 
 @Component({
-    selector: 'redaction-edit-project-dictionary',
-    templateUrl: './edit-project-dictionary.component.html',
-    styleUrls: ['./edit-project-dictionary.component.scss']
+    selector: 'redaction-edit-dossier-dictionary',
+    templateUrl: './edit-dossier-dictionary.component.html',
+    styleUrls: ['./edit-dossier-dictionary.component.scss']
 })
-export class EditProjectDictionaryComponent implements EditProjectSectionInterface {
-    @Input() projectWrapper: ProjectWrapper;
-    @Output() updateProject = new EventEmitter<any>();
+export class EditDossierDictionaryComponent implements EditDossierSectionInterface {
+    @Input() dossierWrapper: DossierWrapper;
+    @Output() updateDossier = new EventEmitter<any>();
     canEdit = false;
     @ViewChild(DictionaryManagerComponent, { static: false })
     private _dictionaryManager: DictionaryManagerComponent;
@@ -24,7 +24,7 @@ export class EditProjectDictionaryComponent implements EditProjectSectionInterfa
         private readonly _permissionsService: PermissionsService
     ) {
         this.canEdit =
-            this._permissionsService.isProjectMember(this.projectWrapper) ||
+            this._permissionsService.isDossierMember(this.dossierWrapper) ||
             this._permissionsService.isAdmin();
     }
 
@@ -41,17 +41,17 @@ export class EditProjectDictionaryComponent implements EditProjectSectionInterfa
             .saveEntries(
                 this._dictionaryManager.currentEntries,
                 this._dictionaryManager.initialEntries,
-                this.projectWrapper.ruleSetId,
+                this.dossierWrapper.dossierTemplateId,
                 'dossier_redaction',
-                this.projectWrapper.projectId,
+                this.dossierWrapper.dossierId,
                 false
             )
             .subscribe(async () => {
-                this._appStateService.updateProjectDictionary(
-                    this.projectWrapper.ruleSetId,
-                    this.projectWrapper.projectId
+                this._appStateService.updateDossierDictionary(
+                    this.dossierWrapper.dossierTemplateId,
+                    this.dossierWrapper.dossierId
                 );
-                this.updateProject.emit();
+                this.updateDossier.emit();
             });
     }
 
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.html b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.html
index 00aa63696..3e84f42dd 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.html
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.html
@@ -1,4 +1,4 @@
-<form [formGroup]="projectForm">
+<form [formGroup]="dossierForm">
     <redaction-select
         [label]="'report-type.label' | translate: { length: reportTypesLength }"
         [options]="reportTypesEnum"
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.ts
index 812b3a0bc..20743d3e2 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.ts
@@ -1,23 +1,23 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { RuleSetModel } from '@redaction/red-ui-http';
+import { DossierTemplateModel } from '@redaction/red-ui-http';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { AppStateService } from '../../../../../state/app-state.service';
-import { ProjectWrapper } from '../../../../../state/model/project.wrapper';
-import { EditProjectSectionInterface } from '../edit-project-section.interface';
+import { DossierWrapper } from '../../../../../state/model/dossier.wrapper';
+import { EditDossierSectionInterface } from '../edit-dossier-section.interface';
 
 @Component({
-    selector: 'redaction-edit-project-download-package',
-    templateUrl: './edit-project-download-package.component.html',
-    styleUrls: ['./edit-project-download-package.component.scss']
+    selector: 'redaction-edit-dossier-download-package',
+    templateUrl: './edit-dossier-download-package.component.html',
+    styleUrls: ['./edit-dossier-download-package.component.scss']
 })
-export class EditProjectDownloadPackageComponent implements OnInit, EditProjectSectionInterface {
-    projectForm: FormGroup;
+export class EditDossierDownloadPackageComponent implements OnInit, EditDossierSectionInterface {
+    dossierForm: FormGroup;
     downloadTypesEnum = ['ORIGINAL', 'PREVIEW', 'REDACTED'];
-    reportTypesEnum = Object.values(RuleSetModel.ReportTypesEnum);
-    ruleSets: RuleSetModel[];
+    reportTypesEnum = Object.values(DossierTemplateModel.ReportTypesEnum);
+    dossierTemplates: DossierTemplateModel[];
 
-    @Input() projectWrapper: ProjectWrapper;
-    @Output() updateProject = new EventEmitter<any>();
+    @Input() dossierWrapper: DossierWrapper;
+    @Output() updateDossier = new EventEmitter<any>();
 
     constructor(
         private readonly _appStateService: AppStateService,
@@ -25,27 +25,27 @@ export class EditProjectDownloadPackageComponent implements OnInit, EditProjectS
     ) {}
 
     get reportTypesLength() {
-        return this.projectForm.controls['reportTypes']?.value?.length
-            ? this.projectForm.controls['reportTypes'].value.length
+        return this.dossierForm.controls['reportTypes']?.value?.length
+            ? this.dossierForm.controls['reportTypes'].value.length
             : 0;
     }
 
     get downloadFileTypesLength() {
-        return this.projectForm.controls['downloadFileTypes']?.value?.length
-            ? this.projectForm.controls['downloadFileTypes'].value.length
+        return this.dossierForm.controls['downloadFileTypes']?.value?.length
+            ? this.dossierForm.controls['downloadFileTypes'].value.length
             : 0;
     }
 
     get changed() {
-        for (const key of Object.keys(this.projectForm.getRawValue())) {
+        for (const key of Object.keys(this.dossierForm.getRawValue())) {
             if (
-                this.projectWrapper.project[key].length !== this.projectForm.get(key).value.length
+                this.dossierWrapper.dossier[key].length !== this.dossierForm.get(key).value.length
             ) {
                 return true;
             }
 
-            const originalItems = [...this.projectWrapper.project[key]].sort();
-            const newItems = [...this.projectForm.get(key).value].sort();
+            const originalItems = [...this.dossierWrapper.dossier[key]].sort();
+            const newItems = [...this.dossierForm.get(key).value].sort();
 
             for (let idx = 0; idx < originalItems.length; ++idx) {
                 if (originalItems[idx] !== newItems[idx]) {
@@ -58,30 +58,30 @@ export class EditProjectDownloadPackageComponent implements OnInit, EditProjectS
     }
 
     get disabled() {
-        return this.projectForm.invalid;
+        return this.dossierForm.invalid;
     }
 
     ngOnInit() {
-        this.projectForm = this._formBuilder.group({
-            reportTypes: [this.projectWrapper.project.reportTypes, Validators.required],
-            downloadFileTypes: [this.projectWrapper.project.downloadFileTypes]
+        this.dossierForm = this._formBuilder.group({
+            reportTypes: [this.dossierWrapper.dossier.reportTypes, Validators.required],
+            downloadFileTypes: [this.dossierWrapper.dossier.downloadFileTypes]
         });
     }
 
     async save() {
-        const project = {
-            ...this.projectWrapper.project,
-            downloadFileTypes: this.projectForm.get('downloadFileTypes').value,
-            reportTypes: this.projectForm.get('reportTypes').value
+        const dossier = {
+            ...this.dossierWrapper.dossier,
+            downloadFileTypes: this.dossierForm.get('downloadFileTypes').value,
+            reportTypes: this.dossierForm.get('reportTypes').value
         };
-        const updatedProject = await this._appStateService.addOrUpdateProject(project);
-        this.updateProject.emit(updatedProject);
+        const updatedDossier = await this._appStateService.addOrUpdateDossier(dossier);
+        this.updateDossier.emit(updatedDossier);
     }
 
     revert() {
-        this.projectForm.reset({
-            downloadFileTypes: this.projectWrapper.project.downloadFileTypes,
-            reportTypes: this.projectWrapper.project.reportTypes
+        this.dossierForm.reset({
+            downloadFileTypes: this.dossierWrapper.dossier.downloadFileTypes,
+            reportTypes: this.dossierWrapper.dossier.reportTypes
         });
     }
 }
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.html b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.html
index c7f99b98e..f0797ef1a 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.html
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.html
@@ -1,6 +1,6 @@
 <section class="dialog">
     <div class="dialog-header heading-l">
-        {{ 'edit-project-dialog.header' | translate: { projectName: projectWrapper.name } }}
+        {{ 'edit-dossier-dialog.header' | translate: { dossierName: dossierWrapper.name } }}
     </div>
 
     <div class="dialog-content">
@@ -9,7 +9,7 @@
                 (click)="changeTab(item.key)"
                 *ngFor="let item of navItems"
                 [class.active]="item.key === activeNav"
-                [translate]="'edit-project-dialog.nav-items.' + item.key"
+                [translate]="'edit-dossier-dialog.nav-items.' + item.key"
                 class="item"
             ></div>
         </redaction-side-nav>
@@ -17,7 +17,7 @@
             <div class="content">
                 <div class="heading">
                     {{
-                        'edit-project-dialog.nav-items.' +
+                        'edit-dossier-dialog.nav-items.' +
                             (activeNavItem.title || activeNavItem.key) | translate
                     }}
 
@@ -28,39 +28,39 @@
                         <div>
                             <mat-icon svgIcon="red:entries"></mat-icon>
                             {{
-                                'edit-project-dialog.dictionary.entries'
+                                'edit-dossier-dialog.dictionary.entries'
                                     | translate
-                                        : { length: (projectWrapper.type?.entries || []).length }
+                                        : { length: (dossierWrapper.type?.entries || []).length }
                             }}
                         </div>
                     </div>
                 </div>
 
-                <redaction-edit-project-general-info
-                    (updateProject)="updatedProject($event)"
+                <redaction-edit-dossier-general-info
+                    (updateDossier)="updatedDossier($event)"
                     *ngIf="activeNav === 'dossier-info'"
-                    [projectWrapper]="projectWrapper"
-                ></redaction-edit-project-general-info>
+                    [dossierWrapper]="dossierWrapper"
+                ></redaction-edit-dossier-general-info>
 
-                <redaction-edit-project-download-package
-                    (updateProject)="updatedProject($event)"
+                <redaction-edit-dossier-download-package
+                    (updateDossier)="updatedDossier($event)"
                     *ngIf="activeNav === 'download-package'"
-                    [projectWrapper]="projectWrapper"
-                ></redaction-edit-project-download-package>
+                    [dossierWrapper]="dossierWrapper"
+                ></redaction-edit-dossier-download-package>
 
-                <redaction-edit-project-dictionary
-                    (updateProject)="updatedProject($event)"
+                <redaction-edit-dossier-dictionary
+                    (updateDossier)="updatedDossier($event)"
                     *ngIf="activeNav === 'dossier-dictionary'"
-                    [projectWrapper]="projectWrapper"
+                    [dossierWrapper]="dossierWrapper"
                 >
-                </redaction-edit-project-dictionary>
+                </redaction-edit-dossier-dictionary>
 
-                <redaction-edit-project-team-members
-                    (updateProject)="updatedProject($event)"
+                <redaction-edit-dossier-team-members
+                    (updateDossier)="updatedDossier($event)"
                     *ngIf="activeNav === 'members'"
-                    [projectWrapper]="projectWrapper"
+                    [dossierWrapper]="dossierWrapper"
                 >
-                </redaction-edit-project-team-members>
+                </redaction-edit-dossier-team-members>
             </div>
 
             <div class="dialog-actions">
@@ -70,13 +70,13 @@
                     color="primary"
                     mat-flat-button
                 >
-                    {{ 'edit-project-dialog.actions.save' | translate }}
+                    {{ 'edit-dossier-dialog.actions.save' | translate }}
                 </button>
 
                 <div
                     (click)="revert()"
                     class="all-caps-label cancel"
-                    translate="edit-project-dialog.actions.revert"
+                    translate="edit-dossier-dialog.actions.revert"
                 ></div>
             </div>
         </div>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.scss b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.scss
index 676f1d919..4301ab740 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.scss
@@ -25,7 +25,7 @@
     }
 }
 
-redaction-edit-project-dictionary {
+redaction-edit-dossier-dictionary {
     display: block;
     height: calc(100% - 74px);
 }
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.ts
index 771e9490f..95a26ab46 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.ts
@@ -2,39 +2,39 @@ import { ChangeDetectorRef, Component, Inject, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { FormBuilder } from '@angular/forms';
 import { AppStateService } from '@state/app-state.service';
-import { ProjectWrapper } from '../../../../state/model/project.wrapper';
-import { EditProjectGeneralInfoComponent } from './general-info/edit-project-general-info.component';
-import { EditProjectDownloadPackageComponent } from './download-package/edit-project-download-package.component';
-import { EditProjectSectionInterface } from './edit-project-section.interface';
+import { DossierWrapper } from '../../../../state/model/dossier.wrapper';
+import { EditDossierGeneralInfoComponent } from './general-info/edit-dossier-general-info.component';
+import { EditDossierDownloadPackageComponent } from './download-package/edit-dossier-download-package.component';
+import { EditDossierSectionInterface } from './edit-dossier-section.interface';
 import { NotificationService, NotificationType } from '../../../../services/notification.service';
 import { TranslateService } from '@ngx-translate/core';
-import { EditProjectDictionaryComponent } from './dictionary/edit-project-dictionary.component';
-import { EditProjectTeamMembersComponent } from './team-members/edit-project-team-members.component';
+import { EditDossierDictionaryComponent } from './dictionary/edit-dossier-dictionary.component';
+import { EditDossierTeamMembersComponent } from './team-members/edit-dossier-team-members.component';
 
 @Component({
-    selector: 'redaction-edit-project-dialog',
-    templateUrl: './edit-project-dialog.component.html',
-    styleUrls: ['./edit-project-dialog.component.scss']
+    selector: 'redaction-edit-dossier-dialog',
+    templateUrl: './edit-dossier-dialog.component.html',
+    styleUrls: ['./edit-dossier-dialog.component.scss']
 })
-export class EditProjectDialogComponent {
+export class EditDossierDialogComponent {
     navItems: { key: string; title?: string }[] = [
         { key: 'dossier-info', title: 'general-info' },
         { key: 'download-package', title: 'choose-download' },
         { key: 'dossier-dictionary', title: 'dossier-dictionary' },
         { key: 'members', title: 'team-members' }
         // TODO:
-        // { key: 'project-attributes' },
+        // { key: 'dossier-attributes' },
         // { key: 'report-attributes' }
     ];
     activeNav = 'dossier-info';
-    projectWrapper: ProjectWrapper;
+    dossierWrapper: DossierWrapper;
 
-    @ViewChild(EditProjectGeneralInfoComponent)
-    generalInfoComponent: EditProjectGeneralInfoComponent;
-    @ViewChild(EditProjectDownloadPackageComponent)
-    downloadPackageComponent: EditProjectDownloadPackageComponent;
-    @ViewChild(EditProjectDictionaryComponent) dictionaryComponent: EditProjectDictionaryComponent;
-    @ViewChild(EditProjectTeamMembersComponent) membersComponent: EditProjectTeamMembersComponent;
+    @ViewChild(EditDossierGeneralInfoComponent)
+    generalInfoComponent: EditDossierGeneralInfoComponent;
+    @ViewChild(EditDossierDownloadPackageComponent)
+    downloadPackageComponent: EditDossierDownloadPackageComponent;
+    @ViewChild(EditDossierDictionaryComponent) dictionaryComponent: EditDossierDictionaryComponent;
+    @ViewChild(EditDossierTeamMembersComponent) membersComponent: EditDossierTeamMembersComponent;
 
     constructor(
         private readonly _appStateService: AppStateService,
@@ -42,18 +42,18 @@ export class EditProjectDialogComponent {
         private readonly _notificationService: NotificationService,
         private readonly _translateService: TranslateService,
         private readonly _changeRef: ChangeDetectorRef,
-        public dialogRef: MatDialogRef<EditProjectDialogComponent>,
+        public dialogRef: MatDialogRef<EditDossierDialogComponent>,
         @Inject(MAT_DIALOG_DATA)
-        public data: { projectWrapper: ProjectWrapper; afterSave: Function }
+        public data: { dossierWrapper: DossierWrapper; afterSave: Function }
     ) {
-        this.projectWrapper = data.projectWrapper;
+        this.dossierWrapper = data.dossierWrapper;
     }
 
     get activeNavItem(): { key: string; title?: string } {
         return this.navItems.find((item) => item.key === this.activeNav);
     }
 
-    get activeComponent(): EditProjectSectionInterface {
+    get activeComponent(): EditDossierSectionInterface {
         return {
             'dossier-info': this.generalInfoComponent,
             'download-package': this.downloadPackageComponent,
@@ -62,14 +62,14 @@ export class EditProjectDialogComponent {
         }[this.activeNav];
     }
 
-    updatedProject(updatedProject: ProjectWrapper) {
+    updatedDossier(updatedDossier: DossierWrapper) {
         this._notificationService.showToastNotification(
-            this._translateService.instant('edit-project-dialog.change-successful'),
+            this._translateService.instant('edit-dossier-dialog.change-successful'),
             null,
             NotificationType.SUCCESS
         );
-        if (updatedProject) {
-            this.projectWrapper = updatedProject;
+        if (updatedDossier) {
+            this.dossierWrapper = updatedDossier;
         }
         this._changeRef.detectChanges();
         if (this.data.afterSave) {
@@ -88,7 +88,7 @@ export class EditProjectDialogComponent {
     changeTab(key: string) {
         if (this.activeComponent.changed) {
             this._notificationService.showToastNotification(
-                this._translateService.instant('edit-project-dialog.unsaved-changes'),
+                this._translateService.instant('edit-dossier-dialog.unsaved-changes'),
                 null,
                 NotificationType.ERROR
             );
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-section.interface.ts b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-section.interface.ts
index d0cd6896d..ffe1b7354 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-section.interface.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-section.interface.ts
@@ -1,4 +1,4 @@
-export interface EditProjectSectionInterface {
+export interface EditDossierSectionInterface {
     changed: boolean;
     disabled: boolean;
     save: Function;
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.html b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.html
index 1a7984ec7..79e505ac2 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.html
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.html
@@ -1,10 +1,10 @@
-<form (submit)="save()" [formGroup]="projectForm">
+<form (submit)="save()" [formGroup]="dossierForm">
     <div class="red-input-group required w-300">
-        <label translate="edit-project-dialog.general-info.form.name.label"></label>
+        <label translate="edit-dossier-dialog.general-info.form.name.label"></label>
         <input
-            [placeholder]="'edit-project-dialog.general-info.form.name.placeholder' | translate"
-            formControlName="projectName"
-            name="projectName"
+            [placeholder]="'edit-dossier-dialog.general-info.form.name.placeholder' | translate"
+            formControlName="dossierName"
+            name="dossierName"
             type="text"
         />
     </div>
@@ -12,26 +12,30 @@
     <div class="red-input-group required w-400">
         <mat-form-field floatLabel="always">
             <mat-label>{{
-                'edit-project-dialog.general-info.form.template' | translate
+                'edit-dossier-dialog.general-info.form.template' | translate
             }}</mat-label>
-            <mat-select formControlName="ruleSetId" style="width: 100%">
+            <mat-select formControlName="dossierTemplateId" style="width: 100%">
                 <mat-option
-                    *ngFor="let ruleSet of ruleSets"
-                    [matTooltip]="ruleSet.description ? ruleSet.description : ruleSet.name"
-                    [value]="ruleSet.ruleSetId"
+                    *ngFor="let dossierTemplate of dossierTemplates"
+                    [matTooltip]="
+                        dossierTemplate.description
+                            ? dossierTemplate.description
+                            : dossierTemplate.name
+                    "
+                    [value]="dossierTemplate.dossierTemplateId"
                     matTooltipPosition="after"
                 >
-                    {{ ruleSet.name }}
+                    {{ dossierTemplate.name }}
                 </mat-option>
             </mat-select>
         </mat-form-field>
     </div>
 
     <div class="red-input-group w-400">
-        <label translate="edit-project-dialog.general-info.form.description.label"></label>
+        <label translate="edit-dossier-dialog.general-info.form.description.label"></label>
         <textarea
             [placeholder]="
-                'edit-project-dialog.general-info.form.description.placeholder' | translate
+                'edit-dossier-dialog.general-info.form.description.placeholder' | translate
             "
             formControlName="description"
             name="description"
@@ -48,7 +52,7 @@
             class="filter-menu-checkbox"
             color="primary"
         >
-            {{ 'edit-project-dialog.general-info.form.due-date' | translate }}
+            {{ 'edit-dossier-dialog.general-info.form.due-date' | translate }}
         </mat-checkbox>
 
         <div *ngIf="hasDueDate" class="red-input-group datepicker-wrapper">
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.ts
index c1190a3c0..fb8d040dd 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.ts
@@ -1,24 +1,24 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { RuleSetModel } from '@redaction/red-ui-http';
+import { DossierTemplateModel } from '@redaction/red-ui-http';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { AppStateService } from '../../../../../state/app-state.service';
 import * as moment from 'moment';
-import { ProjectWrapper } from '../../../../../state/model/project.wrapper';
-import { EditProjectSectionInterface } from '../edit-project-section.interface';
+import { DossierWrapper } from '../../../../../state/model/dossier.wrapper';
+import { EditDossierSectionInterface } from '../edit-dossier-section.interface';
 
 @Component({
-    selector: 'redaction-edit-project-general-info',
-    templateUrl: './edit-project-general-info.component.html',
-    styleUrls: ['./edit-project-general-info.component.scss']
+    selector: 'redaction-edit-dossier-general-info',
+    templateUrl: './edit-dossier-general-info.component.html',
+    styleUrls: ['./edit-dossier-general-info.component.scss']
 })
-export class EditProjectGeneralInfoComponent implements OnInit, EditProjectSectionInterface {
-    projectForm: FormGroup;
+export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSectionInterface {
+    dossierForm: FormGroup;
     hasDueDate: boolean;
-    reportTypesEnum = Object.values(RuleSetModel.ReportTypesEnum);
-    ruleSets: RuleSetModel[];
+    reportTypesEnum = Object.values(DossierTemplateModel.ReportTypesEnum);
+    dossierTemplates: DossierTemplateModel[];
 
-    @Input() projectWrapper: ProjectWrapper;
-    @Output() updateProject = new EventEmitter<any>();
+    @Input() dossierWrapper: DossierWrapper;
+    @Output() updateDossier = new EventEmitter<any>();
 
     constructor(
         private readonly _appStateService: AppStateService,
@@ -26,20 +26,20 @@ export class EditProjectGeneralInfoComponent implements OnInit, EditProjectSecti
     ) {}
 
     get changed() {
-        for (const key of Object.keys(this.projectForm.getRawValue())) {
+        for (const key of Object.keys(this.dossierForm.getRawValue())) {
             if (key === 'dueDate') {
-                if (this.hasDueDate !== !!this.projectWrapper.dueDate) {
+                if (this.hasDueDate !== !!this.dossierWrapper.dueDate) {
                     return true;
                 }
                 if (
                     this.hasDueDate &&
-                    !moment(this.projectWrapper.dueDate).isSame(
-                        moment(this.projectForm.get(key).value)
+                    !moment(this.dossierWrapper.dueDate).isSame(
+                        moment(this.dossierForm.get(key).value)
                     )
                 ) {
                     return true;
                 }
-            } else if (this.projectWrapper[key] !== this.projectForm.get(key).value) {
+            } else if (this.dossierWrapper[key] !== this.dossierForm.get(key).value) {
                 return true;
             }
         }
@@ -48,54 +48,54 @@ export class EditProjectGeneralInfoComponent implements OnInit, EditProjectSecti
     }
 
     get disabled() {
-        if (this.hasDueDate && this.projectForm.get('dueDate').value === null) {
+        if (this.hasDueDate && this.dossierForm.get('dueDate').value === null) {
             return true;
         }
 
-        return this.projectForm.invalid;
+        return this.dossierForm.invalid;
     }
 
     ngOnInit() {
-        this._filterInvalidRuleSets();
-        this.projectForm = this._formBuilder.group({
-            projectName: [this.projectWrapper.projectName, Validators.required],
-            ruleSetId: [
+        this._filterInvalidDossierTemplates();
+        this.dossierForm = this._formBuilder.group({
+            dossierName: [this.dossierWrapper.dossierName, Validators.required],
+            dossierTemplateId: [
                 {
-                    value: this.projectWrapper.ruleSetId,
-                    disabled: this.projectWrapper.hasFiles
+                    value: this.dossierWrapper.dossierTemplateId,
+                    disabled: this.dossierWrapper.hasFiles
                 },
                 Validators.required
             ],
-            description: [this.projectWrapper.description],
-            dueDate: [this.projectWrapper.dueDate]
+            description: [this.dossierWrapper.description],
+            dueDate: [this.dossierWrapper.dueDate]
         });
-        this.hasDueDate = !!this.projectWrapper.dueDate;
+        this.hasDueDate = !!this.dossierWrapper.dueDate;
     }
 
     revert() {
-        this.projectForm.reset({
-            projectName: this.projectWrapper.projectName,
-            ruleSetId: this.projectWrapper.ruleSetId,
-            description: this.projectWrapper.description,
-            dueDate: this.projectWrapper.dueDate
+        this.dossierForm.reset({
+            dossierName: this.dossierWrapper.dossierName,
+            dossierTemplateId: this.dossierWrapper.dossierTemplateId,
+            description: this.dossierWrapper.description,
+            dueDate: this.dossierWrapper.dueDate
         });
     }
 
     async save() {
-        const project = {
-            ...this.projectWrapper.project,
-            projectName: this.projectForm.get('projectName').value,
-            description: this.projectForm.get('description').value,
-            dueDate: this.hasDueDate ? this.projectForm.get('dueDate').value : undefined,
-            ruleSetId: this.projectForm.get('ruleSetId').value
+        const dossier = {
+            ...this.dossierWrapper.dossier,
+            dossierName: this.dossierForm.get('dossierName').value,
+            description: this.dossierForm.get('description').value,
+            dueDate: this.hasDueDate ? this.dossierForm.get('dueDate').value : undefined,
+            dossierTemplateId: this.dossierForm.get('dossierTemplateId').value
         };
-        const updatedProject = await this._appStateService.addOrUpdateProject(project);
-        this.updateProject.emit(updatedProject);
+        const updatedDossier = await this._appStateService.addOrUpdateDossier(dossier);
+        this.updateDossier.emit(updatedDossier);
     }
 
-    private _filterInvalidRuleSets() {
-        this.ruleSets = this._appStateService.ruleSets.filter((r) => {
-            if (this.projectWrapper?.ruleSetId === r.ruleSetId) {
+    private _filterInvalidDossierTemplates() {
+        this.dossierTemplates = this._appStateService.dossierTemplates.filter((r) => {
+            if (this.dossierWrapper?.dossierTemplateId === r.dossierTemplateId) {
                 return true;
             }
             const notYetValid = !!r.validFrom && moment(r.validFrom).isAfter(moment());
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.html b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.html
index 50a0ae137..530efedca 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.html
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.html
@@ -1,4 +1,4 @@
 <redaction-team-members-manager
-    (save)="updatedProject($event)"
-    [projectWrapper]="projectWrapper"
+    (save)="updatedDossier($event)"
+    [dossierWrapper]="dossierWrapper"
 ></redaction-team-members-manager>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.ts
index cedbd4c92..bd9bf0f25 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.ts
@@ -1,18 +1,18 @@
 import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
 import { AppStateService } from '../../../../../state/app-state.service';
-import { ProjectWrapper } from '../../../../../state/model/project.wrapper';
-import { EditProjectSectionInterface } from '../edit-project-section.interface';
+import { DossierWrapper } from '../../../../../state/model/dossier.wrapper';
+import { EditDossierSectionInterface } from '../edit-dossier-section.interface';
 import { PermissionsService } from '../../../../../services/permissions.service';
 import { TeamMembersManagerComponent } from '../../../components/team-members-manager/team-members-manager.component';
 
 @Component({
-    selector: 'redaction-edit-project-team-members',
-    templateUrl: './edit-project-team-members.component.html',
-    styleUrls: ['./edit-project-team-members.component.scss']
+    selector: 'redaction-edit-dossier-team-members',
+    templateUrl: './edit-dossier-team-members.component.html',
+    styleUrls: ['./edit-dossier-team-members.component.scss']
 })
-export class EditProjectTeamMembersComponent implements EditProjectSectionInterface {
-    @Input() projectWrapper: ProjectWrapper;
-    @Output() updateProject = new EventEmitter<any>();
+export class EditDossierTeamMembersComponent implements EditDossierSectionInterface {
+    @Input() dossierWrapper: DossierWrapper;
+    @Output() updateDossier = new EventEmitter<any>();
 
     @ViewChild(TeamMembersManagerComponent) managerComponent: TeamMembersManagerComponent;
 
@@ -33,8 +33,8 @@ export class EditProjectTeamMembersComponent implements EditProjectSectionInterf
         await this.managerComponent.saveMembers();
     }
 
-    updatedProject($event) {
-        this.updateProject.emit($event);
+    updatedDossier($event) {
+        this.updateDossier.emit($event);
     }
 
     revert() {
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts
index 68799cbe4..960f56e7b 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts
@@ -39,7 +39,7 @@ export class ForceRedactionDialogComponent implements OnInit {
 
     async ngOnInit() {
         this._legalBasisMappingControllerService
-            .getLegalBasisMapping(this._appStateService.activeProject.ruleSetId)
+            .getLegalBasisMapping(this._appStateService.activeDossier.dossierTemplateId)
             .subscribe((data) => {
                 data.map((lbm) => {
                     this.legalOptions.push({
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
index f2bb79f92..ff0430769 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
@@ -63,7 +63,7 @@ export class ManualAnnotationDialogComponent implements OnInit {
 
     async ngOnInit() {
         this._legalBasisMappingControllerService
-            .getLegalBasisMapping(this._appStateService.activeProject.ruleSetId)
+            .getLegalBasisMapping(this._appStateService.activeDossier.dossierTemplateId)
             .subscribe((data) => {
                 data.map((lbm) => {
                     this.legalOptions.push({
@@ -91,7 +91,9 @@ export class ManualAnnotationDialogComponent implements OnInit {
         });
 
         for (const key of Object.keys(
-            this._appStateService.dictionaryData[this._appStateService.activeProject.ruleSetId]
+            this._appStateService.dictionaryData[
+                this._appStateService.activeDossier.dossierTemplateId
+            ]
         )) {
             const dictionaryData = this._appStateService.getDictionaryTypeValue(key);
             if (!dictionaryData.virtual && dictionaryData.addToDictionaryAction) {
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.html b/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.html
index 6bd59da48..077804a15 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.html
+++ b/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.html
@@ -1,10 +1,10 @@
 <section class="dialog">
-    <div [translate]="'assign-project-owner.dialog.title'" class="dialog-header heading-l"></div>
+    <div [translate]="'assign-dossier-owner.dialog.title'" class="dialog-header heading-l"></div>
 
     <div class="dialog-content no-padding-bottom">
         <redaction-team-members-manager
             (save)="save($event)"
-            [projectWrapper]="data.projectWrapper"
+            [dossierWrapper]="data.dossierWrapper"
         ></redaction-team-members-manager>
     </div>
     <div class="dialog-actions">
@@ -14,11 +14,11 @@
             color="primary"
             mat-flat-button
         >
-            {{ 'assign-project-owner.dialog.save' | translate }}
+            {{ 'assign-dossier-owner.dialog.save' | translate }}
         </button>
 
         <div
-            [translate]="'assign-project-owner.dialog.cancel'"
+            [translate]="'assign-dossier-owner.dialog.cancel'"
             class="all-caps-label pointer cancel"
             mat-dialog-close
         ></div>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.ts
index 2377e7d76..34478364b 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.ts
@@ -2,11 +2,11 @@ import { Component, Inject, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { AppStateService } from '@state/app-state.service';
 import { NotificationService } from '@services/notification.service';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 import { TeamMembersManagerComponent } from '../../components/team-members-manager/team-members-manager.component';
 
 class DialogData {
-    projectWrapper?: ProjectWrapper;
+    dossierWrapper?: DossierWrapper;
 }
 
 @Component({
diff --git a/apps/red-ui/src/app/modules/projects/projects-routing.module.ts b/apps/red-ui/src/app/modules/projects/projects-routing.module.ts
index 1eac40c95..aec5ebc6c 100644
--- a/apps/red-ui/src/app/modules/projects/projects-routing.module.ts
+++ b/apps/red-ui/src/app/modules/projects/projects-routing.module.ts
@@ -1,17 +1,17 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { ProjectListingScreenComponent } from './screens/project-listing-screen/project-listing-screen.component';
+import { DossierListingScreenComponent } from './screens/dossier-listing-screen/dossier-listing-screen.component';
 import { CompositeRouteGuard } from '@guards/composite-route.guard';
 import { AuthGuard } from '../auth/auth.guard';
 import { RedRoleGuard } from '../auth/red-role.guard';
 import { AppStateGuard } from '@state/app-state.guard';
-import { ProjectOverviewScreenComponent } from './screens/project-overview-screen/project-overview-screen.component';
+import { DossierOverviewScreenComponent } from './screens/dossier-overview-screen/dossier-overview-screen.component';
 import { FilePreviewScreenComponent } from './screens/file-preview-screen/file-preview-screen.component';
 
 const routes = [
     {
         path: '',
-        component: ProjectListingScreenComponent,
+        component: DossierListingScreenComponent,
         canActivate: [CompositeRouteGuard],
         data: {
             routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard],
@@ -19,8 +19,8 @@ const routes = [
         }
     },
     {
-        path: ':projectId',
-        component: ProjectOverviewScreenComponent,
+        path: ':dossierId',
+        component: DossierOverviewScreenComponent,
         canActivate: [CompositeRouteGuard],
         data: {
             routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard],
@@ -28,7 +28,7 @@ const routes = [
         }
     },
     {
-        path: ':projectId/file/:fileId',
+        path: ':dossierId/file/:fileId',
         component: FilePreviewScreenComponent,
         canActivate: [CompositeRouteGuard],
         data: {
@@ -42,4 +42,4 @@ const routes = [
     imports: [RouterModule.forChild(routes)],
     exports: [RouterModule]
 })
-export class ProjectsRoutingModule {}
+export class DossiersRoutingModule {}
diff --git a/apps/red-ui/src/app/modules/projects/projects.module.ts b/apps/red-ui/src/app/modules/projects/projects.module.ts
index d69c044fa..70406daef 100644
--- a/apps/red-ui/src/app/modules/projects/projects.module.ts
+++ b/apps/red-ui/src/app/modules/projects/projects.module.ts
@@ -1,9 +1,9 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { ProjectListingScreenComponent } from './screens/project-listing-screen/project-listing-screen.component';
-import { ProjectOverviewScreenComponent } from './screens/project-overview-screen/project-overview-screen.component';
+import { DossierListingScreenComponent } from './screens/dossier-listing-screen/dossier-listing-screen.component';
+import { DossierOverviewScreenComponent } from './screens/dossier-overview-screen/dossier-overview-screen.component';
 import { FilePreviewScreenComponent } from './screens/file-preview-screen/file-preview-screen.component';
-import { AddProjectDialogComponent } from './dialogs/add-project-dialog/add-project-dialog.component';
+import { AddDossierDialogComponent } from './dialogs/add-dossier-dialog/add-dossier-dialog.component';
 import { AssignReviewerApproverDialogComponent } from './dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component';
 import { ManualAnnotationDialogComponent } from './dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
 import { ForceRedactionDialogComponent } from './dialogs/force-redaction-dialog/force-redaction-dialog.component';
@@ -11,23 +11,23 @@ import { RemoveAnnotationsDialogComponent } from './dialogs/remove-annotations-d
 import { DocumentInfoDialogComponent } from './dialogs/document-info-dialog/document-info-dialog.component';
 import { PdfViewerComponent } from './components/pdf-viewer/pdf-viewer.component';
 import { CommentsComponent } from './components/comments/comments.component';
-import { ProjectDetailsComponent } from './components/project-details/project-details.component';
+import { DossierDetailsComponent } from './components/dossier-details/dossier-details.component';
 import { PageIndicatorComponent } from './components/page-indicator/page-indicator.component';
 import { NeedsWorkBadgeComponent } from './components/needs-work-badge/needs-work-badge.component';
 import { AnnotationActionsComponent } from './components/annotation-actions/annotation-actions.component';
-import { ProjectListingDetailsComponent } from './components/project-listing-details/project-listing-details.component';
+import { DossierListingDetailsComponent } from './components/dossier-listing-details/dossier-listing-details.component';
 import { FileActionsComponent } from './components/file-actions/file-actions.component';
 import { TypeAnnotationIconComponent } from './components/type-annotation-icon/type-annotation-icon.component';
 import { TypeFilterComponent } from './components/type-filter/type-filter.component';
-import { ProjectOverviewBulkActionsComponent } from './components/bulk-actions/project-overview-bulk-actions.component';
+import { DossierOverviewBulkActionsComponent } from './components/bulk-actions/dossier-overview-bulk-actions.component';
 import { TeamMembersComponent } from './components/team-members/team-members.component';
-import { ProjectListingActionsComponent } from './components/project-listing-actions/project-listing-actions.component';
+import { DossierListingActionsComponent } from './components/dossier-listing-actions/dossier-listing-actions.component';
 import { DocumentInfoComponent } from './components/document-info/document-info.component';
 import { FileWorkloadComponent } from './components/file-workload/file-workload.component';
 import { SharedModule } from '@shared/shared.module';
-import { ProjectsRoutingModule } from './projects-routing.module';
+import { DossiersRoutingModule } from './dossiers-routing.module';
 import { FileUploadDownloadModule } from '@upload-download/file-upload-download.module';
-import { ProjectsDialogService } from './services/projects-dialog.service';
+import { DossiersDialogService } from './services/dossiers-dialog.service';
 import { AnnotationActionsService } from './services/annotation-actions.service';
 import { FileActionService } from './services/file-action.service';
 import { PdfViewerDataService } from './services/pdf-viewer-data.service';
@@ -36,25 +36,25 @@ import { AnnotationDrawService } from './services/annotation-draw.service';
 import { AnnotationProcessingService } from './services/annotation-processing.service';
 import { AnnotationRemoveActionsComponent } from './components/annotation-remove-actions/annotation-remove-actions.component';
 import { DossierDictionaryDialogComponent } from './dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component';
-import { EditProjectDialogComponent } from './dialogs/edit-project-dialog/edit-project-dialog.component';
-import { EditProjectGeneralInfoComponent } from './dialogs/edit-project-dialog/general-info/edit-project-general-info.component';
-import { EditProjectDownloadPackageComponent } from './dialogs/edit-project-dialog/download-package/edit-project-download-package.component';
+import { EditDossierDialogComponent } from './dialogs/edit-dossier-dialog/edit-dossier-dialog.component';
+import { EditDossierGeneralInfoComponent } from './dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component';
+import { EditDossierDownloadPackageComponent } from './dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component';
 import { UserPreferenceControllerService } from '@redaction/red-ui-http';
-import { EditProjectDictionaryComponent } from './dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component';
-import { EditProjectTeamMembersComponent } from './dialogs/edit-project-dialog/team-members/edit-project-team-members.component';
+import { EditDossierDictionaryComponent } from './dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component';
+import { EditDossierTeamMembersComponent } from './dialogs/edit-dossier-dialog/team-members/edit-dossier-team-members.component';
 import { TeamMembersManagerComponent } from './components/team-members-manager/team-members-manager.component';
 import { TeamMembersDialogComponent } from './dialogs/team-members-dialog/team-members-dialog.component';
 import { ScrollButtonComponent } from './components/scroll-button/scroll-button.component';
 
 const screens = [
-    ProjectListingScreenComponent,
-    ProjectOverviewScreenComponent,
+    DossierListingScreenComponent,
+    DossierOverviewScreenComponent,
     FilePreviewScreenComponent
 ];
 
 const dialogs = [
-    AddProjectDialogComponent,
-    EditProjectDialogComponent,
+    AddDossierDialogComponent,
+    EditDossierDialogComponent,
     TeamMembersDialogComponent,
     ManualAnnotationDialogComponent,
     ForceRedactionDialogComponent,
@@ -67,24 +67,24 @@ const dialogs = [
 const components = [
     PdfViewerComponent,
     CommentsComponent,
-    ProjectDetailsComponent,
+    DossierDetailsComponent,
     PageIndicatorComponent,
     NeedsWorkBadgeComponent,
     AnnotationActionsComponent,
-    ProjectListingDetailsComponent,
+    DossierListingDetailsComponent,
     TypeAnnotationIconComponent,
     TypeFilterComponent,
-    ProjectOverviewBulkActionsComponent,
+    DossierOverviewBulkActionsComponent,
     FileActionsComponent,
     TeamMembersComponent,
-    ProjectListingActionsComponent,
+    DossierListingActionsComponent,
     DocumentInfoComponent,
     FileWorkloadComponent,
     AnnotationRemoveActionsComponent,
-    EditProjectGeneralInfoComponent,
-    EditProjectDownloadPackageComponent,
-    EditProjectDictionaryComponent,
-    EditProjectTeamMembersComponent,
+    EditDossierGeneralInfoComponent,
+    EditDossierDownloadPackageComponent,
+    EditDossierDictionaryComponent,
+    EditDossierTeamMembersComponent,
     TeamMembersManagerComponent,
     ScrollButtonComponent,
 
@@ -93,7 +93,7 @@ const components = [
 ];
 
 const services = [
-    ProjectsDialogService,
+    DossiersDialogService,
     FileActionService,
     AnnotationActionsService,
     ManualAnnotationService,
@@ -106,6 +106,6 @@ const services = [
 @NgModule({
     declarations: [...components],
     providers: [...services],
-    imports: [CommonModule, SharedModule, FileUploadDownloadModule, ProjectsRoutingModule]
+    imports: [CommonModule, SharedModule, FileUploadDownloadModule, DossiersRoutingModule]
 })
-export class ProjectsModule {}
+export class DossiersModule {}
diff --git a/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.html
index e95664b17..1259783a1 100644
--- a/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.html
@@ -73,7 +73,7 @@
                             !editingReviewer &&
                             !appStateService.activeFile.currentReviewer &&
                             permissionsService.canAssignUser() &&
-                            appStateService.activeProject.hasMoreThanOneReviewer
+                            appStateService.activeDossier.hasMoreThanOneReviewer
                         "
                         class="assign-reviewer pointer"
                         translate="file-preview.assign-reviewer"
@@ -200,7 +200,7 @@
             <redaction-circle-button
                 (action)="closeFullScreen()"
                 *ngIf="!fullScreen"
-                [routerLink]="['/main/projects/' + appStateService.activeProjectId]"
+                [routerLink]="['/main/dossiers/' + appStateService.activeDossierId]"
                 class="ml-8"
                 icon="red:close"
                 tooltip="common.close"
diff --git a/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.ts
index 2b606320f..57366f03c 100644
--- a/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.ts
@@ -39,7 +39,7 @@ import { PdfViewerDataService } from '../../services/pdf-viewer-data.service';
 import { download } from '@utils/file-download-utils';
 import { ViewMode } from '@models/file/view-mode';
 import { FileWorkloadComponent } from '../../components/file-workload/file-workload.component';
-import { ProjectsDialogService } from '../../services/projects-dialog.service';
+import { DossiersDialogService } from '../../services/dossiers-dialog.service';
 import { OnAttach, OnDetach } from '@utils/custom-route-reuse.strategy';
 
 const ALL_HOTKEY_ARRAY = ['Escape', 'F', 'f'];
@@ -86,7 +86,7 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
         private readonly _userPreferenceControllerService: UserPreferenceControllerService,
         private readonly _changeDetectorRef: ChangeDetectorRef,
         private readonly _activatedRoute: ActivatedRoute,
-        private readonly _dialogService: ProjectsDialogService,
+        private readonly _dialogService: DossiersDialogService,
         private readonly _router: Router,
         private readonly _notificationService: NotificationService,
         private readonly _annotationProcessingService: AnnotationProcessingService,
@@ -115,14 +115,14 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
 
     get singleUsersSelectOptions() {
         return this.appStateService.activeFile?.isUnderApproval
-            ? this.appStateService.activeProject.approverIds
-            : this.appStateService.activeProject.memberIds;
+            ? this.appStateService.activeDossier.approverIds
+            : this.appStateService.activeDossier.memberIds;
     }
 
     get assignTooltip() {
         return this.appStateService.activeFile.isUnderApproval
-            ? 'project-overview.assign-approver'
-            : 'project-overview.assign-reviewer';
+            ? 'dossier-overview.assign-approver'
+            : 'dossier-overview.assign-reviewer';
     }
 
     get annotations(): AnnotationWrapper[] {
@@ -165,8 +165,8 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
         ); // on less than 3 seconds show indeterminate
     }
 
-    get projectId() {
-        return this.appStateService.activeProjectId;
+    get dossierId() {
+        return this.appStateService.activeDossierId;
     }
 
     get fileId() {
@@ -230,7 +230,7 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
     ngOnInit(): void {
         this.displayPDFViewer = true;
 
-        const key = 'Project-Recent-' + this.projectId;
+        const key = 'Dossier-Recent-' + this.dossierId;
         this._userPreferenceControllerService
             .savePreferences([this.fileId], key)
             .toPromise()
@@ -261,7 +261,9 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
         );
         const processStartTime = new Date().getTime();
         this.annotationData = this.fileData.getAnnotations(
-            this.appStateService.dictionaryData[this.appStateService.activeProject.ruleSetId],
+            this.appStateService.dictionaryData[
+                this.appStateService.activeDossier.dossierTemplateId
+            ],
             this.permissionsService.currentUser,
             this.viewMode,
             this.userPreferenceService.areDevFeaturesEnabled
@@ -427,7 +429,7 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
 
         switch (action) {
             case 'delete':
-                await this._router.navigate([`/main/projects/${this.projectId}`]);
+                await this._router.navigate([`/main/dossiers/${this.dossierId}`]);
                 return;
 
             case 'enable-analysis':
@@ -437,7 +439,7 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
                 this.loadingMessage = 'file-preview.reanalyse-file';
                 await this._loadFileData().toPromise();
                 this._updateCanPerformActions();
-                await this.appStateService.reloadActiveProjectFiles();
+                await this.appStateService.reloadActiveDossierFiles();
                 return;
 
             case 'view-document-info':
@@ -462,7 +464,7 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
 
         this._statusControllerService
             .setFileReviewer(
-                this.fileData.fileStatus.projectId,
+                this.fileData.fileStatus.dossierId,
                 this.fileData.fileStatus.fileId,
                 reviewerId
             )
@@ -499,7 +501,7 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
     downloadOriginalFile() {
         this._fileManagementControllerService
             .downloadOriginalFile(
-                this.projectId,
+                this.dossierId,
                 this.fileId,
                 true,
                 this.fileData.fileStatus.lastUploaded,
@@ -522,11 +524,11 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
 
     // <!-- Dev Mode Features-->
     async openSSRFilePreview() {
-        window.open(`/pdf-preview/${this.projectId}/${this.fileId}`, '_blank');
+        window.open(`/pdf-preview/${this.dossierId}/${this.fileId}`, '_blank');
     }
 
     async openHTMLDebug() {
-        window.open(`/html-debug/${this.projectId}/${this.fileId}`, '_blank');
+        window.open(`/html-debug/${this.dossierId}/${this.fileId}`, '_blank');
     }
 
     private _subscribeToFileUpdates(): void {
@@ -579,7 +581,7 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy, OnAttach,
                 } else {
                     if (fileDataModel.fileStatus.isError) {
                         this._router.navigate([
-                            '/main/projects/' + this.appStateService.activeProjectId
+                            '/main/dossiers/' + this.appStateService.activeDossierId
                         ]);
                     } else {
                         this.loadingMessage = 'file-preview.reanalyse-file';
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.html b/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.html
index 8cb7cfac4..c7454a395 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.html
@@ -25,16 +25,16 @@
                 [primaryFilters]="needsWorkFilters"
             ></redaction-filter>
             <redaction-filter
-                #ruleSetFilter
+                #dossierTemplateFilter
                 (filtersChanged)="filtersChanged()"
-                *ngIf="ruleSetFilters.length > 1"
-                [filterLabel]="'filters.rulesets'"
+                *ngIf="dossierTemplateFilters.length > 1"
+                [filterLabel]="'filters.dossier-templates'"
                 [icon]="'red:template'"
-                [primaryFilters]="ruleSetFilters"
+                [primaryFilters]="dossierTemplateFilters"
             ></redaction-filter>
             <redaction-search-input
                 [form]="searchForm"
-                [placeholder]="'project-listing.search'"
+                [placeholder]="'dossier-listing.search'"
             ></redaction-search-input>
             <div
                 (click)="resetFilters()"
@@ -44,10 +44,10 @@
             ></div>
         </div>
         <redaction-icon-button
-            (action)="openAddProjectDialog()"
+            (action)="openAddDossierDialog()"
             *ngIf="permissionsService.isManager()"
             icon="red:plus"
-            text="project-listing.add-new"
+            text="dossier-listing.add-new"
             type="primary"
         ></redaction-icon-button>
     </div>
@@ -59,7 +59,7 @@
             <div class="header-item">
                 <span class="all-caps-label">
                     {{
-                        'project-listing.table-header.title'
+                        'dossier-listing.table-header.title'
                             | translate: { length: displayedEntities.length || 0 }
                     }}
                 </span>
@@ -70,37 +70,37 @@
                     (toggleSort)="toggleSort($event)"
                     [activeSortingOption]="sortingOption"
                     [withSort]="true"
-                    column="project.projectName"
-                    label="project-listing.table-col-names.name"
+                    column="dossier.dossierName"
+                    label="dossier-listing.table-col-names.name"
                 ></redaction-table-col-name>
 
                 <redaction-table-col-name
-                    label="project-listing.table-col-names.needs-work"
+                    label="dossier-listing.table-col-names.needs-work"
                 ></redaction-table-col-name>
 
                 <redaction-table-col-name
                     class="user-column"
-                    label="project-listing.table-col-names.owner"
+                    label="dossier-listing.table-col-names.owner"
                 ></redaction-table-col-name>
 
                 <redaction-table-col-name
                     class="flex-end"
-                    label="project-listing.table-col-names.status"
+                    label="dossier-listing.table-col-names.status"
                 ></redaction-table-col-name>
                 <div class="scrollbar-placeholder"></div>
             </div>
 
             <redaction-empty-state
-                (action)="openAddProjectDialog()"
+                (action)="openAddDossierDialog()"
                 *ngIf="!allEntities.length"
                 [showButton]="permissionsService.isManager()"
                 icon="red:folder"
-                screen="project-listing"
+                screen="dossier-listing"
             ></redaction-empty-state>
 
             <redaction-empty-state
                 *ngIf="allEntities.length && !displayedEntities.length"
-                screen="project-listing"
+                screen="dossier-listing"
                 type="no-match"
             ></redaction-empty-state>
 
@@ -110,20 +110,20 @@
                         let pw of displayedEntities
                             | sortBy: sortingOption.order:sortingOption.column
                     "
-                    [class.pointer]="canOpenProject(pw)"
+                    [class.pointer]="canOpenDossier(pw)"
                     [routerLink]="[
-                        canOpenProject(pw) ? '/main/projects/' + pw.project.projectId : []
+                        canOpenDossier(pw) ? '/main/dossiers/' + pw.dossier.dossierId : []
                     ]"
                     class="table-item"
                 >
                     <div class="filename">
                         <div class="table-item-title heading">
-                            {{ pw.project.projectName }}
+                            {{ pw.dossier.dossierName }}
                         </div>
                         <div class="small-label stats-subtitle">
                             <div>
                                 <mat-icon svgIcon="red:template"></mat-icon>
-                                {{ getRuleSet(pw).name }}
+                                {{ getDossierTemplate(pw).name }}
                             </div>
                         </div>
                         <div class="small-label stats-subtitle">
@@ -141,11 +141,11 @@
                             </div>
                             <div>
                                 <mat-icon svgIcon="red:calendar"></mat-icon>
-                                {{ pw.project.date | date: 'mediumDate' }}
+                                {{ pw.dossier.date | date: 'mediumDate' }}
                             </div>
-                            <div *ngIf="pw.project.dueDate">
+                            <div *ngIf="pw.dossier.dueDate">
                                 <mat-icon svgIcon="red:lightning"></mat-icon>
-                                {{ pw.project.dueDate | date: 'mediumDate' }}
+                                {{ pw.dossier.dueDate | date: 'mediumDate' }}
                             </div>
                         </div>
                     </div>
@@ -156,15 +156,15 @@
                     </div>
                     <div class="user-column">
                         <redaction-initials-avatar
-                            [userId]="pw.project.ownerId"
+                            [userId]="pw.dossier.ownerId"
                             [withName]="true"
                         ></redaction-initials-avatar>
                     </div>
                     <div class="status-container">
-                        <redaction-project-listing-actions
+                        <redaction-dossier-listing-actions
                             (actionPerformed)="actionPerformed()"
-                            [project]="pw"
-                        ></redaction-project-listing-actions>
+                            [dossier]="pw"
+                        ></redaction-dossier-listing-actions>
                     </div>
                     <div class="scrollbar-placeholder"></div>
                 </div>
@@ -178,13 +178,13 @@
         </div>
 
         <div class="right-container" redactionHasScrollbar>
-            <redaction-project-listing-details
+            <redaction-dossier-listing-details
                 (filtersChanged)="filtersChanged($event)"
                 *ngIf="allEntities.length"
                 [documentsChartData]="documentsChartData"
                 [filters]="detailsContainerFilters"
-                [projectsChartData]="projectsChartData"
-            ></redaction-project-listing-details>
+                [dossiersChartData]="dossiersChartData"
+            ></redaction-dossier-listing-details>
         </div>
     </div>
 </section>
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.scss b/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.scss
index 2cf33f158..d101f19d8 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.scss
+++ b/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.scss
@@ -39,7 +39,7 @@
         padding-right: 0;
     }
 
-    redaction-project-listing-details {
+    redaction-dossier-listing-details {
         min-width: 466px;
     }
 }
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.ts b/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.ts
index 7944d214b..d8d39a534 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.ts
@@ -1,5 +1,5 @@
 import { Component, Injector, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { Project, RuleSetModel } from '@redaction/red-ui-http';
+import { Dossier, DossierTemplateModel } from '@redaction/red-ui-http';
 import { AppStateService } from '@state/app-state.service';
 import { UserService } from '@services/user.service';
 import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/simple-doughnut-chart.component';
@@ -8,13 +8,13 @@ import { FilterModel } from '@shared/components/filter/model/filter.model';
 import {
     annotationFilterChecker,
     processFilters,
-    projectMemberChecker,
-    projectStatusChecker,
-    ruleSetChecker
+    dossierMemberChecker,
+    dossierStatusChecker,
+    dossierTemplateChecker
 } from '@shared/components/filter/utils/filter-utils';
 import { TranslateService } from '@ngx-translate/core';
 import { PermissionsService } from '@services/permissions.service';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 import { Subscription, timer } from 'rxjs';
 import { filter, tap } from 'rxjs/operators';
 import { TranslateChartService } from '@services/translate-chart.service';
@@ -22,26 +22,26 @@ import { RedactionFilterSorter } from '@utils/sorters/redaction-filter-sorter';
 import { StatusSorter } from '@utils/sorters/status-sorter';
 import { NavigationEnd, NavigationStart, Router } from '@angular/router';
 import { FilterComponent } from '@shared/components/filter/filter.component';
-import { ProjectsDialogService } from '../../services/projects-dialog.service';
+import { DossiersDialogService } from '../../services/dossiers-dialog.service';
 import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
 import { BaseListingComponent } from '@shared/base/base-listing.component';
 import { OnAttach, OnDetach } from '@utils/custom-route-reuse.strategy';
 
 @Component({
-    selector: 'redaction-project-listing-screen',
-    templateUrl: './project-listing-screen.component.html',
-    styleUrls: ['./project-listing-screen.component.scss']
+    selector: 'redaction-dossier-listing-screen',
+    templateUrl: './dossier-listing-screen.component.html',
+    styleUrls: ['./dossier-listing-screen.component.scss']
 })
-export class ProjectListingScreenComponent
-    extends BaseListingComponent<ProjectWrapper>
+export class DossierListingScreenComponent
+    extends BaseListingComponent<DossierWrapper>
     implements OnInit, OnDestroy, OnAttach, OnDetach
 {
-    projectsChartData: DoughnutChartConfig[] = [];
+    dossiersChartData: DoughnutChartConfig[] = [];
     documentsChartData: DoughnutChartConfig[] = [];
     statusFilters: FilterModel[];
     peopleFilters: FilterModel[];
     needsWorkFilters: FilterModel[];
-    ruleSetFilters: FilterModel[];
+    dossierTemplateFilters: FilterModel[];
     detailsContainerFilters: {
         statusFilters: FilterModel[];
     } = {
@@ -49,8 +49,8 @@ export class ProjectListingScreenComponent
     };
     readonly itemSize = 85;
     protected readonly _searchKey = 'name';
-    protected readonly _sortKey = 'project-listing';
-    private _projectAutoUpdateTimer: Subscription;
+    protected readonly _sortKey = 'dossier-listing';
+    private _dossierAutoUpdateTimer: Subscription;
     private _lastScrollPosition: number;
 
     @ViewChild(CdkVirtualScrollViewport) scrollBar: CdkVirtualScrollViewport;
@@ -58,7 +58,7 @@ export class ProjectListingScreenComponent
     @ViewChild('statusFilter') private _statusFilterComponent: FilterComponent;
     @ViewChild('peopleFilter') private _peopleFilterComponent: FilterComponent;
     @ViewChild('needsWorkFilter') private _needsWorkFilterComponent: FilterComponent;
-    @ViewChild('ruleSetFilter') private _ruleSetFilterComponent: FilterComponent;
+    @ViewChild('dossierTemplateFilter') private _dossierTemplateFilterComponent: FilterComponent;
 
     private _routerEventsScrollPositionSub: Subscription;
     private _fileChangedSub: Subscription;
@@ -67,7 +67,7 @@ export class ProjectListingScreenComponent
         readonly permissionsService: PermissionsService,
         private readonly _translateChartService: TranslateChartService,
         private readonly _userService: UserService,
-        private readonly _dialogService: ProjectsDialogService,
+        private readonly _dialogService: DossiersDialogService,
         private readonly _translateService: TranslateService,
         private readonly _router: Router,
         private readonly _appStateService: AppStateService,
@@ -86,13 +86,13 @@ export class ProjectListingScreenComponent
         return this._userService.user;
     }
 
-    get activeProjectsCount() {
-        return this.allEntities.filter((p) => p.project.status === Project.StatusEnum.ACTIVE)
+    get activeDossiersCount() {
+        return this.allEntities.filter((p) => p.dossier.status === Dossier.StatusEnum.ACTIVE)
             .length;
     }
 
-    get inactiveProjectsCount() {
-        return this.allEntities.length - this.activeProjectsCount;
+    get inactiveDossiersCount() {
+        return this.allEntities.length - this.activeDossiersCount;
     }
 
     protected get _filterComponents(): FilterComponent[] {
@@ -100,7 +100,7 @@ export class ProjectListingScreenComponent
             this._statusFilterComponent,
             this._peopleFilterComponent,
             this._needsWorkFilterComponent,
-            this._ruleSetFilterComponent
+            this._dossierTemplateFilterComponent
         ];
     }
 
@@ -111,25 +111,25 @@ export class ProjectListingScreenComponent
         checkerArgs?: any;
     }[] {
         return [
-            { values: this.statusFilters, checker: projectStatusChecker },
-            { values: this.peopleFilters, checker: projectMemberChecker },
+            { values: this.statusFilters, checker: dossierStatusChecker },
+            { values: this.peopleFilters, checker: dossierMemberChecker },
             {
                 values: this.needsWorkFilters,
                 checker: annotationFilterChecker,
                 matchAll: true,
                 checkerArgs: this.permissionsService
             },
-            { values: this.ruleSetFilters, checker: ruleSetChecker }
+            { values: this.dossierTemplateFilters, checker: dossierTemplateChecker }
         ];
     }
 
     ngOnInit(): void {
         this._calculateData();
 
-        this._projectAutoUpdateTimer = timer(0, 10000)
+        this._dossierAutoUpdateTimer = timer(0, 10000)
             .pipe(
                 tap(async () => {
-                    await this._appStateService.loadAllProjects();
+                    await this._appStateService.loadAllDossiers();
                     this._loadEntitiesFromState();
                 })
             )
@@ -146,7 +146,7 @@ export class ProjectListingScreenComponent
                 )
             )
             .subscribe((event) => {
-                if (event instanceof NavigationStart && event.url !== '/main/projects') {
+                if (event instanceof NavigationStart && event.url !== '/main/dossiers') {
                     this._lastScrollPosition = this.scrollBar.measureScrollOffset('top');
                 }
             });
@@ -164,39 +164,39 @@ export class ProjectListingScreenComponent
     }
 
     ngOnDestroy(): void {
-        this._projectAutoUpdateTimer.unsubscribe();
+        this._dossierAutoUpdateTimer.unsubscribe();
         this._routerEventsScrollPositionSub.unsubscribe();
         this._fileChangedSub.unsubscribe();
     }
 
-    documentCount(project: ProjectWrapper) {
-        return project.files.length;
+    documentCount(dossier: DossierWrapper) {
+        return dossier.files.length;
     }
 
-    userCount(project: ProjectWrapper) {
-        return project.numberOfMembers;
+    userCount(dossier: DossierWrapper) {
+        return dossier.numberOfMembers;
     }
 
-    canOpenProject(pw: ProjectWrapper): boolean {
+    canOpenDossier(pw: DossierWrapper): boolean {
         return !!pw;
     }
 
-    getRuleSet(pw: ProjectWrapper): RuleSetModel {
-        return this._appStateService.getRuleSetById(pw.project.ruleSetId);
+    getDossierTemplate(pw: DossierWrapper): DossierTemplateModel {
+        return this._appStateService.getDossierTemplateById(pw.dossier.dossierTemplateId);
     }
 
-    openAddProjectDialog(): void {
-        this._dialogService.openAddProjectDialog((addResponse) => {
+    openAddDossierDialog(): void {
+        this._dialogService.openAddDossierDialog((addResponse) => {
             this._calculateData();
-            this._router.navigate([`/main/projects/${addResponse.project.projectId}`]);
+            this._router.navigate([`/main/dossiers/${addResponse.dossier.dossierId}`]);
             if (addResponse.addMembers) {
-                this.openAssignProjectOwnerDialog(null, addResponse.project);
+                this.openAssignDossierOwnerDialog(null, addResponse.dossier);
             }
         });
     }
 
-    openAssignProjectOwnerDialog($event: MouseEvent, project: ProjectWrapper) {
-        this._dialogService.openAssignTeamMembersDialog($event, project);
+    openAssignDossierOwnerDialog($event: MouseEvent, dossier: DossierWrapper) {
+        this._dialogService.openAssignTeamMembersDialog($event, dossier);
     }
 
     actionPerformed() {
@@ -210,15 +210,15 @@ export class ProjectListingScreenComponent
     }
 
     private _loadEntitiesFromState() {
-        this.allEntities = this._appStateService.allProjects;
+        this.allEntities = this._appStateService.allDossiers;
     }
 
     private _calculateData() {
         this._computeAllFilters();
         this._filterEntities();
-        this.projectsChartData = [
-            { value: this.activeProjectsCount, color: 'ACTIVE', label: 'active' },
-            { value: this.inactiveProjectsCount, color: 'DELETED', label: 'archived' }
+        this.dossiersChartData = [
+            { value: this.activeDossiersCount, color: 'ACTIVE', label: 'active' },
+            { value: this.inactiveDossiersCount, color: 'DELETED', label: 'archived' }
         ];
         const groups = groupBy(this._appStateService.aggregatedFiles, 'status');
         this.documentsChartData = [];
@@ -240,10 +240,10 @@ export class ProjectListingScreenComponent
         const allDistinctFileStatus = new Set<string>();
         const allDistinctPeople = new Set<string>();
         const allDistinctNeedsWork = new Set<string>();
-        const allDistinctRuleSets = new Set<string>();
+        const allDistinctDossierTemplates = new Set<string>();
         this.allEntities.forEach((entry) => {
             // all people
-            entry.project.memberIds.forEach((memberId) => allDistinctPeople.add(memberId));
+            entry.dossier.memberIds.forEach((memberId) => allDistinctPeople.add(memberId));
             // file statuses
             entry.files.forEach((file) => {
                 allDistinctFileStatus.add(file.status);
@@ -260,7 +260,7 @@ export class ProjectListingScreenComponent
             });
 
             // Rule set
-            allDistinctRuleSets.add(entry.ruleSetId);
+            allDistinctDossierTemplates.add(entry.dossierTemplateId);
         });
 
         const statusFilters = [];
@@ -295,13 +295,16 @@ export class ProjectListingScreenComponent
         );
         this.needsWorkFilters = processFilters(this.needsWorkFilters, needsWorkFilters);
 
-        const ruleSetFilters = [];
-        allDistinctRuleSets.forEach((ruleSetId) => {
-            ruleSetFilters.push({
-                key: ruleSetId,
-                label: this._appStateService.getRuleSetById(ruleSetId).name
+        const dossierTemplateFilters = [];
+        allDistinctDossierTemplates.forEach((dossierTemplateId) => {
+            dossierTemplateFilters.push({
+                key: dossierTemplateId,
+                label: this._appStateService.getDossierTemplateById(dossierTemplateId).name
             });
         });
-        this.ruleSetFilters = processFilters(this.ruleSetFilters, ruleSetFilters);
+        this.dossierTemplateFilters = processFilters(
+            this.dossierTemplateFilters,
+            dossierTemplateFilters
+        );
     }
 }
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.html
index 07be6abf3..9b4ae3b10 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.html
+++ b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.html
@@ -1,4 +1,4 @@
-<section *ngIf="!!activeProject">
+<section *ngIf="!!activeDossier">
     <div class="page-header">
         <div class="filters">
             <div translate="filters.filter-by"></div>
@@ -27,7 +27,7 @@
 
             <redaction-search-input
                 [form]="searchForm"
-                [placeholder]="'project-overview.search'"
+                [placeholder]="'dossier-overview.search'"
             ></redaction-search-input>
 
             <div
@@ -40,31 +40,31 @@
 
         <div class="actions">
             <redaction-circle-button
-                (action)="openEditProjectDialog($event)"
+                (action)="openEditDossierDialog($event)"
                 *ngIf="permissionsService.isManager()"
                 icon="red:edit"
-                tooltip="project-overview.header-actions.edit"
+                tooltip="dossier-overview.header-actions.edit"
                 tooltipPosition="below"
             ></redaction-circle-button>
             <!--            Commented because users miss-click this shit !-->
             <!--            <redaction-circle-button-->
-            <!--                (action)="openDeleteProjectDialog($event)"-->
-            <!--                *ngIf="permissionsService.canDeleteProject()"-->
+            <!--                (action)="openDeleteDossierDialog($event)"-->
+            <!--                *ngIf="permissionsService.canDeleteDossier()"-->
             <!--                icon="red:trash"-->
-            <!--                tooltip="project-overview.header-actions.delete"-->
+            <!--                tooltip="dossier-overview.header-actions.delete"-->
             <!--                tooltipPosition="below"-->
             <!--            ></redaction-circle-button>-->
 
             <redaction-file-download-btn
                 [file]="allEntities"
-                [project]="activeProject"
+                [dossier]="activeDossier"
                 tooltipPosition="below"
             ></redaction-file-download-btn>
 
             <redaction-circle-button
-                (action)="reanalyseProject()"
+                (action)="reanalyseDossier()"
                 *ngIf="permissionsService.displayReanalyseBtn()"
-                [tooltip]="'project-overview.new-rule.toast.actions.reanalyse-all'"
+                [tooltip]="'dossier-overview.new-rule.toast.actions.reanalyse-all'"
                 icon="red:refresh"
                 tooltipClass="warn small"
                 tooltipPosition="below"
@@ -74,12 +74,12 @@
                 (action)="fileInput.click()"
                 class="ml-14"
                 icon="red:upload"
-                tooltip="project-overview.header-actions.upload-document"
+                tooltip="dossier-overview.header-actions.upload-document"
                 tooltipPosition="below"
                 type="primary"
             ></redaction-circle-button>
             <redaction-circle-button
-                [routerLink]="['/main/projects/']"
+                [routerLink]="['/main/dossiers/']"
                 class="ml-6"
                 icon="red:close"
                 tooltip="common.close"
@@ -103,15 +103,15 @@
 
                 <span class="all-caps-label">
                     {{
-                        'project-overview.table-header.title'
+                        'dossier-overview.table-header.title'
                             | translate: { length: displayedEntities.length || 0 }
                     }}
                 </span>
 
-                <redaction-project-overview-bulk-actions
+                <redaction-dossier-overview-bulk-actions
                     (reload)="bulkActionPerformed()"
                     [selectedFileIds]="selectedEntitiesIds"
-                ></redaction-project-overview-bulk-actions>
+                ></redaction-dossier-overview-bulk-actions>
             </div>
 
             <div
@@ -127,7 +127,7 @@
                     [activeSortingOption]="sortingOption"
                     [withSort]="true"
                     column="filename"
-                    label="project-overview.table-col-names.name"
+                    label="dossier-overview.table-col-names.name"
                 ></redaction-table-col-name>
 
                 <redaction-table-col-name
@@ -135,11 +135,11 @@
                     [activeSortingOption]="sortingOption"
                     [withSort]="true"
                     column="added"
-                    label="project-overview.table-col-names.added-on"
+                    label="dossier-overview.table-col-names.added-on"
                 ></redaction-table-col-name>
 
                 <redaction-table-col-name
-                    label="project-overview.table-col-names.needs-work"
+                    label="dossier-overview.table-col-names.needs-work"
                 ></redaction-table-col-name>
 
                 <redaction-table-col-name
@@ -148,7 +148,7 @@
                     [withSort]="true"
                     class="user-column"
                     column="reviewerName"
-                    label="project-overview.table-col-names.assigned-to"
+                    label="dossier-overview.table-col-names.assigned-to"
                 ></redaction-table-col-name>
 
                 <redaction-table-col-name
@@ -156,7 +156,7 @@
                     [activeSortingOption]="sortingOption"
                     [withSort]="true"
                     column="pages"
-                    label="project-overview.table-col-names.pages"
+                    label="dossier-overview.table-col-names.pages"
                 ></redaction-table-col-name>
 
                 <redaction-table-col-name
@@ -165,7 +165,7 @@
                     [withSort]="true"
                     class="flex-end"
                     column="statusSort"
-                    label="project-overview.table-col-names.status"
+                    label="dossier-overview.table-col-names.status"
                 ></redaction-table-col-name>
                 <div class="scrollbar-placeholder"></div>
             </div>
@@ -175,12 +175,12 @@
                 *ngIf="!allEntities.length"
                 buttonIcon="red:upload"
                 icon="red:document"
-                screen="project-overview"
+                screen="dossier-overview"
             ></redaction-empty-state>
 
             <redaction-empty-state
                 *ngIf="allEntities.length && !displayedEntities.length"
-                screen="project-overview"
+                screen="dossier-overview"
                 type="no-match"
             ></redaction-empty-state>
 
@@ -231,7 +231,7 @@
                         <div *ngIf="fileStatus.ocrTime" class="small-label stats-subtitle">
                             <div
                                 [matTooltipPosition]="'above'"
-                                [matTooltip]="'project-overview.ocr-performed' | translate"
+                                [matTooltip]="'dossier-overview.ocr-performed' | translate"
                             >
                                 <mat-icon svgIcon="red:ocr"></mat-icon>
                                 {{ fileStatus.ocrTime | date: 'mediumDate' }}
@@ -277,17 +277,17 @@
                         <div
                             *ngIf="fileStatus.isError"
                             class="small-label error"
-                            translate="project-overview.file-listing.file-entry.file-error"
+                            translate="dossier-overview.file-listing.file-entry.file-error"
                         ></div>
                         <div
                             *ngIf="fileStatus.isPending"
                             class="small-label"
-                            translate="project-overview.file-listing.file-entry.file-pending"
+                            translate="dossier-overview.file-listing.file-entry.file-pending"
                         ></div>
                         <div
                             *ngIf="fileStatus.isProcessing"
                             class="small-label loading"
-                            translate="project-overview.file-listing.file-entry.file-processing"
+                            translate="dossier-overview.file-listing.file-entry.file-processing"
                         ></div>
                         <redaction-status-bar
                             *ngIf="fileStatus.isWorkable"
@@ -318,14 +318,14 @@
         </div>
 
         <div [class.collapsed]="collapsedDetails" class="right-container" redactionHasScrollbar>
-            <redaction-project-details
-                #projectDetailsComponent
+            <redaction-dossier-details
+                #dossierDetailsComponent
                 (filtersChanged)="filtersChanged($event)"
-                (openAssignProjectMembersDialog)="openAssignProjectMembersDialog()"
+                (openAssignDossierMembersDialog)="openAssignDossierMembersDialog()"
                 (openDossierDictionaryDialog)="openDossierDictionaryDialog()"
                 (toggleCollapse)="toggleCollapsedDetails()"
                 [filters]="detailsContainerFilters"
-            ></redaction-project-details>
+            ></redaction-dossier-details>
         </div>
     </div>
 </section>
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.scss b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.scss
index 4f91ae3fe..2c332b871 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.scss
+++ b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.scss
@@ -82,7 +82,7 @@ cdk-virtual-scroll-viewport {
         padding-right: 13px;
     }
 
-    redaction-project-details {
+    redaction-dossier-details {
         width: 100%;
     }
 }
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts
index 5f9ae355f..8f95eb31a 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts
@@ -9,7 +9,7 @@ import { StatusOverlayService } from '@upload-download/services/status-overlay.s
 import { TranslateService } from '@ngx-translate/core';
 import { FilterModel } from '@shared/components/filter/model/filter.model';
 import * as moment from 'moment';
-import { ProjectDetailsComponent } from '../../components/project-details/project-details.component';
+import { DossierDetailsComponent } from '../../components/dossier-details/dossier-details.component';
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
 import {
     annotationFilterChecker,
@@ -25,18 +25,18 @@ import { RedactionFilterSorter } from '@utils/sorters/redaction-filter-sorter';
 import { StatusSorter } from '@utils/sorters/status-sorter';
 import { convertFiles, handleFileDrop } from '@utils/file-drop-utils';
 import { FilterComponent } from '@shared/components/filter/filter.component';
-import { ProjectsDialogService } from '../../services/projects-dialog.service';
+import { DossiersDialogService } from '../../services/dossiers-dialog.service';
 import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
 import { BaseListingComponent } from '@shared/base/base-listing.component';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 import { OnAttach, OnDetach } from '@utils/custom-route-reuse.strategy';
 
 @Component({
-    selector: 'redaction-project-overview-screen',
-    templateUrl: './project-overview-screen.component.html',
-    styleUrls: ['./project-overview-screen.component.scss']
+    selector: 'redaction-dossier-overview-screen',
+    templateUrl: './dossier-overview-screen.component.html',
+    styleUrls: ['./dossier-overview-screen.component.scss']
 })
-export class ProjectOverviewScreenComponent
+export class DossierOverviewScreenComponent
     extends BaseListingComponent<FileStatusWrapper>
     implements OnInit, OnDestroy, OnDetach, OnAttach
 {
@@ -51,9 +51,9 @@ export class ProjectOverviewScreenComponent
     readonly itemSize = 80;
     protected readonly _searchKey = 'searchField';
     protected readonly _selectionKey = 'fileId';
-    protected readonly _sortKey = 'project-overview';
-    @ViewChild('projectDetailsComponent', { static: false })
-    private _projectDetailsComponent: ProjectDetailsComponent;
+    protected readonly _sortKey = 'dossier-overview';
+    @ViewChild('dossierDetailsComponent', { static: false })
+    private _dossierDetailsComponent: DossierDetailsComponent;
     private _filesAutoUpdateTimer: Subscription;
     private _routerEventsScrollPositionSub: Subscription;
     private _fileChangedSub: Subscription;
@@ -70,7 +70,7 @@ export class ProjectOverviewScreenComponent
         readonly permissionsService: PermissionsService,
         private readonly _userService: UserService,
         private readonly _notificationService: NotificationService,
-        private readonly _dialogService: ProjectsDialogService,
+        private readonly _dialogService: DossiersDialogService,
         private readonly _fileUploadService: FileUploadService,
         private readonly _statusOverlayService: StatusOverlayService,
         private readonly _router: Router,
@@ -84,8 +84,8 @@ export class ProjectOverviewScreenComponent
         this._loadEntitiesFromState();
     }
 
-    get activeProject(): ProjectWrapper {
-        return this._appStateService.activeProject;
+    get activeDossier(): DossierWrapper {
+        return this._appStateService.activeDossier;
     }
 
     protected get _filterComponents(): FilterComponent[] {
@@ -121,7 +121,7 @@ export class ProjectOverviewScreenComponent
     ngOnInit(): void {
         this._userPreferenceControllerService.getAllUserAttributes().subscribe((attributes) => {
             if (attributes === null || attributes === undefined) return;
-            const key = 'Project-Recent-' + this.activeProject.projectId;
+            const key = 'Dossier-Recent-' + this.activeDossier.dossierId;
             if (attributes[key]?.length > 0) {
                 this._lastOpenedFileId = attributes[key][0];
             }
@@ -134,7 +134,7 @@ export class ProjectOverviewScreenComponent
         this._filesAutoUpdateTimer = timer(0, 7500)
             .pipe(
                 tap(async () => {
-                    await this._appStateService.reloadActiveProjectFilesIfNecessary();
+                    await this._appStateService.reloadActiveDossierFilesIfNecessary();
                     this._loadEntitiesFromState();
                 })
             )
@@ -147,7 +147,7 @@ export class ProjectOverviewScreenComponent
         this._routerEventsScrollPositionSub = this._router.events
             .pipe(filter((events) => events instanceof NavigationStart))
             .subscribe((event: NavigationStart) => {
-                if (!event.url.endsWith(this._appStateService.activeProjectId)) {
+                if (!event.url.endsWith(this._appStateService.activeDossierId)) {
                     this._lastScrollPosition = this.scrollBar.measureScrollOffset('top');
                 }
             });
@@ -170,20 +170,20 @@ export class ProjectOverviewScreenComponent
         this.ngOnDestroy();
     }
 
-    reanalyseProject() {
+    reanalyseDossier() {
         return this._appStateService
-            .reanalyzeProject()
+            .reanalyzeDossier()
             .then(() => {
-                this.reloadProjects();
+                this.reloadDossiers();
                 this._notificationService.showToastNotification(
-                    this._translateService.instant('project-overview.reanalyse-project.success'),
+                    this._translateService.instant('dossier-overview.reanalyse-dossier.success'),
                     null,
                     NotificationType.SUCCESS
                 );
             })
             .catch(() => {
                 this._notificationService.showToastNotification(
-                    this._translateService.instant('project-overview.reanalyse-project.error'),
+                    this._translateService.instant('dossier-overview.reanalyse-dossier.error'),
                     null,
                     NotificationType.ERROR
                 );
@@ -206,20 +206,20 @@ export class ProjectOverviewScreenComponent
         ].includes(fileStatusWrapper.status);
     }
 
-    reloadProjects() {
-        this._appStateService.getFiles(this._appStateService.activeProject, false).then(() => {
+    reloadDossiers() {
+        this._appStateService.getFiles(this._appStateService.activeDossier, false).then(() => {
             this.calculateData();
         });
     }
 
     calculateData(): void {
-        if (!this._appStateService.activeProjectId) {
+        if (!this._appStateService.activeDossierId) {
             return;
         }
         this._loadEntitiesFromState();
         this._computeAllFilters();
         this._filterEntities();
-        this._projectDetailsComponent?.calculateChartConfig();
+        this._dossierDetailsComponent?.calculateChartConfig();
         this._changeDetectorRef.detectChanges();
     }
 
@@ -229,7 +229,7 @@ export class ProjectOverviewScreenComponent
 
     @HostListener('drop', ['$event'])
     onDrop(event: DragEvent) {
-        handleFileDrop(event, this.activeProject, this._uploadFiles.bind(this));
+        handleFileDrop(event, this.activeDossier, this._uploadFiles.bind(this));
     }
 
     @HostListener('dragover', ['$event'])
@@ -239,14 +239,14 @@ export class ProjectOverviewScreenComponent
     }
 
     async uploadFiles(files: File[] | FileList) {
-        await this._uploadFiles(convertFiles(files, this.activeProject));
+        await this._uploadFiles(convertFiles(files, this.activeDossier));
     }
 
     fileLink(fileStatus: FileStatusWrapper) {
         return this.permissionsService.canOpenFile(fileStatus)
             ? [
-                  '/main/projects/' +
-                      this.activeProject.project.projectId +
+                  '/main/dossiers/' +
+                      this.activeDossier.dossier.dossierId +
                       '/file/' +
                       fileStatus.fileId
               ]
@@ -255,28 +255,28 @@ export class ProjectOverviewScreenComponent
 
     bulkActionPerformed() {
         this.selectedEntitiesIds = [];
-        this.reloadProjects();
+        this.reloadDossiers();
     }
 
-    openEditProjectDialog($event: MouseEvent) {
-        this._dialogService.openEditProjectDialog($event, this.activeProject);
+    openEditDossierDialog($event: MouseEvent) {
+        this._dialogService.openEditDossierDialog($event, this.activeDossier);
     }
 
-    openDeleteProjectDialog($event: MouseEvent) {
-        this._dialogService.openDeleteProjectDialog($event, this.activeProject, () => {
-            this._router.navigate(['/main/projects']);
+    openDeleteDossierDialog($event: MouseEvent) {
+        this._dialogService.openDeleteDossierDialog($event, this.activeDossier, () => {
+            this._router.navigate(['/main/dossiers']);
         });
     }
 
-    openAssignProjectMembersDialog(): void {
-        this._dialogService.openAssignTeamMembersDialog(null, this.activeProject, () => {
-            this.reloadProjects();
+    openAssignDossierMembersDialog(): void {
+        this._dialogService.openAssignTeamMembersDialog(null, this.activeDossier, () => {
+            this.reloadDossiers();
         });
     }
 
     openDossierDictionaryDialog() {
-        this._dialogService.openDossierDictionaryDialog(null, this.activeProject, () => {
-            this.reloadProjects();
+        this._dialogService.openDossierDictionaryDialog(null, this.activeDossier, () => {
+            this.reloadDossiers();
         });
     }
 
@@ -292,7 +292,7 @@ export class ProjectOverviewScreenComponent
     }
 
     private _loadEntitiesFromState() {
-        if (this.activeProject) this.allEntities = this.activeProject.files;
+        if (this.activeDossier) this.allEntities = this.activeDossier.files;
     }
 
     private async _uploadFiles(files: FileUploadModel[]) {
@@ -304,7 +304,7 @@ export class ProjectOverviewScreenComponent
     }
 
     private _computeAllFilters() {
-        if (!this.activeProject) {
+        if (!this.activeDossier) {
             return;
         }
 
diff --git a/apps/red-ui/src/app/modules/projects/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/projects/services/annotation-actions.service.ts
index b1e7380b5..efd9c82eb 100644
--- a/apps/red-ui/src/app/modules/projects/services/annotation-actions.service.ts
+++ b/apps/red-ui/src/app/modules/projects/services/annotation-actions.service.ts
@@ -7,7 +7,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { AddRedactionRequest } from '@redaction/red-ui-http';
 import { getFirstRelevantTextPart } from '@utils/functions';
 import { AnnotationPermissions } from '@models/file/annotation.permissions';
-import { ProjectsDialogService } from './projects-dialog.service';
+import { DossiersDialogService } from './dossiers-dialog.service';
 import { BASE_HREF } from '../../../tokens';
 
 @Injectable()
@@ -18,7 +18,7 @@ export class AnnotationActionsService {
         private readonly _ngZone: NgZone,
         private readonly _manualAnnotationService: ManualAnnotationService,
         private readonly _translateService: TranslateService,
-        private readonly _dialogService: ProjectsDialogService
+        private readonly _dialogService: DossiersDialogService
     ) {}
 
     acceptSuggestion(
diff --git a/apps/red-ui/src/app/modules/projects/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/projects/services/annotation-draw.service.ts
index 1a1ac5ded..deceb9999 100644
--- a/apps/red-ui/src/app/modules/projects/services/annotation-draw.service.ts
+++ b/apps/red-ui/src/app/modules/projects/services/annotation-draw.service.ts
@@ -36,7 +36,7 @@ export class AnnotationDrawService {
         if (this._userPreferenceService.areDevFeaturesEnabled) {
             this._redactionLogControllerService
                 .getSectionGrid(
-                    this._appStateService.activeProjectId,
+                    this._appStateService.activeDossierId,
                     this._appStateService.activeFileId
                 )
                 .subscribe((sectionGrid) => {
diff --git a/apps/red-ui/src/app/modules/projects/services/file-action.service.ts b/apps/red-ui/src/app/modules/projects/services/file-action.service.ts
index a99666298..f149ba1e8 100644
--- a/apps/red-ui/src/app/modules/projects/services/file-action.service.ts
+++ b/apps/red-ui/src/app/modules/projects/services/file-action.service.ts
@@ -5,12 +5,12 @@ import { ReanalysisControllerService, StatusControllerService } from '@redaction
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
 import { PermissionsService } from '@services/permissions.service';
 import { isArray } from 'rxjs/internal-compatibility';
-import { ProjectsDialogService } from './projects-dialog.service';
+import { DossiersDialogService } from './dossiers-dialog.service';
 
 @Injectable()
 export class FileActionService {
     constructor(
-        private readonly _dialogService: ProjectsDialogService,
+        private readonly _dialogService: DossiersDialogService,
         private readonly _permissionsService: PermissionsService,
         private readonly _userService: UserService,
         private readonly _statusControllerService: StatusControllerService,
@@ -23,7 +23,7 @@ export class FileActionService {
             fileStatusWrapper = this._appStateService.activeFile;
         }
         return this._reanalysisControllerService.reanalyzeFile(
-            this._appStateService.activeProject.project.projectId,
+            this._appStateService.activeDossier.dossier.dossierId,
             fileStatusWrapper.fileId,
             priority
         );
@@ -35,12 +35,12 @@ export class FileActionService {
         }
         return this._reanalysisControllerService.toggleAnalysis(
             fileStatusWrapper.fileId,
-            fileStatusWrapper.projectId,
+            fileStatusWrapper.dossierId,
             !fileStatusWrapper.isExcluded
         );
     }
 
-    async assignProjectReviewerFromOverview(file?: FileStatusWrapper, callback?: Function) {
+    async assignDossierReviewerFromOverview(file?: FileStatusWrapper, callback?: Function) {
         if (this._permissionsService.isOwner()) {
             this._openAssignReviewerDialog(file, callback);
         } else {
@@ -48,7 +48,7 @@ export class FileActionService {
         }
     }
 
-    assignProjectApprover(
+    assignDossierApprover(
         file?: FileStatusWrapper,
         callback?: Function,
         ignoreDialogChanges = false
@@ -57,7 +57,7 @@ export class FileActionService {
             file ? [file] : [this._appStateService.activeFile],
             'approver',
             async () => {
-                await this._appStateService.reloadActiveProjectFiles();
+                await this._appStateService.reloadActiveDossierFiles();
                 if (callback) {
                     callback();
                 }
@@ -66,7 +66,7 @@ export class FileActionService {
         );
     }
 
-    assignProjectReviewer(
+    assignDossierReviewer(
         file?: FileStatusWrapper,
         callback?: Function,
         ignoreDialogChanges = false
@@ -75,7 +75,7 @@ export class FileActionService {
             file ? [file] : [this._appStateService.activeFile],
             'reviewer',
             async () => {
-                await this._appStateService.reloadActiveProjectFiles();
+                await this._appStateService.reloadActiveDossierFiles();
                 if (callback) {
                     callback();
                 }
@@ -108,12 +108,12 @@ export class FileActionService {
         }
 
         if (!approverId) {
-            approverId = this._appStateService.activeProject.approverIds[0];
+            approverId = this._appStateService.activeDossier.approverIds[0];
         }
 
         return this._statusControllerService.setStatusUnderApprovalForList(
             fileStatus.map((f) => f.fileId),
-            this._appStateService.activeProjectId,
+            this._appStateService.activeDossierId,
             approverId
         );
     }
@@ -124,7 +124,7 @@ export class FileActionService {
         }
         return this._statusControllerService.setStatusApprovedForList(
             fileStatus.map((f) => f.fileId),
-            this._appStateService.activeProjectId
+            this._appStateService.activeDossierId
         );
     }
 
@@ -134,7 +134,7 @@ export class FileActionService {
         }
         return this._statusControllerService.setStatusUnderReviewForList(
             fileStatus.map((f) => f.fileId),
-            this._appStateService.activeProjectId
+            this._appStateService.activeDossierId
         );
     }
 
@@ -144,7 +144,7 @@ export class FileActionService {
         }
         return this._reanalysisControllerService.ocrFiles(
             fileStatus.map((f) => f.fileId),
-            this._appStateService.activeProjectId
+            this._appStateService.activeDossierId
         );
     }
 
@@ -153,7 +153,7 @@ export class FileActionService {
             file ? [file] : [this._appStateService.activeFile],
             'reviewer',
             async () => {
-                await this._appStateService.reloadActiveProjectFiles();
+                await this._appStateService.reloadActiveDossierFiles();
                 if (callback) {
                     callback();
                 }
@@ -171,11 +171,11 @@ export class FileActionService {
         await this._statusControllerService
             .setFileReviewerForList(
                 fileStatus.map((f) => f.fileId),
-                this._appStateService.activeProjectId,
+                this._appStateService.activeDossierId,
                 this._userService.userId
             )
             .toPromise();
-        await this._appStateService.reloadActiveProjectFiles();
+        await this._appStateService.reloadActiveDossierFiles();
         if (callback) {
             await callback();
         }
diff --git a/apps/red-ui/src/app/modules/projects/services/manual-annotation.service.ts b/apps/red-ui/src/app/modules/projects/services/manual-annotation.service.ts
index a3ece8118..d7e6ddb81 100644
--- a/apps/red-ui/src/app/modules/projects/services/manual-annotation.service.ts
+++ b/apps/red-ui/src/app/modules/projects/services/manual-annotation.service.ts
@@ -30,7 +30,7 @@ export class ManualAnnotationService {
     addComment(comment: string, annotationId: string) {
         return this._manualRedactionControllerService.addComment(
             { text: comment },
-            this._appStateService.activeProjectId,
+            this._appStateService.activeDossierId,
             this._appStateService.activeFileId,
             annotationId
         );
@@ -39,7 +39,7 @@ export class ManualAnnotationService {
     // this wraps /manualRedaction/comment/undo
     deleteComment(commentId: string, annotationId: string) {
         return this._manualRedactionControllerService.undoComment(
-            this._appStateService.activeProjectId,
+            this._appStateService.activeDossierId,
             this._appStateService.activeFileId,
             annotationId,
             commentId
@@ -87,7 +87,7 @@ export class ManualAnnotationService {
         return this._manualRedactionControllerService
             .approveRequest(
                 { addOrRemoveFromDictionary: addToDictionary },
-                this._appStateService.activeProjectId,
+                this._appStateService.activeDossierId,
                 this._appStateService.activeFile.fileId,
                 annotationId
             )
@@ -107,7 +107,7 @@ export class ManualAnnotationService {
     undoRequest(annotationWrapper: AnnotationWrapper) {
         return this._manualRedactionControllerService
             .undo(
-                this._appStateService.activeProjectId,
+                this._appStateService.activeDossierId,
                 this._appStateService.activeFileId,
                 annotationWrapper.id
             )
@@ -134,7 +134,7 @@ export class ManualAnnotationService {
         if (this._permissionsService.isApprover()) {
             return this._manualRedactionControllerService
                 .declineRequest(
-                    this._appStateService.activeProjectId,
+                    this._appStateService.activeDossierId,
                     this._appStateService.activeFileId,
                     annotationWrapper.id
                 )
@@ -159,7 +159,7 @@ export class ManualAnnotationService {
         } else {
             return this._manualRedactionControllerService
                 .undo(
-                    this._appStateService.activeProjectId,
+                    this._appStateService.activeDossierId,
                     this._appStateService.activeFileId,
                     annotationWrapper.id
                 )
@@ -196,7 +196,7 @@ export class ManualAnnotationService {
             if (annotationWrapper.dictionary === 'manual') {
                 return this._manualRedactionControllerService
                     .declineRequest(
-                        this._appStateService.activeProjectId,
+                        this._appStateService.activeDossierId,
                         this._appStateService.activeFileId,
                         annotationWrapper.id
                     )
@@ -219,7 +219,7 @@ export class ManualAnnotationService {
                             removeFromDictionary: removeFromDictionary,
                             comment: '-'
                         },
-                        this._appStateService.activeProjectId,
+                        this._appStateService.activeDossierId,
                         this._appStateService.activeFileId
                     )
                     .pipe(
@@ -242,7 +242,7 @@ export class ManualAnnotationService {
                         removeFromDictionary: removeFromDictionary,
                         comment: '-'
                     },
-                    this._appStateService.activeProjectId,
+                    this._appStateService.activeDossierId,
                     this._appStateService.activeFileId
                 )
                 .pipe(
@@ -286,7 +286,7 @@ export class ManualAnnotationService {
         return this._manualRedactionControllerService
             .requestForceRedaction(
                 forceRedactionRequest,
-                this._appStateService.activeProject.project.projectId,
+                this._appStateService.activeDossier.dossier.dossierId,
                 this._appStateService.activeFile.fileId
             )
             .pipe(
@@ -306,7 +306,7 @@ export class ManualAnnotationService {
         return this._manualRedactionControllerService
             .forceRedaction(
                 forceRedactionRequest,
-                this._appStateService.activeProject.project.projectId,
+                this._appStateService.activeDossier.dossier.dossierId,
                 this._appStateService.activeFile.fileId
             )
             .pipe(
@@ -326,7 +326,7 @@ export class ManualAnnotationService {
         return this._manualRedactionControllerService
             .requestAddRedaction(
                 manualRedactionEntry,
-                this._appStateService.activeProject.project.projectId,
+                this._appStateService.activeDossier.dossier.dossierId,
                 this._appStateService.activeFile.fileId
             )
             .pipe(
@@ -349,7 +349,7 @@ export class ManualAnnotationService {
         return this._manualRedactionControllerService
             .addRedaction(
                 manualRedactionEntry,
-                this._appStateService.activeProject.project.projectId,
+                this._appStateService.activeDossier.dossier.dossierId,
                 this._appStateService.activeFile.fileId
             )
             .pipe(
diff --git a/apps/red-ui/src/app/modules/projects/services/pdf-viewer-data.service.ts b/apps/red-ui/src/app/modules/projects/services/pdf-viewer-data.service.ts
index a08d0e391..fc6796ee9 100644
--- a/apps/red-ui/src/app/modules/projects/services/pdf-viewer-data.service.ts
+++ b/apps/red-ui/src/app/modules/projects/services/pdf-viewer-data.service.ts
@@ -25,7 +25,7 @@ export class PdfViewerDataService {
 
     loadActiveFileManualAnnotations() {
         return this._manualRedactionControllerService.getManualRedaction(
-            this._appStateService.activeProjectId,
+            this._appStateService.activeDossierId,
             this._appStateService.activeFileId
         );
     }
@@ -34,19 +34,19 @@ export class PdfViewerDataService {
         const fileObs = this.downloadOriginalFile(this._appStateService.activeFile);
         const reactionLogObs = this._redactionLogControllerService
             .getRedactionLog(
-                this._appStateService.activeProjectId,
+                this._appStateService.activeDossierId,
                 this._appStateService.activeFileId
             )
             .pipe(catchError(() => of({})));
         const redactionChangeLogObs = this._redactionLogControllerService
             .getRedactionChangeLog(
-                this._appStateService.activeProjectId,
+                this._appStateService.activeDossierId,
                 this._appStateService.activeFileId
             )
             .pipe(catchError(() => of({})));
         const manualRedactionsObs = this._manualRedactionControllerService
             .getManualRedaction(
-                this._appStateService.activeProjectId,
+                this._appStateService.activeDossierId,
                 this._appStateService.activeFileId
             )
             .pipe(catchError(() => of({})));
@@ -65,7 +65,7 @@ export class PdfViewerDataService {
         if (this._permissionsService.canMarkPagesAsViewed()) {
             return this._viewedPagesControllerService
                 .getViewedPages(
-                    this._appStateService.activeProjectId,
+                    this._appStateService.activeDossierId,
                     this._appStateService.activeFileId
                 )
                 .pipe(catchError(() => of({ pages: [] })));
@@ -75,7 +75,7 @@ export class PdfViewerDataService {
 
     downloadOriginalFile(fileStatus: FileStatusWrapper): Observable<any> {
         return this._fileManagementControllerService.downloadOriginalFile(
-            fileStatus.projectId,
+            fileStatus.dossierId,
             fileStatus.fileId,
             true,
             fileStatus.lastUploaded,
diff --git a/apps/red-ui/src/app/modules/projects/services/projects-dialog.service.ts b/apps/red-ui/src/app/modules/projects/services/projects-dialog.service.ts
index 5fa72f5e5..a5cfb4139 100644
--- a/apps/red-ui/src/app/modules/projects/services/projects-dialog.service.ts
+++ b/apps/red-ui/src/app/modules/projects/services/projects-dialog.service.ts
@@ -5,9 +5,9 @@ import {
     FileManagementControllerService,
     FileStatus,
     ManualRedactionControllerService,
-    RuleSetControllerService
+    DossierTemplateControllerService
 } from '@redaction/red-ui-http';
-import { AddProjectDialogComponent } from '../dialogs/add-project-dialog/add-project-dialog.component';
+import { AddDossierDialogComponent } from '../dialogs/add-dossier-dialog/add-dossier-dialog.component';
 import { RemoveAnnotationsDialogComponent } from '../dialogs/remove-annotations-dialog/remove-annotations-dialog.component';
 import { NotificationService, NotificationType } from '@services/notification.service';
 import { ForceRedactionDialogComponent } from '../dialogs/force-redaction-dialog/force-redaction-dialog.component';
@@ -16,7 +16,7 @@ import {
     ConfirmationDialogComponent,
     ConfirmationDialogInput
 } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 import { DocumentInfoDialogComponent } from '../dialogs/document-info-dialog/document-info-dialog.component';
 import { AppStateService } from '@state/app-state.service';
 import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper';
@@ -24,7 +24,7 @@ import { ManualAnnotationService } from './manual-annotation.service';
 import { TranslateService } from '@ngx-translate/core';
 import { ManualAnnotationDialogComponent } from '../dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
 import { DossierDictionaryDialogComponent } from '../dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component';
-import { EditProjectDialogComponent } from '../dialogs/edit-project-dialog/edit-project-dialog.component';
+import { EditDossierDialogComponent } from '../dialogs/edit-dossier-dialog/edit-dossier-dialog.component';
 import { FileStatusWrapper } from '../../../models/file/file-status.wrapper';
 import { AssignReviewerApproverDialogComponent } from '../dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component';
 import { TeamMembersDialogComponent } from '../dialogs/team-members-dialog/team-members-dialog.component';
@@ -36,12 +36,12 @@ const dialogConfig = {
 };
 
 @Injectable()
-export class ProjectsDialogService {
+export class DossiersDialogService {
     constructor(
         private readonly _dialog: MatDialog,
         private readonly _translateService: TranslateService,
         private readonly _appStateService: AppStateService,
-        private readonly _ruleSetControllerService: RuleSetControllerService,
+        private readonly _dossierTemplateControllerService: DossierTemplateControllerService,
         private readonly _dictionaryControllerService: DictionaryControllerService,
         private readonly _fileManagementControllerService: FileManagementControllerService,
         private readonly _notificationService: NotificationService,
@@ -51,7 +51,7 @@ export class ProjectsDialogService {
 
     openDeleteFilesDialog(
         $event: MouseEvent,
-        projectId: string,
+        dossierId: string,
         fileIds: string[],
         cb?: Function
     ): MatDialogRef<ConfirmationDialogComponent> {
@@ -69,9 +69,9 @@ export class ProjectsDialogService {
             if (result) {
                 try {
                     await this._fileManagementControllerService
-                        .deleteFiles(fileIds, projectId)
+                        .deleteFiles(fileIds, dossierId)
                         .toPromise();
-                    await this._appStateService.reloadActiveProjectFiles();
+                    await this._appStateService.reloadActiveDossierFiles();
                     if (cb) cb();
                 } catch (e) {
                     this._notificationService.showToastNotification(
@@ -186,23 +186,23 @@ export class ProjectsDialogService {
         return ref;
     }
 
-    openDeleteProjectDialog(
+    openDeleteDossierDialog(
         $event: MouseEvent,
-        project: ProjectWrapper,
+        dossier: DossierWrapper,
         cb?: Function
     ): MatDialogRef<ConfirmationDialogComponent> {
         $event.stopPropagation();
         const ref = this._dialog.open(ConfirmationDialogComponent, {
             ...dialogConfig,
             data: new ConfirmationDialogInput({
-                title: 'confirmation-dialog.delete-project.title',
-                question: 'confirmation-dialog.delete-project.question'
+                title: 'confirmation-dialog.delete-dossier.title',
+                question: 'confirmation-dialog.delete-dossier.question'
             })
         });
 
         ref.afterClosed().subscribe(async (result) => {
             if (result) {
-                await this._appStateService.deleteProject(project);
+                await this._appStateService.deleteDossier(dossier);
                 if (cb) cb();
             }
         });
@@ -211,13 +211,13 @@ export class ProjectsDialogService {
 
     openAssignTeamMembersDialog(
         $event: MouseEvent,
-        projectWrapper: ProjectWrapper,
+        dossierWrapper: DossierWrapper,
         cb?: Function
     ): MatDialogRef<TeamMembersDialogComponent> {
         $event?.stopPropagation();
         const ref = this._dialog.open(TeamMembersDialogComponent, {
             ...dialogConfig,
-            data: { projectWrapper }
+            data: { dossierWrapper }
         });
         ref.afterClosed().subscribe((result) => {
             if (cb) {
@@ -229,7 +229,7 @@ export class ProjectsDialogService {
 
     openDossierDictionaryDialog(
         $event: MouseEvent,
-        project: ProjectWrapper,
+        dossier: DossierWrapper,
         cb?: Function
     ): MatDialogRef<DossierDictionaryDialogComponent> {
         $event?.stopPropagation();
@@ -238,7 +238,7 @@ export class ProjectsDialogService {
             width: '90vw',
             height: '90vh',
             autoFocus: false,
-            data: project
+            data: dossier
         });
         ref.afterClosed().subscribe((result) => {
             if (cb) {
@@ -279,8 +279,8 @@ export class ProjectsDialogService {
         return ref;
     }
 
-    openAddProjectDialog(cb?: Function): MatDialogRef<AddProjectDialogComponent> {
-        const ref = this._dialog.open(AddProjectDialogComponent, {
+    openAddDossierDialog(cb?: Function): MatDialogRef<AddDossierDialogComponent> {
+        const ref = this._dialog.open(AddDossierDialogComponent, {
             ...dialogConfig,
             width: '900px',
             autoFocus: true
@@ -293,18 +293,18 @@ export class ProjectsDialogService {
         return ref;
     }
 
-    openEditProjectDialog(
+    openEditDossierDialog(
         $event: MouseEvent,
-        projectWrapper: ProjectWrapper,
+        dossierWrapper: DossierWrapper,
         cb?: Function
-    ): MatDialogRef<EditProjectDialogComponent> {
+    ): MatDialogRef<EditDossierDialogComponent> {
         $event.stopPropagation();
-        return this._dialog.open(EditProjectDialogComponent, {
+        return this._dialog.open(EditDossierDialogComponent, {
             ...dialogConfig,
             width: '90vw',
             height: '90vh',
             autoFocus: true,
-            data: { projectWrapper, afterSave: cb }
+            data: { dossierWrapper, afterSave: cb }
         });
     }
 
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html
index 81b74114c..6d4dc37f2 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html
@@ -5,8 +5,8 @@
     [tooltipPosition]="tooltipPosition"
     [tooltip]="
         canDownloadFiles
-            ? 'project-overview.download-file'
-            : 'project-overview.download-file-disabled'
+            ? 'dossier-overview.download-file'
+            : 'dossier-overview.download-file-disabled'
     "
     [type]="type"
     icon="red:download"
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
index d932d650e..f3a491cea 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
@@ -1,6 +1,6 @@
 import { Component, Inject, Input } from '@angular/core';
 import { PermissionsService } from '@services/permissions.service';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
 import { FileDownloadService } from '@upload-download/services/file-download.service';
 import { NotificationService } from '@services/notification.service';
@@ -15,7 +15,7 @@ export type MenuState = 'OPEN' | 'CLOSED';
     styleUrls: ['./file-download-btn.component.scss']
 })
 export class FileDownloadBtnComponent {
-    @Input() project: ProjectWrapper;
+    @Input() dossier: DossierWrapper;
     @Input() file: FileStatusWrapper | FileStatusWrapper[];
     @Input() tooltipPosition: 'above' | 'below' | 'before' | 'after' = 'above';
     @Input() type: 'default' | 'primary' | 'warn' | 'dark-bg' = 'default';
@@ -46,7 +46,7 @@ export class FileDownloadBtnComponent {
     downloadFiles($event: MouseEvent) {
         $event.stopPropagation();
         this._fileDownloadService
-            .downloadFiles(Array.isArray(this.file) ? this.file : [this.file], this.project)
+            .downloadFiles(Array.isArray(this.file) ? this.file : [this.file], this.dossier)
             .subscribe(() => {
                 this._notificationService.showToastNotification(
                     this._translateService.instant('download-status.queued', {
diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-annotation-icon/dictionary-annotation-icon.component.ts b/apps/red-ui/src/app/modules/shared/components/dictionary-annotation-icon/dictionary-annotation-icon.component.ts
index 087cd8fe9..a90630377 100644
--- a/apps/red-ui/src/app/modules/shared/components/dictionary-annotation-icon/dictionary-annotation-icon.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/dictionary-annotation-icon/dictionary-annotation-icon.component.ts
@@ -9,7 +9,7 @@ import { TypeValue } from '@redaction/red-ui-http';
 })
 export class DictionaryAnnotationIconComponent implements OnChanges {
     @Input() dictionaryKey: string;
-    @Input() ruleSetId: string;
+    @Input() dossierTemplateId: string;
 
     color: string;
     label: string;
@@ -21,11 +21,11 @@ export class DictionaryAnnotationIconComponent implements OnChanges {
         if (this.dictionaryKey) {
             const typeValue: TypeValue = this._appStateService.getDictionaryTypeValue(
                 this.dictionaryKey,
-                this.ruleSetId
+                this.dossierTemplateId
             );
             this.color = this._appStateService.getDictionaryColor(
                 this.dictionaryKey,
-                this.ruleSetId
+                this.dossierTemplateId
             );
             this.type = typeValue.hint ? 'circle' : 'square';
             this.label = this.dictionaryKey[0].toUpperCase();
diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
index ada7c69d8..bdbe69bae 100644
--- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
@@ -43,9 +43,16 @@
                 </mat-checkbox>
             </div>
             <div class="red-input-group w-200 mr-8">
-                <mat-select formControlName="ruleSet">
-                    <mat-option *ngFor="let ruleSet of ruleSets" [value]="ruleSet">
-                        {{ ruleSet === selectRuleSet ? (ruleSet.name | translate) : ruleSet.name }}
+                <mat-select formControlName="dossierTemplate">
+                    <mat-option
+                        *ngFor="let dossierTemplate of dossierTemplates"
+                        [value]="dossierTemplate"
+                    >
+                        {{
+                            dossierTemplate === selectDossierTemplate
+                                ? (dossierTemplate.name | translate)
+                                : dossierTemplate.name
+                        }}
                     </mat-option>
                 </mat-select>
             </div>
diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts
index 7c7cb1e1c..61ac8e725 100644
--- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts
@@ -1,5 +1,9 @@
 import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
-import { DictionaryControllerService, RuleSetModel, TypeValue } from '@redaction/red-ui-http';
+import {
+    DictionaryControllerService,
+    DossierTemplateModel,
+    TypeValue
+} from '@redaction/red-ui-http';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { AppStateService } from '@state/app-state.service';
 import { debounce } from '@utils/debounce';
@@ -42,9 +46,9 @@ export class DictionaryManagerComponent implements OnChanges {
     showDiffEditor = false;
     searchText = '';
 
-    selectRuleSet = { name: 'dictionary-overview.compare.select-ruleset' };
+    selectDossierTemplate = { name: 'dictionary-overview.compare.select-dossier-template' };
     selectDictionary = { label: 'dictionary-overview.compare.select-dictionary' };
-    ruleSets: RuleSetModel[];
+    dossierTemplates: DossierTemplateModel[];
     dictionaries: TypeValue[] = [this.selectDictionary];
     form: FormGroup;
 
@@ -61,23 +65,27 @@ export class DictionaryManagerComponent implements OnChanges {
         this.currentEntries = this.initialEntries;
         this.form = this._formBuilder.group({
             active: [false],
-            ruleSet: [{ value: this.selectRuleSet, disabled: true }],
+            dossierTemplate: [{ value: this.selectDossierTemplate, disabled: true }],
             dictionary: [{ value: this.selectDictionary, disabled: true }]
         });
 
         this.form.valueChanges.subscribe((value) => {
-            this._setFieldStatus('ruleSet', value.active);
+            this._setFieldStatus('dossierTemplate', value.active);
             this._setFieldStatus(
                 'dictionary',
-                value.active && this.form.get('ruleSet').value !== this.selectRuleSet
+                value.active &&
+                    this.form.get('dossierTemplate').value !== this.selectDossierTemplate
             );
             this._loadDictionaries();
         });
 
-        this.ruleSets = [this.selectRuleSet, ...this._appStateService.ruleSets];
+        this.dossierTemplates = [
+            this.selectDossierTemplate,
+            ...this._appStateService.dossierTemplates
+        ];
 
-        this.form.controls.ruleSet.valueChanges.subscribe(() => {
-            this._onRuleSetChanged();
+        this.form.controls.dossierTemplate.valueChanges.subscribe(() => {
+            this._onDossierTemplateChanged();
         });
 
         this.form.controls.active.valueChanges.subscribe((value) => {
@@ -212,17 +220,17 @@ export class DictionaryManagerComponent implements OnChanges {
         }
     }
 
-    private _setFieldStatus(field: 'ruleSet' | 'dictionary', enabled: boolean) {
+    private _setFieldStatus(field: 'dossierTemplate' | 'dictionary', enabled: boolean) {
         this.form.get(field)[enabled ? 'enable' : 'disable']({ emitEvent: false });
     }
 
     private _loadDictionaries() {
-        const ruleSetId = this.form.get('ruleSet').value.ruleSetId;
-        if (!ruleSetId) {
+        const dossierTemplateId = this.form.get('dossierTemplate').value.dossierTemplateId;
+        if (!dossierTemplateId) {
             this.dictionaries = [this.selectDictionary];
             return;
         }
-        const appStateDictionaryData = this._appStateService.dictionaryData[ruleSetId];
+        const appStateDictionaryData = this._appStateService.dictionaryData[dossierTemplateId];
         this.dictionaries = [
             this.selectDictionary,
             ...Object.values(appStateDictionaryData).filter(
@@ -238,7 +246,7 @@ export class DictionaryManagerComponent implements OnChanges {
         this._codeEditor.revealLineInCenter(range.startLineNumber, SMOOTH_SCROLL);
     }
 
-    private _onRuleSetChanged() {
+    private _onDossierTemplateChanged() {
         this._loadDictionaries();
         this.form.patchValue({ dictionary: this.selectDictionary });
     }
@@ -248,7 +256,7 @@ export class DictionaryManagerComponent implements OnChanges {
             return of('');
         }
         return this._dictionaryControllerService
-            .getDictionaryForType(dictionary.ruleSetId, dictionary.type)
+            .getDictionaryForType(dictionary.dossierTemplateId, dictionary.type)
             .pipe(map((data) => this._toString(data.entries)));
     }
 
diff --git a/apps/red-ui/src/app/modules/shared/components/filter/utils/filter-utils.ts b/apps/red-ui/src/app/modules/shared/components/filter/utils/filter-utils.ts
index 41f6da0dd..9e96ded21 100644
--- a/apps/red-ui/src/app/modules/shared/components/filter/utils/filter-utils.ts
+++ b/apps/red-ui/src/app/modules/shared/components/filter/utils/filter-utils.ts
@@ -1,6 +1,6 @@
 import { FilterModel } from '../model/filter.model';
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 import { PermissionsService } from '@services/permissions.service';
 
 export function processFilters(oldFilters: FilterModel[], newFilters: FilterModel[]) {
@@ -126,14 +126,14 @@ export const keyChecker = (key: string) => (entity: any, filter: FilterModel) =>
     entity[key] === filter.key;
 
 export const annotationFilterChecker = (
-    input: FileStatusWrapper | ProjectWrapper,
+    input: FileStatusWrapper | DossierWrapper,
     filter: FilterModel,
     permissionsService: PermissionsService
 ) => {
     switch (filter.key) {
         case 'analysis': {
-            if (input instanceof ProjectWrapper) {
-                return permissionsService.projectReanalysisRequired(input);
+            if (input instanceof DossierWrapper) {
+                return permissionsService.dossierReanalysisRequired(input);
             } else {
                 return permissionsService.fileRequiresReanalysis(input);
             }
@@ -159,19 +159,19 @@ export const annotationFilterChecker = (
     }
 };
 
-export const projectStatusChecker = (pw: ProjectWrapper, filter: FilterModel) =>
+export const dossierStatusChecker = (pw: DossierWrapper, filter: FilterModel) =>
     pw.hasStatus(filter.key);
 
-export const projectMemberChecker = (pw: ProjectWrapper, filter: FilterModel) =>
+export const dossierMemberChecker = (pw: DossierWrapper, filter: FilterModel) =>
     pw.hasMember(filter.key);
 
-export const ruleSetChecker = (pw: ProjectWrapper, filter: FilterModel) =>
-    pw.ruleSetId === filter.key;
+export const dossierTemplateChecker = (pw: DossierWrapper, filter: FilterModel) =>
+    pw.dossierTemplateId === filter.key;
 
-export const dueDateChecker = (pw: ProjectWrapper, filter: FilterModel) =>
+export const dueDateChecker = (pw: DossierWrapper, filter: FilterModel) =>
     pw.dueDateMatches(filter.key);
 
-export const addedDateChecker = (pw: ProjectWrapper, filter: FilterModel) =>
+export const addedDateChecker = (pw: DossierWrapper, filter: FilterModel) =>
     pw.addedDateMatches(filter.key);
 
 export function getFilteredEntities(
diff --git a/apps/red-ui/src/app/modules/shared/directives/navigate-last-projects-screen.directive.ts b/apps/red-ui/src/app/modules/shared/directives/navigate-last-projects-screen.directive.ts
index d99f0d5a7..7f4b1c9de 100644
--- a/apps/red-ui/src/app/modules/shared/directives/navigate-last-projects-screen.directive.ts
+++ b/apps/red-ui/src/app/modules/shared/directives/navigate-last-projects-screen.directive.ts
@@ -2,12 +2,12 @@ import { Directive, HostListener } from '@angular/core';
 import { RouterHistoryService } from '@services/router-history.service';
 
 @Directive({
-    selector: '[redactionNavigateLastProjectsScreen]'
+    selector: '[redactionNavigateLastDossiersScreen]'
 })
-export class NavigateLastProjectsScreenDirective {
+export class NavigateLastDossiersScreenDirective {
     constructor(private readonly _routerHistoryService: RouterHistoryService) {}
 
     @HostListener('click') onClick() {
-        this._routerHistoryService.navigateToLastProjectsScreen();
+        this._routerHistoryService.navigateToLastDossiersScreen();
     }
 }
diff --git a/apps/red-ui/src/app/modules/shared/services/dictionary-save.service.ts b/apps/red-ui/src/app/modules/shared/services/dictionary-save.service.ts
index 934d4d5a7..80cdb1e5b 100644
--- a/apps/red-ui/src/app/modules/shared/services/dictionary-save.service.ts
+++ b/apps/red-ui/src/app/modules/shared/services/dictionary-save.service.ts
@@ -20,7 +20,7 @@ export class DictionarySaveService {
     saveEntries(
         entries: string[],
         initialEntries: string[],
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId: string,
         showToast = true
@@ -38,7 +38,7 @@ export class DictionarySaveService {
             if (entriesToAdd.length > 0) {
                 obs = this._dictionaryControllerService.addEntry(
                     entriesToAdd,
-                    ruleSetId,
+                    dossierTemplateId,
                     type,
                     dossierId,
                     true
@@ -46,7 +46,7 @@ export class DictionarySaveService {
             } else {
                 obs = this._dictionaryControllerService.deleteEntries(
                     initialEntries,
-                    ruleSetId,
+                    dossierTemplateId,
                     type,
                     dossierId
                 );
diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts
index c70bd00e7..7f8c8f6a6 100644
--- a/apps/red-ui/src/app/modules/shared/shared.module.ts
+++ b/apps/red-ui/src/app/modules/shared/shared.module.ts
@@ -31,7 +31,7 @@ import { RoundCheckboxComponent } from './components/checkbox/round-checkbox.com
 import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core';
 import { MomentDateAdapter } from '@angular/material-moment-adapter';
 import { SelectComponent } from './components/select/select.component';
-import { NavigateLastProjectsScreenDirective } from './directives/navigate-last-projects-screen.directive';
+import { NavigateLastDossiersScreenDirective } from './directives/navigate-last-dossiers-screen.directive';
 import { DictionaryManagerComponent } from './components/dictionary-manager/dictionary-manager.component';
 import { SideNavComponent } from '@shared/components/side-nav/side-nav.component';
 import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
@@ -71,7 +71,7 @@ const utils = [
     HumanizePipe,
     SyncWidthDirective,
     HasScrollbarDirective,
-    NavigateLastProjectsScreenDirective
+    NavigateLastDossiersScreenDirective
 ];
 
 const modules = [
diff --git a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.html b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.html
index 7edf1068c..a4795daf5 100644
--- a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.html
+++ b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.html
@@ -1,7 +1,7 @@
 <section (mouseout)="close()">
     <mat-icon class="upload-icon" svgIcon="red:upload"></mat-icon>
     <div class="heading-xl">
-        {{ 'project-overview.upload-files' | translate }}
+        {{ 'dossier-overview.upload-files' | translate }}
     </div>
 
     <button (click)="close()" class="close-icon" mat-icon-button>
diff --git a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.ts b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.ts
index 2c772f8c7..991a2ee75 100644
--- a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.ts
+++ b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.ts
@@ -33,7 +33,7 @@ export class FileDropComponent {
 
     @HostListener('drop', ['$event'])
     onDrop(event: DragEvent) {
-        handleFileDrop(event, this._appStateService.activeProject, this.uploadFiles.bind(this));
+        handleFileDrop(event, this._appStateService.activeDossier, this.uploadFiles.bind(this));
     }
 
     @HostListener('dragover', ['$event'])
diff --git a/apps/red-ui/src/app/modules/upload-download/model/download-status.wrapper.ts b/apps/red-ui/src/app/modules/upload-download/model/download-status.wrapper.ts
index 28cd99f95..4c38d2973 100644
--- a/apps/red-ui/src/app/modules/upload-download/model/download-status.wrapper.ts
+++ b/apps/red-ui/src/app/modules/upload-download/model/download-status.wrapper.ts
@@ -37,8 +37,8 @@ export class DownloadStatusWrapper {
         return this._downloadStatus.mimeType;
     }
 
-    get projectId() {
-        return this._downloadStatus.projectId;
+    get dossierId() {
+        return this._downloadStatus.dossierId;
     }
 
     get isReady() {
diff --git a/apps/red-ui/src/app/modules/upload-download/model/file-upload.model.ts b/apps/red-ui/src/app/modules/upload-download/model/file-upload.model.ts
index bdf33a0f9..1e6170f72 100644
--- a/apps/red-ui/src/app/modules/upload-download/model/file-upload.model.ts
+++ b/apps/red-ui/src/app/modules/upload-download/model/file-upload.model.ts
@@ -6,6 +6,6 @@ export interface FileUploadModel {
     retryCount: number;
     size: number;
     sizeError: any;
-    projectId?: string;
-    projectName?: string;
+    dossierId?: string;
+    dossierName?: string;
 }
diff --git a/apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts b/apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts
index 7608696b9..45f66edeb 100644
--- a/apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts
+++ b/apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts
@@ -3,7 +3,7 @@ import { DownloadControllerService, FileManagementControllerService } from '@red
 import { interval, Observable } from 'rxjs';
 import { AppConfigKey, AppConfigService } from '@app-config/app-config.service';
 import { TranslateService } from '@ngx-translate/core';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
 import { mergeMap, tap } from 'rxjs/operators';
 import { DownloadStatusWrapper } from '../model/download-status.wrapper';
@@ -36,12 +36,12 @@ export class FileDownloadService {
 
     downloadFiles(
         fileStatusWrappers: FileStatusWrapper[],
-        project: ProjectWrapper
+        dossier: DossierWrapper
     ): Observable<any> {
         return this._downloadControllerService
             .prepareDownload({
                 fileIds: fileStatusWrappers.map((f) => f.fileId),
-                projectId: project.projectId,
+                dossierId: dossier.dossierId,
                 reportTypes: [
                     'WORD_SINGLE_FILE_EFSA_TEMPLATE',
                     'WORD_SINGLE_FILE_SYNGENTA_TEMPLATE',
diff --git a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
index 3b8e44ad6..9ed61e739 100644
--- a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
+++ b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
@@ -37,9 +37,9 @@ export class FileUploadService {
         });
     }
 
-    get activeProjectKeys() {
+    get activeDossierKeys() {
         return Object.keys(this.groupedFiles).filter(
-            (projectId) => this.groupedFiles[projectId].length > 0
+            (dossierId) => this.groupedFiles[dossierId].length > 0
         );
     }
 
@@ -55,12 +55,12 @@ export class FileUploadService {
     async uploadFiles(files: FileUploadModel[]): Promise<number> {
         const maxSizeMB = this._appConfigService.getConfig(AppConfigKey.MAX_FILE_SIZE_MB, 100);
         const maxSizeBytes = toNumber(maxSizeMB) * 1024 * 1024;
-        const projectFiles = this._appStateService.activeProject.files;
+        const dossierFiles = this._appStateService.activeDossier.files;
         let option: 'overwrite' | 'skip' | undefined;
         for (let idx = 0; idx < files.length; ++idx) {
             const file = files[idx];
             let currentOption = option;
-            if (projectFiles.find((pf) => pf.filename === file.file.name)) {
+            if (dossierFiles.find((pf) => pf.filename === file.file.name)) {
                 if (!option) {
                     const res = await this._dialogService.openOverwriteFileDialog(file.file.name);
                     if (res.cancel) {
@@ -118,15 +118,15 @@ export class FileUploadService {
     }
 
     private _addFileToGroup(file: FileUploadModel) {
-        if (!this.groupedFiles[file.projectId]) {
-            this.groupedFiles[file.projectId] = [];
+        if (!this.groupedFiles[file.dossierId]) {
+            this.groupedFiles[file.dossierId] = [];
         }
-        this.groupedFiles[file.projectId].push(file);
+        this.groupedFiles[file.dossierId].push(file);
     }
 
     private _removeFileFromGroup(file: FileUploadModel) {
-        const index = this.groupedFiles[file.projectId].indexOf(file);
-        this.groupedFiles[file.projectId].splice(index, 1);
+        const index = this.groupedFiles[file.dossierId].indexOf(file);
+        this.groupedFiles[file.dossierId].splice(index, 1);
     }
 
     private _handleUploads() {
@@ -155,7 +155,7 @@ export class FileUploadService {
         this.activeUploads++;
         const obs = this._fileManagementControllerService.uploadFileForm(
             uploadFile.file,
-            uploadFile.projectId,
+            uploadFile.dossierId,
             'events',
             true
         );
@@ -178,7 +178,7 @@ export class FileUploadService {
                         };
                     }
                     this._removeUpload(uploadFile);
-                    await this._appStateService.reloadActiveProjectFiles();
+                    await this._appStateService.reloadActiveDossierFiles();
                 }
             },
             () => {
diff --git a/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html b/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html
index 37189cd38..060b49cf5 100644
--- a/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html
+++ b/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.html
@@ -16,12 +16,12 @@
         ></redaction-circle-button>
     </div>
     <div [hidden]="collapsed" class="upload-download-list">
-        <div *ngFor="let projectId of uploadService.activeProjectKeys">
-            <div class="project-name-wrapper all-caps-label">
-                <span>{{ uploadService.groupedFiles[projectId][0].projectName }}</span>
+        <div *ngFor="let dossierId of uploadService.activeDossierKeys">
+            <div class="dossier-name-wrapper all-caps-label">
+                <span>{{ uploadService.groupedFiles[dossierId][0].dossierName }}</span>
             </div>
             <div
-                *ngFor="let model of uploadService.groupedFiles[projectId]"
+                *ngFor="let model of uploadService.groupedFiles[dossierId]"
                 [class.error]="model.error"
                 class="upload-download-list-item"
             >
diff --git a/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.scss b/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.scss
index 384096cb5..5cbe615b8 100644
--- a/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.scss
+++ b/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.scss
@@ -44,12 +44,12 @@
         max-height: 260px;
 
         > div:not(:first-child) {
-            .project-name-wrapper {
+            .dossier-name-wrapper {
                 border-top: 1px solid $separator;
             }
         }
 
-        .project-name-wrapper {
+        .dossier-name-wrapper {
             display: flex;
             padding: 4px 16px;
             background-color: $grey-2;
diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts
index 71169d87c..a60a97a90 100644
--- a/apps/red-ui/src/app/services/permissions.service.ts
+++ b/apps/red-ui/src/app/services/permissions.service.ts
@@ -3,7 +3,7 @@ import { AppStateService } from '@state/app-state.service';
 import { UserService, UserWrapper } from './user.service';
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
 import { User } from '@redaction/red-ui-http';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 
 @Injectable({
     providedIn: 'root'
@@ -30,8 +30,8 @@ export class PermissionsService {
         return this.isFileReviewer(fileStatus) || this.isApprover();
     }
 
-    projectReanalysisRequired(project?: ProjectWrapper) {
-        for (const file of project.files) {
+    dossierReanalysisRequired(dossier?: DossierWrapper) {
+        for (const file of dossier.files) {
             const fileReanalysisRequired = this.fileRequiresReanalysis(file);
             if (fileReanalysisRequired) {
                 return true;
@@ -49,16 +49,16 @@ export class PermissionsService {
         return fileStatus.analysisRequired;
     }
 
-    displayReanalyseBtn(project?: ProjectWrapper) {
-        if (!project) {
-            project = this._appStateService.activeProject;
+    displayReanalyseBtn(dossier?: DossierWrapper) {
+        if (!dossier) {
+            dossier = this._appStateService.activeDossier;
         }
-        if (!project) {
+        if (!dossier) {
             return false;
         }
         return (
-            this.isApprover(project) &&
-            project.files.filter((file) => this.fileRequiresReanalysis(file)).length > 0
+            this.isApprover(dossier) &&
+            dossier.files.filter((file) => this.fileRequiresReanalysis(file)).length > 0
         );
     }
 
@@ -86,8 +86,8 @@ export class PermissionsService {
         return fileStatus.currentReviewer === this._userService.userId;
     }
 
-    canDeleteFile(fileStatus?: FileStatusWrapper, project?: ProjectWrapper) {
-        return this.isOwner(project) || fileStatus.isUnassigned;
+    canDeleteFile(fileStatus?: FileStatusWrapper, dossier?: DossierWrapper) {
+        return this.isOwner(dossier) || fileStatus.isUnassigned;
     }
 
     isApprovedOrUnderApproval(fileStatus?: FileStatusWrapper) {
@@ -109,13 +109,13 @@ export class PermissionsService {
         }
 
         const precondition =
-            this.isProjectMember() &&
+            this.isDossierMember() &&
             !fileStatus.isProcessing &&
             !fileStatus.isError &&
             !fileStatus.isApproved;
 
         const isNotCurrentReviewer = fileStatus.currentReviewer !== this._userService.userId;
-        const isTheOnlyReviewer = !this._appStateService.activeProject.hasMoreThanOneReviewer;
+        const isTheOnlyReviewer = !this._appStateService.activeDossier.hasMoreThanOneReviewer;
 
         if (precondition) {
             if (
@@ -137,7 +137,7 @@ export class PermissionsService {
         }
 
         const precondition =
-            this.isProjectMember() &&
+            this.isDossierMember() &&
             !fileStatus.isProcessing &&
             !fileStatus.isError &&
             !fileStatus.isApproved &&
@@ -146,14 +146,14 @@ export class PermissionsService {
         if (precondition) {
             if (
                 (fileStatus.isUnassigned || fileStatus.isUnderReview) &&
-                this._appStateService.activeProject.hasMoreThanOneReviewer
+                this._appStateService.activeDossier.hasMoreThanOneReviewer
             ) {
                 return true;
             }
             if (
                 fileStatus.isUnderApproval &&
                 this.isApprover() &&
-                this._appStateService.activeProject.hasMoreThanOneApprover
+                this._appStateService.activeDossier.hasMoreThanOneApprover
             ) {
                 return true;
             }
@@ -201,43 +201,43 @@ export class PermissionsService {
         return fileStatus.isUnderReview && this.isReviewerOrApprover(fileStatus);
     }
 
-    isOwner(project?: ProjectWrapper, user?: UserWrapper) {
+    isOwner(dossier?: DossierWrapper, user?: UserWrapper) {
         if (!user) {
             user = this._userService.user;
         }
-        if (!project) {
-            project = this._appStateService.activeProject;
+        if (!dossier) {
+            dossier = this._appStateService.activeDossier;
         }
-        if (!project) {
+        if (!dossier) {
             return false;
         }
-        return project.ownerId === user.id;
+        return dossier.ownerId === user.id;
     }
 
-    isApprover(project?: ProjectWrapper, user?: UserWrapper) {
+    isApprover(dossier?: DossierWrapper, user?: UserWrapper) {
         if (!user) {
             user = this._userService.user;
         }
-        if (!project) {
-            project = this._appStateService.activeProject;
+        if (!dossier) {
+            dossier = this._appStateService.activeDossier;
         }
-        if (!project) {
+        if (!dossier) {
             return false;
         }
-        return project.approverIds?.indexOf(user.id) >= 0;
+        return dossier.approverIds?.indexOf(user.id) >= 0;
     }
 
-    isProjectMember(project?: ProjectWrapper, user?: UserWrapper) {
+    isDossierMember(dossier?: DossierWrapper, user?: UserWrapper) {
         if (!user) {
             user = this._userService.user;
         }
-        if (!project) {
-            project = this._appStateService.activeProject;
+        if (!dossier) {
+            dossier = this._appStateService.activeDossier;
         }
-        if (!project) {
+        if (!dossier) {
             return false;
         }
-        return project.memberIds?.includes(user.id);
+        return dossier.memberIds?.includes(user.id);
     }
 
     canPerformAnnotationActions(fileStatus?: FileStatusWrapper) {
@@ -280,7 +280,7 @@ export class PermissionsService {
         if (!fileStatus) {
             return false;
         }
-        return fileStatus.status === 'UNDER_APPROVAL' && this.isProjectMember();
+        return fileStatus.status === 'UNDER_APPROVAL' && this.isDossierMember();
     }
 
     canMarkPagesAsViewed(fileStatus?: FileStatusWrapper) {
@@ -303,21 +303,21 @@ export class PermissionsService {
         if (!fileStatus) {
             return false;
         }
-        const project = this._appStateService.getProjectById(fileStatus.projectId);
-        if (!project) {
+        const dossier = this._appStateService.getDossierById(fileStatus.dossierId);
+        if (!dossier) {
             return false;
         }
-        return fileStatus.status === 'APPROVED' && this.isApprover(project);
+        return fileStatus.status === 'APPROVED' && this.isApprover(dossier);
     }
 
-    canDeleteProject(project?: ProjectWrapper) {
-        if (!project) {
-            project = this._appStateService.activeProject;
+    canDeleteDossier(dossier?: DossierWrapper) {
+        if (!dossier) {
+            dossier = this._appStateService.activeDossier;
         }
-        if (!project) {
+        if (!dossier) {
             return false;
         }
-        return project.files.reduce((acc, file) => acc && this.canDeleteFile(file, project), true);
+        return dossier.files.reduce((acc, file) => acc && this.canDeleteFile(file, dossier), true);
     }
 
     isAdmin(user?: UserWrapper) {
diff --git a/apps/red-ui/src/app/services/router-history.service.ts b/apps/red-ui/src/app/services/router-history.service.ts
index 4daac8afc..383c71ec4 100644
--- a/apps/red-ui/src/app/services/router-history.service.ts
+++ b/apps/red-ui/src/app/services/router-history.service.ts
@@ -6,19 +6,19 @@ import { filter } from 'rxjs/operators';
     providedIn: 'root'
 })
 export class RouterHistoryService {
-    private _lastProjectsScreen = '/main/projects';
+    private _lastDossiersScreen = '/main/dossiers';
 
     constructor(private readonly _router: Router) {
         this._router.events
             .pipe(filter((event) => event instanceof NavigationEnd))
             .subscribe((event: NavigationEnd) => {
-                if (event.url.startsWith('/main/projects')) {
-                    this._lastProjectsScreen = event.url;
+                if (event.url.startsWith('/main/dossiers')) {
+                    this._lastDossiersScreen = event.url;
                 }
             });
     }
 
-    navigateToLastProjectsScreen() {
-        this._router.navigate([this._lastProjectsScreen]);
+    navigateToLastDossiersScreen() {
+        this._router.navigate([this._lastDossiersScreen]);
     }
 }
diff --git a/apps/red-ui/src/app/services/sorting.service.ts b/apps/red-ui/src/app/services/sorting.service.ts
index a1848880e..4ef6000f1 100644
--- a/apps/red-ui/src/app/services/sorting.service.ts
+++ b/apps/red-ui/src/app/services/sorting.service.ts
@@ -6,8 +6,8 @@ export class SortingOption {
 }
 
 export type ScreenName =
-    | 'project-listing'
-    | 'project-overview'
+    | 'dossier-listing'
+    | 'dossier-overview'
     | 'dictionary-listing'
     | 'rule-sets-listing'
     | 'default-colors'
@@ -18,8 +18,8 @@ export type ScreenName =
 })
 export class SortingService {
     private _options: { [key: string]: SortingOption } = {
-        'project-listing': { column: 'project.projectName', order: 'asc' },
-        'project-overview': { column: 'filename', order: 'asc' },
+        'dossier-listing': { column: 'dossier.dossierName', order: 'asc' },
+        'dossier-overview': { column: 'filename', order: 'asc' },
         'dictionary-listing': { column: 'label', order: 'asc' },
         'rule-sets-listing': { column: 'name', order: 'asc' },
         'default-colors': { column: 'key', order: 'asc' },
diff --git a/apps/red-ui/src/app/state/app-state.guard.ts b/apps/red-ui/src/app/state/app-state.guard.ts
index 8336b3ff9..5ada1743f 100644
--- a/apps/red-ui/src/app/state/app-state.guard.ts
+++ b/apps/red-ui/src/app/state/app-state.guard.ts
@@ -20,33 +20,33 @@ export class AppStateGuard implements CanActivate {
 
         if (this._userService.user.isUser || this._userService.user.isAdmin) {
             await this._userService.loadAllUsersIfNecessary();
-            await this._appStateService.loadRuleSetsIfNecessary();
+            await this._appStateService.loadDossierTemplatesIfNecessary();
             await this._appStateService.loadDictionaryDataIfNecessary();
         }
 
         if (this._userService.isUser()) {
-            await this._appStateService.loadAllProjectsIfNecessary();
+            await this._appStateService.loadAllDossiersIfNecessary();
         }
 
-        const { projectId, fileId, ruleSetId, type } = route.params;
+        const { dossierId, fileId, dossierTemplateId, type } = route.params;
 
-        if (projectId && !this._appStateService.getProjectById(projectId)) {
-            await this._router.navigate(['main', 'projects']);
+        if (dossierId && !this._appStateService.getDossierById(dossierId)) {
+            await this._router.navigate(['main', 'dossiers']);
             return false;
         }
 
-        if (fileId && !this._appStateService.getFileById(projectId, fileId)) {
-            await this._router.navigate(['main', 'projects', projectId]);
+        if (fileId && !this._appStateService.getFileById(dossierId, fileId)) {
+            await this._router.navigate(['main', 'dossiers', dossierId]);
             return false;
         }
 
-        if (ruleSetId && !this._appStateService.getRuleSetById(ruleSetId)) {
-            await this._router.navigate(['main', 'admin', 'project-templates']);
+        if (dossierTemplateId && !this._appStateService.getDossierTemplateById(dossierTemplateId)) {
+            await this._router.navigate(['main', 'admin', 'dossier-templates']);
             return false;
         }
 
-        if (type && !this._appStateService.dictionaryData[ruleSetId][type]) {
-            await this._router.navigate(['main', 'admin', 'project-templates', ruleSetId]);
+        if (type && !this._appStateService.dictionaryData[dossierTemplateId][type]) {
+            await this._router.navigate(['main', 'admin', 'dossier-templates', dossierTemplateId]);
             return false;
         }
 
diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts
index 3170b4b62..6cda1a128 100644
--- a/apps/red-ui/src/app/state/app-state.service.ts
+++ b/apps/red-ui/src/app/state/app-state.service.ts
@@ -1,14 +1,14 @@
 import { EventEmitter, Injectable } from '@angular/core';
 import {
     DictionaryControllerService,
+    Dossier,
+    DossierControllerService,
+    DossierTemplateControllerService,
+    DossierTemplateModel,
     FileAttributesConfig,
     FileAttributesControllerService,
     FileStatus,
-    Project,
-    ProjectControllerService,
     ReanalysisControllerService,
-    RuleSetControllerService,
-    RuleSetModel,
     StatusControllerService,
     TypeValue
 } from '@redaction/red-ui-http';
@@ -20,14 +20,14 @@ import { forkJoin, Observable, of } from 'rxjs';
 import { catchError, tap } from 'rxjs/operators';
 import { humanize } from '@utils/functions';
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
-import { ProjectWrapper } from './model/project.wrapper';
+import { DossierWrapper } from './model/dossier.wrapper';
 
 export interface AppState {
-    projects: ProjectWrapper[];
-    ruleSets: RuleSetModel[];
-    activeProjectId: string;
+    dossiers: DossierWrapper[];
+    dossierTemplates: DossierTemplateModel[];
+    activeDossierId: string;
     activeFileId: string;
-    activeRuleSetId: string;
+    activeDossierTemplateId: string;
     fileAttributesConfig: { [key: string]: FileAttributesConfig };
     activeDictionaryType: string;
     totalAnalysedPages?: number;
@@ -46,37 +46,37 @@ export class AppStateService {
     constructor(
         private readonly _router: Router,
         private readonly _userService: UserService,
-        private readonly _projectControllerService: ProjectControllerService,
+        private readonly _dossierControllerService: DossierControllerService,
         private readonly _notificationService: NotificationService,
         private readonly _reanalysisControllerService: ReanalysisControllerService,
         private readonly _translateService: TranslateService,
         private readonly _dictionaryControllerService: DictionaryControllerService,
-        private readonly _ruleSetControllerService: RuleSetControllerService,
+        private readonly _dossierTemplateControllerService: DossierTemplateControllerService,
         private readonly _statusControllerService: StatusControllerService,
         private readonly _fileAttributesService: FileAttributesControllerService
     ) {
         this._appState = {
-            projects: [],
-            ruleSets: [],
+            dossiers: [],
+            dossierTemplates: [],
             fileAttributesConfig: {},
-            activeProjectId: null,
+            activeDossierId: null,
             activeFileId: null,
-            activeRuleSetId: null,
+            activeDossierTemplateId: null,
             activeDictionaryType: null
         };
 
         this._router.events.subscribe((event: Event) => {
             if (AppStateService._isFileOverviewRoute(event)) {
-                const url = (event as ResolveStart).url.replace('/main/projects/', '');
-                const [projectId, , fileId] = url.split(/[/?]/);
-                this.activateFile(projectId, fileId);
+                const url = (event as ResolveStart).url.replace('/main/dossiers/', '');
+                const [dossierId, , fileId] = url.split(/[/?]/);
+                this.activateFile(dossierId, fileId);
             }
-            if (AppStateService._isProjectOverviewRoute(event)) {
-                const projectId = (event as ResolveStart).url.replace('/main/projects/', '');
-                this.activateProject(projectId);
+            if (AppStateService._isDossierOverviewRoute(event)) {
+                const dossierId = (event as ResolveStart).url.replace('/main/dossiers/', '');
+                this.activateDossier(dossierId);
             }
             if (AppStateService._isRandomRoute(event)) {
-                this._appState.activeProjectId = null;
+                this._appState.activeDossierId = null;
             }
         });
     }
@@ -89,27 +89,27 @@ export class AppStateService {
 
     get aggregatedFiles(): FileStatusWrapper[] {
         const result: FileStatusWrapper[] = [];
-        this._appState.projects.forEach((p) => {
+        this._appState.dossiers.forEach((p) => {
             result.push(...p.files);
         });
         return result;
     }
 
-    get activeRuleSetId(): string {
-        return this._appState.activeRuleSetId;
+    get activeDossierTemplateId(): string {
+        return this._appState.activeDossierTemplateId;
     }
 
-    get activeRuleSet(): RuleSetModel {
-        return this.getRuleSetById(this.activeRuleSetId);
+    get activeDossierTemplate(): DossierTemplateModel {
+        return this.getDossierTemplateById(this.activeDossierTemplateId);
     }
 
-    get ruleSets(): RuleSetModel[] {
-        return this._appState.ruleSets;
+    get dossierTemplates(): DossierTemplateModel[] {
+        return this._appState.dossierTemplates;
     }
 
     get activeFileAttributesConfig(): FileAttributesConfig {
-        if (this.activeProject) {
-            return this._appState.fileAttributesConfig[this.activeProject.ruleSetId];
+        if (this.activeDossier) {
+            return this._appState.fileAttributesConfig[this.activeDossier.dossierTemplateId];
         }
     }
 
@@ -118,29 +118,29 @@ export class AppStateService {
     }
 
     get activeDictionary(): TypeValue {
-        return this.activeRuleSetId && this.dictionaryData[this.activeRuleSetId]
-            ? this.dictionaryData[this.activeRuleSetId][this.activeDictionaryType]
+        return this.activeDossierTemplateId && this.dictionaryData[this.activeDossierTemplateId]
+            ? this.dictionaryData[this.activeDossierTemplateId][this.activeDictionaryType]
             : null;
     }
 
-    get activeProjectId(): string {
-        return this._appState.activeProjectId;
+    get activeDossierId(): string {
+        return this._appState.activeDossierId;
     }
 
-    get activeProject(): ProjectWrapper {
-        return this._appState.projects.find((p) => p.projectId === this.activeProjectId);
+    get activeDossier(): DossierWrapper {
+        return this._appState.dossiers.find((p) => p.dossierId === this.activeDossierId);
     }
 
-    get allProjects(): ProjectWrapper[] {
-        return this._appState.projects;
+    get allDossiers(): DossierWrapper[] {
+        return this._appState.dossiers;
     }
 
-    get hasProjects() {
-        return this.allProjects?.length > 0;
+    get hasDossiers() {
+        return this.allDossiers?.length > 0;
     }
 
     get activeFile(): FileStatusWrapper {
-        return this.activeProject?.files.find((f) => f.fileId === this.activeFileId);
+        return this.activeDossier?.files.find((f) => f.fileId === this.activeFileId);
     }
 
     get activeFileId(): string {
@@ -162,15 +162,15 @@ export class AppStateService {
     private static _isFileOverviewRoute(event: Event) {
         return (
             event instanceof ResolveStart &&
-            event.url.includes('/main/projects/') &&
+            event.url.includes('/main/dossiers/') &&
             event.url.includes('/file/')
         );
     }
 
-    private static _isProjectOverviewRoute(event: Event) {
+    private static _isDossierOverviewRoute(event: Event) {
         return (
             event instanceof ResolveStart &&
-            event.url.includes('/main/projects/') &&
+            event.url.includes('/main/dossiers/') &&
             !event.url.includes('/file/')
         );
     }
@@ -178,76 +178,82 @@ export class AppStateService {
     private static _isRandomRoute(event: Event) {
         return (
             event instanceof NavigationEnd &&
-            !event.url.includes('/main/projects/') &&
+            !event.url.includes('/main/dossiers/') &&
             !event.url.includes('/file/')
         );
     }
 
-    async reloadActiveProjectFilesIfNecessary() {
-        if (this.activeProject?.hasPendingOrProcessing) {
-            await this.reloadActiveProjectFiles();
+    async reloadActiveDossierFilesIfNecessary() {
+        if (this.activeDossier?.hasPendingOrProcessing) {
+            await this.reloadActiveDossierFiles();
         }
     }
 
-    getDictionaryColor(type?: string, ruleSetId?: string) {
-        if (!ruleSetId && this.activeProject) {
-            ruleSetId = this.activeProject.ruleSetId;
+    getDictionaryColor(type?: string, dossierTemplateId?: string) {
+        if (!dossierTemplateId && this.activeDossier) {
+            dossierTemplateId = this.activeDossier.dossierTemplateId;
         }
-        if (!ruleSetId) {
-            ruleSetId = this.ruleSets.length > 0 ? this.ruleSets[0].ruleSetId : undefined;
+        if (!dossierTemplateId) {
+            dossierTemplateId =
+                this.dossierTemplates.length > 0
+                    ? this.dossierTemplates[0].dossierTemplateId
+                    : undefined;
         }
-        if (!ruleSetId) {
+        if (!dossierTemplateId) {
             return undefined;
         }
-        const color = this._dictionaryData[ruleSetId][type]?.hexColor;
-        return color ? color : this._dictionaryData[ruleSetId]['default'].hexColor;
+        const color = this._dictionaryData[dossierTemplateId][type]?.hexColor;
+        return color ? color : this._dictionaryData[dossierTemplateId]['default'].hexColor;
     }
 
-    getRuleSetById(id: string): RuleSetModel {
-        return this.ruleSets.find((rs) => rs.ruleSetId === id);
+    getDossierTemplateById(id: string): DossierTemplateModel {
+        return this.dossierTemplates.find((rs) => rs.dossierTemplateId === id);
     }
 
-    getDictionaryTypeValue(key: string, ruleSetId?: string) {
-        if (!ruleSetId && this.activeProject) {
-            ruleSetId = this.activeProject.ruleSetId;
+    getDictionaryTypeValue(key: string, dossierTemplateId?: string) {
+        if (!dossierTemplateId && this.activeDossier) {
+            dossierTemplateId = this.activeDossier.dossierTemplateId;
         }
 
-        if (!ruleSetId) {
-            ruleSetId = this.ruleSets.length > 0 ? this.ruleSets[0].ruleSetId : undefined;
+        if (!dossierTemplateId) {
+            dossierTemplateId =
+                this.dossierTemplates.length > 0
+                    ? this.dossierTemplates[0].dossierTemplateId
+                    : undefined;
         }
-        if (!ruleSetId) {
+        if (!dossierTemplateId) {
             return undefined;
         }
 
-        const data = this._dictionaryData[ruleSetId][key];
-        return data ? data : this._dictionaryData[ruleSetId]['default'];
+        const data = this._dictionaryData[dossierTemplateId][key];
+        return data ? data : this._dictionaryData[dossierTemplateId]['default'];
     }
 
-    getProjectById(id: string) {
-        return this.allProjects.find((project) => project.project.projectId === id);
+    getDossierById(id: string) {
+        return this.allDossiers.find((dossier) => dossier.dossier.dossierId === id);
     }
 
-    getFileById(projectId: string, fileId: string) {
-        return this.getProjectById(projectId).files.find((file) => file.fileId === fileId);
+    getFileById(dossierId: string, fileId: string) {
+        return this.getDossierById(dossierId).files.find((file) => file.fileId === fileId);
     }
 
-    async loadAllProjects(emitEvents: boolean = true) {
-        const projects = await this._projectControllerService.getProjects().toPromise();
-        if (projects) {
-            const mappedProjects = projects.map(
-                (p) => new ProjectWrapper(p, this._getExistingFiles(p.projectId))
+    async loadAllDossiers(emitEvents: boolean = true) {
+        const dossiers = await this._dossierControllerService.getDossiers().toPromise();
+        if (dossiers) {
+            const mappedDossiers = dossiers.map(
+                (p) => new DossierWrapper(p, this._getExistingFiles(p.dossierId))
             );
 
             const fileData = await this._statusControllerService
-                .getFileStatusForProjects(mappedProjects.map((p) => p.projectId))
+                .getFileStatusForDossiers(mappedDossiers.map((p) => p.dossierId))
                 .toPromise();
 
-            for (const projectId of Object.keys(fileData)) {
-                const project = mappedProjects.find((p) => p.projectId === projectId);
-                this._processFiles(project, fileData[projectId], emitEvents);
+            for (const dossierId of Object.keys(fileData)) {
+                const dossier = mappedDossiers.find((p) => p.dossierId === dossierId);
+                this._processFiles(dossier, fileData[dossierId], emitEvents);
             }
 
-            this._appState.projects = mappedProjects;
+            this._appState.dossiers = mappedDossiers;
             this._computeStats();
         }
     }
@@ -258,16 +264,16 @@ export class AppStateService {
         }
         const oldProcessedDate = this.activeFile.lastProcessed;
         const activeFile = await this._statusControllerService
-            .getFileStatus(this.activeProjectId, this.activeFileId)
+            .getFileStatus(this.activeDossierId, this.activeFileId)
             .toPromise();
 
         const activeFileWrapper = new FileStatusWrapper(
             activeFile,
             this._userService.getNameForId(activeFile.currentReviewer),
-            this.activeProject.ruleSetId,
-            this._appState.fileAttributesConfig[this.activeProject.ruleSetId]
+            this.activeDossier.dossierTemplateId,
+            this._appState.fileAttributesConfig[this.activeDossier.dossierTemplateId]
         );
-        this.activeProject.files = this.activeProject.files.map((file) =>
+        this.activeDossier.files = this.activeDossier.files.map((file) =>
             file.fileId === activeFileWrapper.fileId ? activeFileWrapper : file
         );
 
@@ -279,105 +285,107 @@ export class AppStateService {
         return activeFileWrapper;
     }
 
-    async getFiles(project?: ProjectWrapper, emitEvents: boolean = true) {
-        if (!project) {
-            project = this.activeProject;
+    async getFiles(dossier?: DossierWrapper, emitEvents: boolean = true) {
+        if (!dossier) {
+            dossier = this.activeDossier;
         }
         const files = await this._statusControllerService
-            .getProjectStatus(project.projectId)
+            .getDossierStatus(dossier.dossierId)
             .toPromise();
 
-        return this._processFiles(project, files, emitEvents);
+        return this._processFiles(dossier, files, emitEvents);
     }
 
-    async reanalyzeProject(project?: ProjectWrapper) {
-        if (!project) {
-            project = this.activeProject;
+    async reanalyzeDossier(dossier?: DossierWrapper) {
+        if (!dossier) {
+            dossier = this.activeDossier;
         }
-        await this._reanalysisControllerService.reanalyzeProject(project.projectId).toPromise();
+        await this._reanalysisControllerService.reanalyzeDossier(dossier.dossierId).toPromise();
     }
 
-    activateProject(projectId: string) {
+    activateDossier(dossierId: string) {
         this._appState.activeFileId = null;
-        this._appState.activeProjectId = projectId;
-        if (!this.activeProject) {
-            this._appState.activeProjectId = null;
-            this._router.navigate(['/main/projects']);
+        this._appState.activeDossierId = dossierId;
+        if (!this.activeDossier) {
+            this._appState.activeDossierId = null;
+            this._router.navigate(['/main/dossiers']);
             return;
         } else {
-            this.updateProjectDictionary(this.activeProject.ruleSetId, projectId);
+            this.updateDossierDictionary(this.activeDossier.dossierTemplateId, dossierId);
         }
     }
 
-    updateProjectDictionary(ruleSetId: string, projectId: string) {
-        // project exists, load it's dictionary
+    updateDossierDictionary(dossierTemplateId: string, dossierId: string) {
+        // dossier exists, load it's dictionary
         this._dictionaryControllerService
-            .getDictionaryForType(ruleSetId, 'dossier_redaction', projectId)
+            .getDictionaryForType(dossierTemplateId, 'dossier_redaction', dossierId)
             .subscribe(
                 (typeData) => {
-                    this.activeProject.type = typeData;
+                    this.activeDossier.type = typeData;
                 },
                 () => {
-                    this.activeProject.type = null;
+                    this.activeDossier.type = null;
                 }
             );
     }
 
-    activateFile(projectId: string, fileId: string) {
-        if (this._appState.activeProjectId === projectId && this._appState.activeFileId === fileId)
+    activateFile(dossierId: string, fileId: string) {
+        if (this._appState.activeDossierId === dossierId && this._appState.activeFileId === fileId)
             return;
-        this.activateProject(projectId);
-        if (this.activeProject) {
+        this.activateDossier(dossierId);
+        if (this.activeDossier) {
             this._appState.activeFileId = fileId;
             if (!this.activeFile) {
                 this._appState.activeFileId = null;
-                this._router.navigate(['/main/projects/' + projectId]);
+                this._router.navigate(['/main/dossiers/' + dossierId]);
             }
         }
     }
 
-    activateRuleSet(ruleSetId: string) {
-        this._appState.activeRuleSetId = ruleSetId;
+    activateDossierTemplate(dossierTemplateId: string) {
+        this._appState.activeDossierTemplateId = dossierTemplateId;
         this._appState.activeDictionaryType = null;
-        if (!this.activeRuleSet) {
-            this._appState.activeRuleSetId = null;
-            this._router.navigate(['/main/admin/project-templates']);
+        if (!this.activeDossierTemplate) {
+            this._appState.activeDossierTemplateId = null;
+            this._router.navigate(['/main/admin/dossier-templates']);
         }
     }
 
-    activateDictionary(dictionaryType: string, ruleSetId: string) {
-        this.activateRuleSet(ruleSetId);
-        if (this.activeRuleSet) {
+    activateDictionary(dictionaryType: string, dossierTemplateId: string) {
+        this.activateDossierTemplate(dossierTemplateId);
+        if (this.activeDossierTemplate) {
             this._appState.activeDictionaryType = dictionaryType;
             if (!this.activeDictionary) {
                 this._appState.activeDictionaryType = null;
-                this._router.navigate(['/main/admin/project-templates/' + this.activeRuleSetId]);
+                this._router.navigate([
+                    '/main/admin/dossier-templates/' + this.activeDossierTemplateId
+                ]);
             }
         }
     }
 
     reset() {
         this._appState.activeFileId = null;
-        this._appState.activeProjectId = null;
-        this._appState.activeRuleSetId = null;
+        this._appState.activeDossierId = null;
+        this._appState.activeDossierTemplateId = null;
         this._appState.activeDictionaryType = null;
     }
 
-    deleteProject(project: ProjectWrapper) {
-        return this._projectControllerService
-            .deleteProject(project.projectId)
+    deleteDossier(dossier: DossierWrapper) {
+        return this._dossierControllerService
+            .deleteDossier(dossier.dossierId)
             .toPromise()
             .then(
                 () => {
-                    const index = this._appState.projects.findIndex(
-                        (p) => p.project.projectId === project.projectId
+                    const index = this._appState.dossiers.findIndex(
+                        (p) => p.dossier.dossierId === dossier.dossierId
                     );
-                    this._appState.projects.splice(index, 1);
-                    this._appState.projects = [...this._appState.projects];
+                    this._appState.dossiers.splice(index, 1);
+                    this._appState.dossiers = [...this._appState.dossiers];
                 },
                 () => {
                     this._notificationService.showToastNotification(
-                        this._translateService.instant('projects.delete.delete-failed', project),
+                        this._translateService.instant('dossiers.delete.delete-failed', dossier),
                         null,
                         NotificationType.ERROR
                     );
@@ -385,28 +393,28 @@ export class AppStateService {
             );
     }
 
-    async addOrUpdateProject(project: Project) {
+    async addOrUpdateDossier(dossier: Dossier) {
         try {
-            const updatedProject = await this._projectControllerService
-                .createOrUpdateProject(project)
+            const updatedDossier = await this._dossierControllerService
+                .createOrUpdateDossier(dossier)
                 .toPromise();
-            let foundProject = this._appState.projects.find(
-                (p) => p.project.projectId === updatedProject.projectId
+            let foundDossier = this._appState.dossiers.find(
+                (p) => p.dossier.dossierId === updatedDossier.dossierId
             );
-            if (foundProject) {
-                Object.assign((foundProject.project = updatedProject));
+            if (foundDossier) {
+                Object.assign((foundDossier.dossier = updatedDossier));
             } else {
-                foundProject = new ProjectWrapper(updatedProject, []);
-                this._appState.projects.push(foundProject);
+                foundDossier = new DossierWrapper(updatedDossier, []);
+                this._appState.dossiers.push(foundDossier);
             }
-            this._appState.projects = [...this._appState.projects];
-            return foundProject;
+            this._appState.dossiers = [...this._appState.dossiers];
+            return foundDossier;
         } catch (error) {
             this._notificationService.showToastNotification(
                 this._translateService.instant(
                     error.status === 409
-                        ? 'add-project-dialog.errors.project-already-exists'
-                        : 'add-project-dialog.errors.generic'
+                        ? 'add-dossier-dialog.errors.dossier-already-exists'
+                        : 'add-dossier-dialog.errors.generic'
                 ),
                 null,
                 NotificationType.ERROR
@@ -414,35 +422,35 @@ export class AppStateService {
         }
     }
 
-    async reloadActiveProjectFiles() {
-        if (this.activeProjectId) {
-            await this.getFiles(this.activeProject);
+    async reloadActiveDossierFiles() {
+        if (this.activeDossierId) {
+            await this.getFiles(this.activeDossier);
         }
     }
 
-    async loadAllRuleSets() {
-        this._appState.ruleSets = await this._ruleSetControllerService
-            .getAllRuleSets1()
+    async loadAllDossierTemplates() {
+        this._appState.dossierTemplates = await this._dossierTemplateControllerService
+            .getAllDossierTemplates1()
             .toPromise();
         this._appState.fileAttributesConfig = {};
-        for (const ruleSet of this._appState.ruleSets) {
-            this._appState.fileAttributesConfig[ruleSet.ruleSetId] =
+        for (const dossierTemplate of this._appState.dossierTemplates) {
+            this._appState.fileAttributesConfig[dossierTemplate.dossierTemplateId] =
                 await this._fileAttributesService
-                    .getFileAttributesConfiguration(ruleSet.ruleSetId)
+                    .getFileAttributesConfiguration(dossierTemplate.dossierTemplateId)
                     .pipe(catchError(() => of({})))
                     .toPromise();
         }
     }
 
-    async loadRuleSetsIfNecessary() {
-        if (!this._appState.ruleSets.length) {
-            await this.loadAllRuleSets();
+    async loadDossierTemplatesIfNecessary() {
+        if (!this._appState.dossierTemplates.length) {
+            await this.loadAllDossierTemplates();
         }
     }
 
-    async loadAllProjectsIfNecessary() {
-        if (!this._appState.projects.length) {
-            await this.loadAllProjects();
+    async loadAllDossiersIfNecessary() {
+        if (!this._appState.dossiers.length) {
+            await this.loadAllDossiers();
         }
     }
 
@@ -454,11 +462,11 @@ export class AppStateService {
         }
     }
 
-    getDictionaryDataForRuleSetObservables(
-        ruleSetId: string,
+    getDictionaryDataForDossierTemplateObservables(
+        dossierTemplateId: string,
         dictionaryData: { [key: string]: any }
     ): Observable<any>[] {
-        const typeObs = this._dictionaryControllerService.getAllTypes(ruleSetId).pipe(
+        const typeObs = this._dictionaryControllerService.getAllTypes(dossierTemplateId).pipe(
             tap((typesResponse) => {
                 for (const type of typesResponse.types) {
                     dictionaryData[type.type] = type;
@@ -467,7 +475,7 @@ export class AppStateService {
             })
         );
 
-        const colorsObs = this._dictionaryControllerService.getColors(ruleSetId).pipe(
+        const colorsObs = this._dictionaryControllerService.getColors(dossierTemplateId).pipe(
             tap((colors) => {
                 // declined
                 dictionaryData['declined-suggestion'] = {
@@ -598,12 +606,12 @@ export class AppStateService {
         const obj = {};
         const observables = [];
 
-        for (const ruleSet of this.ruleSets) {
-            obj[ruleSet.ruleSetId] = {};
+        for (const dossierTemplate of this.dossierTemplates) {
+            obj[dossierTemplate.dossierTemplateId] = {};
             observables.push(
-                ...this.getDictionaryDataForRuleSetObservables(
-                    ruleSet.ruleSetId,
-                    obj[ruleSet.ruleSetId]
+                ...this.getDictionaryDataForDossierTemplateObservables(
+                    dossierTemplate.dossierTemplateId,
+                    obj[dossierTemplate.dossierTemplateId]
                 )
             );
         }
@@ -612,17 +620,17 @@ export class AppStateService {
         this._dictionaryData = obj;
     }
 
-    private _getExistingFiles(projectId: string) {
-        const found = this._appState.projects.find((p) => p.project.projectId === projectId);
+    private _getExistingFiles(dossierId: string) {
+        const found = this._appState.dossiers.find((p) => p.dossier.dossierId === dossierId);
         return found ? found.files : [];
     }
 
     private _processFiles(
-        project: ProjectWrapper,
+        dossier: DossierWrapper,
         files: FileStatus[],
         emitEvents: boolean = true
     ) {
-        const oldFiles = [...project.files];
+        const oldFiles = [...dossier.files];
 
         const fileStatusChangedEvent = [];
         const fileReanalysedEvent = [];
@@ -635,8 +643,8 @@ export class AppStateService {
                     const fileStatusWrapper = new FileStatusWrapper(
                         file,
                         this._userService.getNameForId(file.currentReviewer),
-                        project.ruleSetId,
-                        this._appState.fileAttributesConfig[project.ruleSetId]
+                        dossier.dossierTemplateId,
+                        this._appState.fileAttributesConfig[dossier.dossierTemplateId]
                     );
                     if (JSON.stringify(oldFile) !== JSON.stringify(fileStatusWrapper)) {
                         fileStatusChangedEvent.push(fileStatusWrapper);
@@ -653,20 +661,20 @@ export class AppStateService {
                 const fsw = new FileStatusWrapper(
                     file,
                     this._userService.getNameForId(file.currentReviewer),
-                    project.ruleSetId,
-                    this._appState.fileAttributesConfig[project.ruleSetId]
+                    dossier.dossierTemplateId,
+                    this._appState.fileAttributesConfig[dossier.dossierTemplateId]
                 );
                 fileStatusChangedEvent.push(fsw);
             }
         }
 
-        project.files = files.map(
+        dossier.files = files.map(
             (f) =>
                 new FileStatusWrapper(
                     f,
                     this._userService.getNameForId(f.currentReviewer),
-                    project.ruleSetId,
-                    this._appState.fileAttributesConfig[project.ruleSetId]
+                    dossier.dossierTemplateId,
+                    this._appState.fileAttributesConfig[dossier.dossierTemplateId]
                 )
         );
         this._computeStats();
@@ -683,10 +691,10 @@ export class AppStateService {
         let totalAnalysedPages = 0;
         let totalDocuments = 0;
         const totalPeople = new Set<string>();
-        this._appState.projects.forEach((p) => {
+        this._appState.dossiers.forEach((p) => {
             totalDocuments += p.files.length;
-            if (p.project.memberIds) {
-                p.project.memberIds.forEach((m) => totalPeople.add(m));
+            if (p.dossier.memberIds) {
+                p.dossier.memberIds.forEach((m) => totalPeople.add(m));
             }
             let numberOfPages = 0;
             p.files.forEach((f) => {
@@ -700,8 +708,8 @@ export class AppStateService {
         this._appState.totalAnalysedPages = totalAnalysedPages;
         this._appState.totalDocuments = totalDocuments;
 
-        if (this.activeProjectId && this.activeFileId) {
-            this.activateFile(this.activeProjectId, this.activeFileId);
+        if (this.activeDossierId && this.activeFileId) {
+            this.activateFile(this.activeDossierId, this.activeFileId);
         }
     }
 }
diff --git a/apps/red-ui/src/app/state/model/project.wrapper.ts b/apps/red-ui/src/app/state/model/dossier.wrapper.ts
similarity index 73%
rename from apps/red-ui/src/app/state/model/project.wrapper.ts
rename to apps/red-ui/src/app/state/model/dossier.wrapper.ts
index 2f4a8a9ed..76b79bac4 100644
--- a/apps/red-ui/src/app/state/model/project.wrapper.ts
+++ b/apps/red-ui/src/app/state/model/dossier.wrapper.ts
@@ -1,8 +1,8 @@
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
 import * as moment from 'moment';
-import { Dictionary, Project } from '@redaction/red-ui-http';
+import { Dictionary, Dossier } from '@redaction/red-ui-http';
 
-export class ProjectWrapper {
+export class DossierWrapper {
     totalNumberOfPages?: number;
 
     hintsOnly?: boolean;
@@ -15,7 +15,7 @@ export class ProjectWrapper {
     type: Dictionary;
     dictionaryVersion?: number;
 
-    constructor(public project: Project, files: FileStatusWrapper[]) {
+    constructor(public dossier: Dossier, files: FileStatusWrapper[]) {
         this._files = files ? files : [];
         this._recomputeFileStatus();
     }
@@ -39,44 +39,44 @@ export class ProjectWrapper {
         this._recomputeFileStatus();
     }
 
-    get projectName() {
-        return this.project.projectName;
+    get dossierName() {
+        return this.dossier.dossierName;
     }
 
     get description() {
-        return this.project.description;
+        return this.dossier.description;
     }
 
-    get ruleSetId() {
-        return this.project.ruleSetId;
+    get dossierTemplateId() {
+        return this.dossier.dossierTemplateId;
     }
 
     get ownerId() {
-        return this.project.ownerId;
+        return this.dossier.ownerId;
     }
 
-    get projectId() {
-        return this.project.projectId;
+    get dossierId() {
+        return this.dossier.dossierId;
     }
 
     get memberIds() {
-        return this.project.memberIds;
+        return this.dossier.memberIds;
     }
 
     get approverIds() {
-        return this.project.approverIds;
+        return this.dossier.approverIds;
     }
 
-    get projectDate() {
-        return this.project.date;
+    get dossierDate() {
+        return this.dossier.date;
     }
 
     get numberOfMembers() {
-        return this.project.memberIds.length;
+        return this.dossier.memberIds.length;
     }
 
     get dueDate() {
-        return this.project.dueDate;
+        return this.dossier.dueDate;
     }
 
     get hasFiles() {
@@ -84,11 +84,11 @@ export class ProjectWrapper {
     }
 
     get name() {
-        return this.project.projectName;
+        return this.dossier.dossierName;
     }
 
     get memberCount() {
-        return this.project.memberIds.length;
+        return this.dossier.memberIds.length;
     }
 
     hasStatus(status: string) {
@@ -96,7 +96,7 @@ export class ProjectWrapper {
     }
 
     hasMember(key: string) {
-        return this.project.memberIds.indexOf(key) >= 0;
+        return this.dossier.memberIds.indexOf(key) >= 0;
     }
 
     dueDateMatches(key: string) {
@@ -104,7 +104,7 @@ export class ProjectWrapper {
     }
 
     addedDateMatches(key: string) {
-        return moment(this.projectDate).format('DD/MM/YYYY') === key;
+        return moment(this.dossierDate).format('DD/MM/YYYY') === key;
     }
 
     private _recomputeFileStatus() {
diff --git a/apps/red-ui/src/app/utils/file-drop-utils.ts b/apps/red-ui/src/app/utils/file-drop-utils.ts
index 7ae9d1d0b..c33916885 100644
--- a/apps/red-ui/src/app/utils/file-drop-utils.ts
+++ b/apps/red-ui/src/app/utils/file-drop-utils.ts
@@ -1,9 +1,9 @@
 import { FileUploadModel } from '@upload-download/model/file-upload.model';
-import { ProjectWrapper } from '@state/model/project.wrapper';
+import { DossierWrapper } from '@state/model/dossier.wrapper';
 
 export function handleFileDrop(
     event: DragEvent,
-    project: ProjectWrapper,
+    dossier: DossierWrapper,
     uploadFiles: (files: FileUploadModel[]) => void
 ) {
     event.preventDefault();
@@ -21,16 +21,16 @@ export function handleFileDrop(
     } else {
         files = dataTransfer.files;
         dataTransfer.clearData();
-        uploadFiles(convertFiles(files, project));
+        uploadFiles(convertFiles(files, dossier));
     }
 
-    const convertedFiles = convertFiles(files, project);
+    const convertedFiles = convertFiles(files, dossier);
     if (convertedFiles.length > 0) {
         uploadFiles(convertedFiles);
     }
 }
 
-export function convertFiles(files: FileList | File[], project: ProjectWrapper): FileUploadModel[] {
+export function convertFiles(files: FileList | File[], dossier: DossierWrapper): FileUploadModel[] {
     let uploadFiles: FileUploadModel[] = [];
     for (let i = 0; i < files.length; i++) {
         const file = files[i];
@@ -39,8 +39,8 @@ export function convertFiles(files: FileList | File[], project: ProjectWrapper):
             progress: 0,
             completed: false,
             error: null,
-            projectId: project.projectId,
-            projectName: project.projectName,
+            dossierId: dossier.dossierId,
+            dossierName: dossier.dossierName,
             sizeError: false,
             retryCount: 0,
             size: file.size
diff --git a/apps/red-ui/src/app/utils/types.d.ts b/apps/red-ui/src/app/utils/types.d.ts
index a378f82cb..5b10a4181 100644
--- a/apps/red-ui/src/app/utils/types.d.ts
+++ b/apps/red-ui/src/app/utils/types.d.ts
@@ -1,3 +1,3 @@
 import { FileStatus } from '@redaction/red-ui-http';
 
-export type Color = FileStatus.StatusEnum | ProjectStatus.StatusEnum;
+export type Color = FileStatus.StatusEnum | DossierStatus.StatusEnum;
diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json
index 7fc1370e6..be1b0670e 100644
--- a/apps/red-ui/src/assets/i18n/de.json
+++ b/apps/red-ui/src/assets/i18n/de.json
@@ -57,7 +57,7 @@
   },
   "top-bar": {
     "navigation-items": {
-      "projects": "Aktives Dossier",
+      "dossiers": "Aktives Dossier",
       "back": "Zurück",
       "my-account": {
         "children": {
@@ -81,10 +81,10 @@
     "assigned-people": "Beauftragter",
     "due-date": "Geburtstermin",
     "created-on": "Erstellt am",
-    "project": "Dossier",
+    "dossier": "Dossier",
     "document": "Dokument",
     "needs-work": "Arbeitsbelastung",
-    "rulesets": "Regelsätze"
+    "dossier-templates": "Regelsätze"
   },
   "report": {
     "unavailable": "Der Redaktionsbericht ist erst verfügbar, wenn alle Dateien genehmigt wurden.",
@@ -95,7 +95,7 @@
       "syngenta": "Mit Syngenta-Vorlage herunterladen"
     }
   },
-  "project-listing": {
+  "dossier-listing": {
     "search": "Dossiername ...",
     "reanalyse": {
       "action": "Analysieren Sie das gesamte Dossier"
@@ -113,13 +113,13 @@
       "needs-work": "Arbeitsbelastung",
       "owner": "Inhaber",
       "status": "Status",
-      "ruleset": "Regelsatz"
+      "dossier-template": "Regelsatz"
     },
     "stats": {
       "analyzed-pages": "Seiten",
       "total-people": "Benutzer insgesamt",
       "charts": {
-        "projects": "Dossiers",
+        "dossiers": "Dossiers",
         "total-documents": "Gesamtdokument (e)"
       }
     },
@@ -144,7 +144,7 @@
         "template": "Dossiervorlage"
       },
       "errors": {
-        "project-already-exists": "Dossier mit diesem Namen existiert bereits!",
+        "dossier-already-exists": "Dossier mit diesem Namen existiert bereits!",
         "generic": "Dossier konnte nicht gespeichert werden"
       },
       "actions": {
@@ -158,13 +158,13 @@
     },
     "delete": {
       "action": "Dossier löschen",
-      "delete-failed": "Fehler beim Löschen des Dossiers: {{projectName}}"
+      "delete-failed": "Fehler beim Löschen des Dossiers: {{dossierName}}"
     },
     "no-match": {
       "title": "Keine Dossiers stimmen mit Ihren aktuellen Filtern überein."
     }
   },
-  "project-details": {
+  "dossier-details": {
     "title": "Dossier Details",
     "dialog": {
       "title": "Dossier Details",
@@ -172,7 +172,7 @@
         "file-count": "Anzahl der Dateien: {{fileCount}}"
       },
       "actions": {
-        "reanalyse-project": "Analysieren Sie das Dossier"
+        "reanalyse-dossier": "Analysieren Sie das Dossier"
       }
     },
     "owner": "Inhaber",
@@ -182,7 +182,7 @@
     "expand": "Zeige Details",
     "collapse": "Details ausblenden"
   },
-  "project-overview": {
+  "dossier-overview": {
     "no-ocr": "Keine OCR",
     "ocr-performed": "Für diese Datei wurde eine OCR durchgeführt.",
     "no-data": {
@@ -212,7 +212,7 @@
     "new-rule": {
       "label": "Veraltet",
       "toast": {
-        "message-project": "Erneute Analyse erforderlich:",
+        "message-dossier": "Erneute Analyse erforderlich:",
         "actions": {
           "reanalyse-all": "Analysieren Sie alle",
           "reanalyse-file": "Analysieren Sie diese Datei",
@@ -258,9 +258,9 @@
         "file-error": "Nachbearbeitung erforderlich"
       }
     },
-    "project-details": {
+    "dossier-details": {
       "charts": {
-        "documents-in-project": "Dokumente im Dossier"
+        "documents-in-dossier": "Dokumente im Dossier"
       },
       "stats": {
         "documents": "{{count}} Dokumente",
@@ -278,7 +278,7 @@
       "reanalyse": "Dokumente analysieren",
       "reanalyse-error-outdated": "Nicht alle ausgewählten Dokumente können analysiert werden, einige sind Ihnen möglicherweise nicht zugeordnet oder bereits analysiert."
     },
-    "reanalyse-project": {
+    "reanalyse-dossier": {
       "success": "Dateien, die erneut analysiert werden sollen.",
       "error": "Dateien für die erneute Analyse konnten nicht geplant werden. Bitte versuche es erneut."
     }
@@ -305,7 +305,7 @@
         "close": "Dokumentinfo schließen",
         "edit": "Dokumentinformationen bearbeiten",
         "details": {
-          "project": "in {{projectName}}",
+          "dossier": "in {{dossierName}}",
           "pages": "{{pages}} Seiten",
           "revised-pages": "{{pages}} überarbeitete Seiten",
           "created-on": "Erstellt am: {{date}}",
@@ -446,7 +446,7 @@
       "cancel": "Stornieren"
     }
   },
-  "assign-project-owner": {
+  "assign-dossier-owner": {
     "dialog": {
       "single-user": "Inhaber",
       "multi-user": "Team überprüfen",
@@ -458,7 +458,7 @@
       "no-members": "Noch keine Mitglieder. Wählen Sie aus der Liste unten."
     }
   },
-  "project-member-guard": {
+  "dossier-member-guard": {
     "access-denied": "Sie dürfen nicht auf diese Seite zugreifen."
   },
   "comments": {
@@ -614,7 +614,7 @@
       "title": "Dokument löschen",
       "question": "Möchten Sie fortfahren?"
     },
-    "delete-project": {
+    "delete-dossier": {
       "title": "Dossier löschen",
       "question": "Möchten Sie fortfahren?"
     }
@@ -667,7 +667,7 @@
     },
     "save": "Wörterbuch speichern"
   },
-  "add-edit-project-template": {
+  "add-edit-dossier-template": {
     "title": {
       "edit": "Bearbeiten Sie die {{name}} Dossiervorlage",
       "new": "Erstellen Sie eine Dossiervorlage"
@@ -704,7 +704,7 @@
     },
     "compare": {
       "compare": "Vergleichen Sie",
-      "select-ruleset": "Wählen Sie Dossiervorlage",
+      "select-dossier-template": "Wählen Sie Dossiervorlage",
       "select-dictionary": "Wählen Sie Wörterbuch"
     },
     "select-dictionary": "Wählen Sie oben ein Wörterbuch aus, um es mit dem aktuellen zu vergleichen."
@@ -740,9 +740,9 @@
     }
   },
   "digital-signature": "Digitale Unterschrift",
-  "project-templates": "Dossiervorlagen",
+  "dossier-templates": "Dossiervorlagen",
   "settings": "die Einstellungen",
-  "project-templates-listing": {
+  "dossier-templates-listing": {
     "table-header": {
       "title": "{{length}} Dossiervorlagen"
     },
@@ -824,7 +824,7 @@
       "bulk": "Benutzer aus dem Arbeitsbereich löschen"
     },
     "warning": "Achtung: Dies kann nicht rückgängig gemacht werden!",
-    "impacted-projects": "{{projectsCount}} Dossiers sind betroffen",
+    "impacted-dossiers": "{{dossiersCount}} Dossiers sind betroffen",
     "impacted-documents": {
       "single": "Alle Dokumente, deren Überprüfung durch den Benutzer aussteht, sind betroffen",
       "bulk": "Alle Dokumente, deren Überprüfung durch die Benutzer aussteht, sind betroffen"
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index ceb03f77d..3e45174e1 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -57,7 +57,7 @@
   },
   "top-bar": {
     "navigation-items": {
-      "projects": "Active Dossier",
+      "dossiers": "Active Dossier",
       "back": "Back",
       "my-account": {
         "children": {
@@ -81,10 +81,10 @@
     "assigned-people": "Assignee(s)",
     "due-date": "Due Date",
     "created-on": "Created On",
-    "project": "Dossier",
+    "dossier": "Dossier",
     "document": "Document",
     "needs-work": "Workload",
-    "rulesets": "Rule Sets"
+    "dossier-templates": "Rule Sets"
   },
   "report": {
     "unavailable": "Redaction report is only available once all files have been approved.",
@@ -95,7 +95,7 @@
       "syngenta": "Download with Syngenta Template"
     }
   },
-  "project-listing": {
+  "dossier-listing": {
     "search": "Dossier name...",
     "reanalyse": {
       "action": "Analyze entire dossier"
@@ -113,13 +113,13 @@
       "needs-work": "Workload",
       "owner": "Owner",
       "status": "Status",
-      "ruleset": "Rule Set"
+      "dossier-template": "Rule Set"
     },
     "stats": {
       "analyzed-pages": "Pages",
       "total-people": "Total user(s)",
       "charts": {
-        "projects": "Dossiers",
+        "dossiers": "Dossiers",
         "total-documents": "Total Document(s)"
       }
     },
@@ -134,13 +134,13 @@
     },
     "delete": {
       "action": "Delete Dossier",
-      "delete-failed": "Failed to delete dossier: {{projectName}}"
+      "delete-failed": "Failed to delete dossier: {{dossierName}}"
     },
     "no-match": {
       "title": "No dossiers match your current filters."
     }
   },
-  "add-project-dialog": {
+  "add-dossier-dialog": {
     "header-new": "Create Dossier",
     "form": {
       "name": {
@@ -155,7 +155,7 @@
       "template": "Dossier Template"
     },
     "errors": {
-      "project-already-exists": "Dossier with this name already exists!",
+      "dossier-already-exists": "Dossier with this name already exists!",
       "generic": "Failed to save dossier"
     },
     "actions": {
@@ -163,8 +163,8 @@
       "save-and-add-members": "Save and Edit Team"
     }
   },
-  "edit-project-dialog": {
-    "header": "Edit {{projectName}}",
+  "edit-dossier-dialog": {
+    "header": "Edit {{dossierName}}",
     "nav-items": {
       "dossier-info": "Dossier Info",
       "general-info": "General Information",
@@ -174,7 +174,7 @@
       "dossier-dictionary": "Dossier Dictionary",
       "members": "Members",
       "team-members": "Team Members",
-      "project-attributes": "Dossier Attributes",
+      "dossier-attributes": "Dossier Attributes",
       "report-attributes": "Report Attributes"
     },
     "actions": {
@@ -199,9 +199,9 @@
       "entries": "{{length}} entries"
     },
     "unsaved-changes": "You have unsaved changes. Save or revert before changing the tab.",
-    "change-successful": "Project was updated."
+    "change-successful": "Dossier was updated."
   },
-  "project-details": {
+  "dossier-details": {
     "title": "Dossier Details",
     "dialog": {
       "title": "Dossier Details",
@@ -209,7 +209,7 @@
         "file-count": "Number of files: {{fileCount}}"
       },
       "actions": {
-        "reanalyse-project": "Analyze Dossier"
+        "reanalyse-dossier": "Analyze Dossier"
       }
     },
     "owner": "Owner",
@@ -224,7 +224,7 @@
     "save-changes": "Save Changes",
     "cancel": "cancel"
   },
-  "project-overview": {
+  "dossier-overview": {
     "no-ocr": "No OCR",
     "ocr-performed": "OCR was performed for this file.",
     "no-data": {
@@ -254,7 +254,7 @@
     "new-rule": {
       "label": "Outdated",
       "toast": {
-        "message-project": "Reanalysis required: ",
+        "message-dossier": "Reanalysis required: ",
         "actions": {
           "reanalyse-all": "Analyze all",
           "reanalyse-file": "Analyze this file",
@@ -301,9 +301,9 @@
         "file-error": "Re-processing required"
       }
     },
-    "project-details": {
+    "dossier-details": {
       "charts": {
-        "documents-in-project": "Documents in Dossier"
+        "documents-in-dossier": "Documents in Dossier"
       },
       "stats": {
         "documents": "{{count}} documents",
@@ -322,7 +322,7 @@
       "reanalyse": "Analyze Documents",
       "reanalyse-error-outdated": "Not all selected documents can be analyzed, some may not be assigned to you or are already analyzed."
     },
-    "reanalyse-project": {
+    "reanalyse-dossier": {
       "success": "Files scheduled for reanalysis.",
       "error": "Failed to schedule files for reanalysis. Please try again."
     }
@@ -349,7 +349,7 @@
         "close": "Close Document Info",
         "edit": "Edit Document Info",
         "details": {
-          "project": "in {{projectName}}",
+          "dossier": "in {{dossierName}}",
           "pages": "{{pages}} pages",
           "revised-pages": "{{pages}} revised pages",
           "created-on": "Created on: {{date}}",
@@ -483,7 +483,7 @@
       "cancel": "Cancel"
     }
   },
-  "assign-project-owner": {
+  "assign-dossier-owner": {
     "dialog": {
       "single-user": "Owner",
       "multi-user": "Review Team",
@@ -498,7 +498,7 @@
       "make-approver": "Make Approver"
     }
   },
-  "project-member-guard": {
+  "dossier-member-guard": {
     "access-denied": "You are not allowed to access that page."
   },
   "comments": {
@@ -655,7 +655,7 @@
       "title": "Delete Document",
       "question": "Do you wish to proceed?"
     },
-    "delete-project": {
+    "delete-dossier": {
       "title": "Delete Dossier",
       "question": "Do you wish to proceed?"
     }
@@ -708,7 +708,7 @@
     },
     "save": "Save Dictionary"
   },
-  "add-edit-project-template": {
+  "add-edit-dossier-template": {
     "title": {
       "edit": "Edit {{name}} Dossier Template",
       "new": "Create Dossier Template"
@@ -745,7 +745,7 @@
     },
     "compare": {
       "compare": "Compare",
-      "select-ruleset": "Select Dossier Template",
+      "select-dossier-template": "Select Dossier Template",
       "select-dictionary": "Select Dictionary"
     },
     "select-dictionary": "Select a dictionary above to compare with the current one."
@@ -781,9 +781,9 @@
     }
   },
   "digital-signature": "Digital Signature",
-  "project-templates": "Dossier Templates",
+  "dossier-templates": "Dossier Templates",
   "settings": "Settings",
-  "project-templates-listing": {
+  "dossier-templates-listing": {
     "table-header": {
       "title": "{{length}} dossier templates"
     },
@@ -865,7 +865,7 @@
       "bulk": "Delete Users from Workspace"
     },
     "warning": "Warning: this cannot be undone!",
-    "impacted-projects": "{{projectsCount}} dossiers will be impacted",
+    "impacted-dossiers": "{{dossiersCount}} dossiers will be impacted",
     "impacted-documents": {
       "single": "All documents pending review from the user will be impacted",
       "bulk": "All documents pending review from the users will be impacted"
diff --git a/apps/red-ui/src/assets/icons/general/collapse.svg b/apps/red-ui/src/assets/icons/general/collapse.svg
index 8f1206247..665f68230 100644
--- a/apps/red-ui/src/assets/icons/general/collapse.svg
+++ b/apps/red-ui/src/assets/icons/general/collapse.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg height="14px" version="1.1" viewBox="0 0 14 14" width="14px" xmlns="http://www.w3.org/2000/svg">
-    <g fill="none" fill-rule="evenodd" id="Projects-&amp;-Documents" stroke="none" stroke-width="1">
+    <g fill="none" fill-rule="evenodd" id="Dossiers-&amp;-Documents" stroke="none" stroke-width="1">
         <g id="04.-Document-Hover" transform="translate(-1400.000000, -137.000000)">
             <rect height="980" width="1440" x="0" y="0"></rect>
-            <g fill="currentColor" fill-rule="nonzero" id="Project-details"
+            <g fill="currentColor" fill-rule="nonzero" id="Dossier-details"
                transform="translate(1111.000000, 127.000000)">
                 <g id="Group-6" transform="translate(279.000000, 0.000000)">
                     <g id="status" transform="translate(10.000000, 10.000000)">
diff --git a/apps/red-ui/src/assets/icons/general/expand.svg b/apps/red-ui/src/assets/icons/general/expand.svg
index 3e4a290ba..175e4e887 100644
--- a/apps/red-ui/src/assets/icons/general/expand.svg
+++ b/apps/red-ui/src/assets/icons/general/expand.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg height="14px" version="1.1" viewBox="0 0 14 14" width="14px" xmlns="http://www.w3.org/2000/svg">
-    <g fill="none" fill-rule="evenodd" id="Projects-&amp;-Documents" stroke="none" stroke-width="1">
+    <g fill="none" fill-rule="evenodd" id="Dossiers-&amp;-Documents" stroke="none" stroke-width="1">
         <g id="04.-Collapsed-Details" transform="translate(-1403.000000, -137.000000)">
             <rect height="980" width="1440" x="0" y="0"></rect>
             <rect height="1500" id="Rectangle" width="60" x="1380" y="111"></rect>
diff --git a/apps/red-ui/src/assets/icons/general/notification.svg b/apps/red-ui/src/assets/icons/general/notification.svg
index 1c225a25e..393962973 100644
--- a/apps/red-ui/src/assets/icons/general/notification.svg
+++ b/apps/red-ui/src/assets/icons/general/notification.svg
@@ -3,7 +3,7 @@
     <g fill="none" fill-rule="evenodd" id="Notifications" stroke="none" stroke-width="1">
         <g id="01.-Notifications-Dropdown" transform="translate(-1258.000000, -23.000000)">
             <rect height="980" width="1440" x="0" y="0"></rect>
-            <g id="Header-Project-Details">
+            <g id="Header-Dossier-Details">
                 <rect height="60" id="Rectangle" width="1440" x="0" y="0"></rect>
                 <g id="Group-6" transform="translate(1248.000000, 13.000000)">
                     <g fill="currentColor" fill-rule="nonzero" id="status" transform="translate(10.000000, 10.000000)">
diff --git a/apps/red-ui/src/assets/icons/general/status-collapse.svg b/apps/red-ui/src/assets/icons/general/status-collapse.svg
index b651808e9..5397c078d 100644
--- a/apps/red-ui/src/assets/icons/general/status-collapse.svg
+++ b/apps/red-ui/src/assets/icons/general/status-collapse.svg
@@ -17,7 +17,7 @@
     <g fill="none" fill-rule="evenodd" id="File-Upload-&amp;-Download-Overlays" stroke="none" stroke-width="1">
         <g id="Document-Upload---Hover" transform="translate(-1360.000000, -592.000000)">
             <rect height="900" width="1440" x="0" y="0"></rect>
-            <g id="Project-details" transform="translate(1111.000000, 127.000000)">
+            <g id="Dossier-details" transform="translate(1111.000000, 127.000000)">
                 <g id="Group-4" transform="translate(0.000000, 145.000000)"></g>
             </g>
             <g id="Rectangle">
diff --git a/apps/red-ui/src/assets/icons/general/status-expand.svg b/apps/red-ui/src/assets/icons/general/status-expand.svg
index 836b07412..547100d52 100644
--- a/apps/red-ui/src/assets/icons/general/status-expand.svg
+++ b/apps/red-ui/src/assets/icons/general/status-expand.svg
@@ -18,7 +18,7 @@
         <g id="Document-Upload---Collapsed" transform="translate(-1359.000000, -847.000000)">
             <rect height="900" width="1440" x="0" y="0"></rect>
             <g fill="currentColor" font-family="Inter-Regular, Inter" font-size="16"
-               font-weight="normal" id="Project-details" transform="translate(1111.000000, 127.000000)">
+               font-weight="normal" id="Dossier-details" transform="translate(1111.000000, 127.000000)">
                 <g id="Group-4" transform="translate(0.000000, 145.000000)">
                     <g id="Group-11" transform="translate(0.000000, 566.000000)">
                         <text id="Description">
diff --git a/libs/red-ui-http/src/lib/api.module.ts b/libs/red-ui-http/src/lib/api.module.ts
index 5ac590105..7e7fa6e10 100644
--- a/libs/red-ui-http/src/lib/api.module.ts
+++ b/libs/red-ui-http/src/lib/api.module.ts
@@ -7,7 +7,7 @@ import { DictionaryControllerService } from './api/dictionaryController.service'
 import { FileManagementControllerService } from './api/fileManagementController.service';
 import { LicenseReportControllerService } from './api/licenseReportController.service';
 import { ManualRedactionControllerService } from './api/manualRedactionController.service';
-import { ProjectControllerService } from './api/projectController.service';
+import { DossierControllerService } from './api/dossierController.service';
 import { ReanalysisControllerService } from './api/reanalysisController.service';
 import { RedactionLogControllerService } from './api/redactionLogController.service';
 import { RulesControllerService } from './api/rulesController.service';
@@ -17,7 +17,7 @@ import { VersionsControllerService } from './api/versionsController.service';
 import { ViewedPagesControllerService } from './api/viewedPagesController.service';
 import { LegalBasisMappingControllerService } from './api/legalBasisMappingController.service';
 import { WatermarkControllerService } from './api/watermarkController.service';
-import { RuleSetControllerService } from './api/ruleSetController.service';
+import { DossierTemplateControllerService } from './api/dossierTemplateController.service';
 import { DownloadControllerService } from './api/downloadController.service';
 import { DigitalSignatureControllerService } from './api/digitalSignatureController.service';
 import { AuditControllerService } from './api/auditController.service';
@@ -35,10 +35,10 @@ import { SmtpConfigurationControllerService } from './api/smtpConfigurationContr
         FileManagementControllerService,
         LicenseReportControllerService,
         ManualRedactionControllerService,
-        ProjectControllerService,
+        DossierControllerService,
         ReanalysisControllerService,
         RedactionLogControllerService,
-        RuleSetControllerService,
+        DossierTemplateControllerService,
         RulesControllerService,
         UserControllerService,
         StatusControllerService,
@@ -58,11 +58,16 @@ export class ApiModule {
             throw new Error('ApiModule is already loaded. Import in your base AppModule only.');
         }
         if (!http) {
-            throw new Error('You need to import the HttpClientModule in your AppModule! \n' + 'See also https://github.com/angular/angular/issues/20575');
+            throw new Error(
+                'You need to import the HttpClientModule in your AppModule! \n' +
+                    'See also https://github.com/angular/angular/issues/20575'
+            );
         }
     }
 
-    public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders<ApiModule> {
+    public static forRoot(
+        configurationFactory: () => Configuration
+    ): ModuleWithProviders<ApiModule> {
         return {
             ngModule: ApiModule,
             providers: [{ provide: Configuration, useFactory: configurationFactory }]
diff --git a/libs/red-ui-http/src/lib/api/api.ts b/libs/red-ui-http/src/lib/api/api.ts
index 060df6694..4de4d1f90 100644
--- a/libs/red-ui-http/src/lib/api/api.ts
+++ b/libs/red-ui-http/src/lib/api/api.ts
@@ -6,10 +6,10 @@ import { InfoControllerService } from './infoController.service';
 import { LegalBasisMappingControllerService } from './legalBasisMappingController.service';
 import { LicenseReportControllerService } from './licenseReportController.service';
 import { ManualRedactionControllerService } from './manualRedactionController.service';
-import { ProjectControllerService } from './projectController.service';
+import { DossierControllerService } from './dossierController.service';
 import { ReanalysisControllerService } from './reanalysisController.service';
 import { RedactionLogControllerService } from './redactionLogController.service';
-import { RuleSetControllerService } from './ruleSetController.service';
+import { DossierTemplateControllerService } from './dossierTemplateController.service';
 import { RulesControllerService } from './rulesController.service';
 import { StatusControllerService } from './statusController.service';
 import { UserControllerService } from './userController.service';
@@ -36,13 +36,13 @@ export * from './licenseReportController.service';
 
 export * from './manualRedactionController.service';
 
-export * from './projectController.service';
+export * from './dossierController.service';
 
 export * from './reanalysisController.service';
 
 export * from './redactionLogController.service';
 
-export * from './ruleSetController.service';
+export * from './dossierTemplateController.service';
 
 export * from './rulesController.service';
 
@@ -77,10 +77,10 @@ export const APIS = [
     LegalBasisMappingControllerService,
     LicenseReportControllerService,
     ManualRedactionControllerService,
-    ProjectControllerService,
+    DossierControllerService,
     ReanalysisControllerService,
     RedactionLogControllerService,
-    RuleSetControllerService,
+    DossierTemplateControllerService,
     RulesControllerService,
     StatusControllerService,
     UserControllerService,
diff --git a/libs/red-ui-http/src/lib/api/dictionaryController.service.ts b/libs/red-ui-http/src/lib/api/dictionaryController.service.ts
index 8791c682d..2933cc35d 100644
--- a/libs/red-ui-http/src/lib/api/dictionaryController.service.ts
+++ b/libs/red-ui-http/src/lib/api/dictionaryController.service.ts
@@ -31,7 +31,11 @@ export class DictionaryControllerService {
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
-    constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+    constructor(
+        protected httpClient: HttpClient,
+        @Optional() @Inject(BASE_PATH) basePath: string,
+        @Optional() configuration: Configuration
+    ) {
         if (basePath) {
             this.basePath = basePath;
         }
@@ -59,7 +63,7 @@ export class DictionaryControllerService {
      * Add dictionary entries with entry type.
      * None
      * @param body entries
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param type type
      * @param dossierId dossierId
      * @param removeCurrent removeCurrent
@@ -68,7 +72,7 @@ export class DictionaryControllerService {
      */
     public addEntry(
         body: Array<string>,
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         removeCurrent?: boolean,
@@ -77,7 +81,7 @@ export class DictionaryControllerService {
     ): Observable<any>;
     public addEntry(
         body: Array<string>,
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         removeCurrent?: boolean,
@@ -86,7 +90,7 @@ export class DictionaryControllerService {
     ): Observable<HttpResponse<any>>;
     public addEntry(
         body: Array<string>,
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         removeCurrent?: boolean,
@@ -95,7 +99,7 @@ export class DictionaryControllerService {
     ): Observable<HttpEvent<any>>;
     public addEntry(
         body: Array<string>,
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         removeCurrent?: boolean,
@@ -106,8 +110,10 @@ export class DictionaryControllerService {
             throw new Error('Required parameter body was null or undefined when calling addEntry.');
         }
 
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling addEntry.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling addEntry.'
+            );
         }
 
         if (type === null || type === undefined) {
@@ -126,27 +132,34 @@ export class DictionaryControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/dictionary/${encodeURIComponent(String(type))}/${encodeURIComponent(String(ruleSetId))}`,
+            `${this.basePath}/dictionary/${encodeURIComponent(String(type))}/${encodeURIComponent(
+                String(dossierTemplateId)
+            )}`,
             {
                 body: body,
                 params: queryParameters,
@@ -166,10 +179,30 @@ export class DictionaryControllerService {
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public addType(body: TypeValue, dossierId?: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public addType(body: TypeValue, dossierId?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public addType(body: TypeValue, dossierId?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public addType(body: TypeValue, dossierId?: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public addType(
+        body: TypeValue,
+        dossierId?: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+    public addType(
+        body: TypeValue,
+        dossierId?: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
+    public addType(
+        body: TypeValue,
+        dossierId?: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
+    public addType(
+        body: TypeValue,
+        dossierId?: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
             throw new Error('Required parameter body was null or undefined when calling addType.');
         }
@@ -183,20 +216,25 @@ export class DictionaryControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
@@ -215,16 +253,23 @@ export class DictionaryControllerService {
      * Delete dictionary entries with entry type.
      * None
      * @param body entries
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param type type
      * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public deleteEntries(body: Array<string>, ruleSetId: string, type: string, dossierId?: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
     public deleteEntries(
         body: Array<string>,
-        ruleSetId: string,
+        dossierTemplateId: string,
+        type: string,
+        dossierId?: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+    public deleteEntries(
+        body: Array<string>,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe?: 'response',
@@ -232,7 +277,7 @@ export class DictionaryControllerService {
     ): Observable<HttpResponse<any>>;
     public deleteEntries(
         body: Array<string>,
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe?: 'events',
@@ -240,22 +285,28 @@ export class DictionaryControllerService {
     ): Observable<HttpEvent<any>>;
     public deleteEntries(
         body: Array<string>,
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling deleteEntries.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling deleteEntries.'
+            );
         }
 
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling deleteEntries.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling deleteEntries.'
+            );
         }
 
         if (type === null || type === undefined) {
-            throw new Error('Required parameter type was null or undefined when calling deleteEntries.');
+            throw new Error(
+                'Required parameter type was null or undefined when calling deleteEntries.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -267,27 +318,34 @@ export class DictionaryControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/dictionary/delete/${encodeURIComponent(String(type))}/${encodeURIComponent(String(ruleSetId))}`,
+            `${this.basePath}/dictionary/delete/${encodeURIComponent(
+                String(type)
+            )}/${encodeURIComponent(String(dossierTemplateId))}`,
             {
                 body: body,
                 params: queryParameters,
@@ -303,16 +361,23 @@ export class DictionaryControllerService {
      * Delete dictionary entry with entry type.
      * None
      * @param entry entry
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param type type
      * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public deleteEntry(entry: string, ruleSetId: string, type: string, dossierId?: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
     public deleteEntry(
         entry: string,
-        ruleSetId: string,
+        dossierTemplateId: string,
+        type: string,
+        dossierId?: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+    public deleteEntry(
+        entry: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe?: 'response',
@@ -320,7 +385,7 @@ export class DictionaryControllerService {
     ): Observable<HttpResponse<any>>;
     public deleteEntry(
         entry: string,
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe?: 'events',
@@ -328,22 +393,28 @@ export class DictionaryControllerService {
     ): Observable<HttpEvent<any>>;
     public deleteEntry(
         entry: string,
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (entry === null || entry === undefined) {
-            throw new Error('Required parameter entry was null or undefined when calling deleteEntry.');
+            throw new Error(
+                'Required parameter entry was null or undefined when calling deleteEntry.'
+            );
         }
 
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling deleteEntry.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling deleteEntry.'
+            );
         }
 
         if (type === null || type === undefined) {
-            throw new Error('Required parameter type was null or undefined when calling deleteEntry.');
+            throw new Error(
+                'Required parameter type was null or undefined when calling deleteEntry.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -355,20 +426,26 @@ export class DictionaryControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         return this.httpClient.request<any>(
             'delete',
-            `${this.basePath}/dictionary/${encodeURIComponent(String(type))}/${encodeURIComponent(String(ruleSetId))}/${encodeURIComponent(String(entry))}`,
+            `${this.basePath}/dictionary/${encodeURIComponent(String(type))}/${encodeURIComponent(
+                String(dossierTemplateId)
+            )}/${encodeURIComponent(String(entry))}`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -382,22 +459,50 @@ export class DictionaryControllerService {
     /**
      * Deletes entry type
      * None
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param type type
      * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public deleteType(ruleSetId: string, type: string, dossierId?: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public deleteType(ruleSetId: string, type: string, dossierId?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public deleteType(ruleSetId: string, type: string, dossierId?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public deleteType(ruleSetId: string, type: string, dossierId?: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling deleteType.');
+    public deleteType(
+        dossierTemplateId: string,
+        type: string,
+        dossierId?: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+    public deleteType(
+        dossierTemplateId: string,
+        type: string,
+        dossierId?: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
+    public deleteType(
+        dossierTemplateId: string,
+        type: string,
+        dossierId?: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
+    public deleteType(
+        dossierTemplateId: string,
+        type: string,
+        dossierId?: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling deleteType.'
+            );
         }
 
         if (type === null || type === undefined) {
-            throw new Error('Required parameter type was null or undefined when calling deleteType.');
+            throw new Error(
+                'Required parameter type was null or undefined when calling deleteType.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -409,20 +514,26 @@ export class DictionaryControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         return this.httpClient.request<any>(
             'delete',
-            `${this.basePath}/dictionary/type/${encodeURIComponent(String(type))}/${encodeURIComponent(String(ruleSetId))}`,
+            `${this.basePath}/dictionary/type/${encodeURIComponent(
+                String(type)
+            )}/${encodeURIComponent(String(dossierTemplateId))}`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -436,40 +547,50 @@ export class DictionaryControllerService {
     /**
      * Returns file containing the the dictionary entries for given type..
      *
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param type type
      * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public downloadDictionaryFile(ruleSetId: string, type: string, dossierId?: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
     public downloadDictionaryFile(
-        ruleSetId: string,
+        dossierTemplateId: string,
+        type: string,
+        dossierId?: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+    public downloadDictionaryFile(
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
     public downloadDictionaryFile(
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
     public downloadDictionaryFile(
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling downloadDictionaryFile.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling downloadDictionaryFile.'
+            );
         }
 
         if (type === null || type === undefined) {
-            throw new Error('Required parameter type was null or undefined when calling downloadDictionaryFile.');
+            throw new Error(
+                'Required parameter type was null or undefined when calling downloadDictionaryFile.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -481,20 +602,26 @@ export class DictionaryControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         return this.httpClient.request<any>(
             'get',
-            `${this.basePath}/dictionary/download/${encodeURIComponent(String(type))}/${encodeURIComponent(String(ruleSetId))}`,
+            `${this.basePath}/dictionary/download/${encodeURIComponent(
+                String(type)
+            )}/${encodeURIComponent(String(dossierTemplateId))}`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -508,17 +635,39 @@ export class DictionaryControllerService {
     /**
      * Retrieve all entry types
      * None
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getAllTypes(ruleSetId: string, dossierId?: string, observe?: 'body', reportProgress?: boolean): Observable<TypeResponse>;
-    public getAllTypes(ruleSetId: string, dossierId?: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<TypeResponse>>;
-    public getAllTypes(ruleSetId: string, dossierId?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<TypeResponse>>;
-    public getAllTypes(ruleSetId: string, dossierId?: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling getAllTypes.');
+    public getAllTypes(
+        dossierTemplateId: string,
+        dossierId?: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<TypeResponse>;
+    public getAllTypes(
+        dossierTemplateId: string,
+        dossierId?: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<TypeResponse>>;
+    public getAllTypes(
+        dossierTemplateId: string,
+        dossierId?: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<TypeResponse>>;
+    public getAllTypes(
+        dossierTemplateId: string,
+        dossierId?: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling getAllTypes.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -530,95 +679,145 @@ export class DictionaryControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
-        return this.httpClient.request<TypeResponse>('get', `${this.basePath}/dictionary/type/${encodeURIComponent(String(ruleSetId))}`, {
-            params: queryParameters,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<TypeResponse>(
+            'get',
+            `${this.basePath}/dictionary/type/${encodeURIComponent(String(dossierTemplateId))}`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Retrieves system colors for redaction.
      * None
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getColors(ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<Colors>;
-    public getColors(ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Colors>>;
-    public getColors(ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Colors>>;
-    public getColors(ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling getColors.');
+    public getColors(
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<Colors>;
+    public getColors(
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<Colors>>;
+    public getColors(
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<Colors>>;
+    public getColors(
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling getColors.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
-        return this.httpClient.request<Colors>('get', `${this.basePath}/color/${encodeURIComponent(String(ruleSetId))}`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<Colors>(
+            'get',
+            `${this.basePath}/color/${encodeURIComponent(String(dossierTemplateId))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Retrieves all dictionary entries of an entry type
      * None
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param type type
      * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getDictionaryForType(ruleSetId: string, type: string, dossierId?: string, observe?: 'body', reportProgress?: boolean): Observable<Dictionary>;
     public getDictionaryForType(
-        ruleSetId: string,
+        dossierTemplateId: string,
+        type: string,
+        dossierId?: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<Dictionary>;
+    public getDictionaryForType(
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<Dictionary>>;
     public getDictionaryForType(
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<Dictionary>>;
-    public getDictionaryForType(ruleSetId: string, type: string, dossierId?: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling getDictionaryForType.');
+    public getDictionaryForType(
+        dossierTemplateId: string,
+        type: string,
+        dossierId?: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling getDictionaryForType.'
+            );
         }
 
         if (type === null || type === undefined) {
-            throw new Error('Required parameter type was null or undefined when calling getDictionaryForType.');
+            throw new Error(
+                'Required parameter type was null or undefined when calling getDictionaryForType.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -630,20 +829,26 @@ export class DictionaryControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         return this.httpClient.request<Dictionary>(
             'get',
-            `${this.basePath}/dictionary/${encodeURIComponent(String(type))}/${encodeURIComponent(String(ruleSetId))}`,
+            `${this.basePath}/dictionary/${encodeURIComponent(String(type))}/${encodeURIComponent(
+                String(dossierTemplateId)
+            )}`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -658,67 +863,107 @@ export class DictionaryControllerService {
      * Set system colors for redaction
      *
      * @param body colors
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public setColors(body: Colors, ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public setColors(body: Colors, ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public setColors(body: Colors, ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public setColors(body: Colors, ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public setColors(
+        body: Colors,
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+    public setColors(
+        body: Colors,
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
+    public setColors(
+        body: Colors,
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
+    public setColors(
+        body: Colors,
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling setColors.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling setColors.'
+            );
         }
 
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling setColors.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling setColors.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('post', `${this.basePath}/color/${encodeURIComponent(String(ruleSetId))}`, {
-            body: body,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<any>(
+            'post',
+            `${this.basePath}/color/${encodeURIComponent(String(dossierTemplateId))}`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Updates colors, hint and caseInsensitive of an entry type.
      * None
      * @param body typeValue
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param type type
      * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public updateType(body: UpdateTypeValue, ruleSetId: string, type: string, dossierId?: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
     public updateType(
         body: UpdateTypeValue,
-        ruleSetId: string,
+        dossierTemplateId: string,
+        type: string,
+        dossierId?: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+    public updateType(
+        body: UpdateTypeValue,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe?: 'response',
@@ -726,7 +971,7 @@ export class DictionaryControllerService {
     ): Observable<HttpResponse<any>>;
     public updateType(
         body: UpdateTypeValue,
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe?: 'events',
@@ -734,22 +979,28 @@ export class DictionaryControllerService {
     ): Observable<HttpEvent<any>>;
     public updateType(
         body: UpdateTypeValue,
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         dossierId?: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling updateType.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling updateType.'
+            );
         }
 
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling updateType.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling updateType.'
+            );
         }
 
         if (type === null || type === undefined) {
-            throw new Error('Required parameter type was null or undefined when calling updateType.');
+            throw new Error(
+                'Required parameter type was null or undefined when calling updateType.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -761,27 +1012,34 @@ export class DictionaryControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/dictionary/type/${encodeURIComponent(String(type))}/${encodeURIComponent(String(ruleSetId))}`,
+            `${this.basePath}/dictionary/type/${encodeURIComponent(
+                String(type)
+            )}/${encodeURIComponent(String(dossierTemplateId))}`,
             {
                 body: body,
                 params: queryParameters,
@@ -796,7 +1054,7 @@ export class DictionaryControllerService {
     /**
      * Upload a text-file with 1 entry per line and add each line as an entry to a dictionary for a specific type
      *
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param type type
      * @param file
      * @param dossierId
@@ -804,7 +1062,7 @@ export class DictionaryControllerService {
      * @param reportProgress flag to report request and response progress.
      */
     public uploadDictionaryFileForm(
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         file?: Blob,
         dossierId?: string,
@@ -812,7 +1070,7 @@ export class DictionaryControllerService {
         reportProgress?: boolean
     ): Observable<any>;
     public uploadDictionaryFileForm(
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         file?: Blob,
         dossierId?: string,
@@ -820,7 +1078,7 @@ export class DictionaryControllerService {
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
     public uploadDictionaryFileForm(
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         file?: Blob,
         dossierId?: string,
@@ -828,32 +1086,40 @@ export class DictionaryControllerService {
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
     public uploadDictionaryFileForm(
-        ruleSetId: string,
+        dossierTemplateId: string,
         type: string,
         file?: Blob,
         dossierId?: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling uploadDictionaryFile.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling uploadDictionaryFile.'
+            );
         }
 
         if (type === null || type === undefined) {
-            throw new Error('Required parameter type was null or undefined when calling uploadDictionaryFile.');
+            throw new Error(
+                'Required parameter type was null or undefined when calling uploadDictionaryFile.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -884,7 +1150,9 @@ export class DictionaryControllerService {
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/dictionary/upload/${encodeURIComponent(String(type))}/${encodeURIComponent(String(ruleSetId))}`,
+            `${this.basePath}/dictionary/upload/${encodeURIComponent(
+                String(type)
+            )}/${encodeURIComponent(String(dossierTemplateId))}`,
             {
                 body: convertFormParamsToString ? formParams.toString() : formParams,
                 withCredentials: this.configuration.withCredentials,
diff --git a/libs/red-ui-http/src/lib/api/dossierController.service.ts b/libs/red-ui-http/src/lib/api/dossierController.service.ts
new file mode 100644
index 000000000..9fdb7f5ec
--- /dev/null
+++ b/libs/red-ui-http/src/lib/api/dossierController.service.ts
@@ -0,0 +1,318 @@
+/**
+ * API Documentation for Redaction Gateway
+ * Description for redaction
+ *
+ * OpenAPI spec version: 1.0
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */ /* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/member-ordering */
+
+import { Inject, Injectable, Optional } from '@angular/core';
+import { HttpClient, HttpEvent, HttpHeaders, HttpResponse } from '@angular/common/http';
+
+import { Observable } from 'rxjs';
+
+import { Dossier } from '../model/dossier';
+import { DossierRequest } from '../model/dossierRequest';
+
+import { BASE_PATH } from '../variables';
+import { Configuration } from '../configuration';
+
+@Injectable()
+export class DossierControllerService {
+    public defaultHeaders = new HttpHeaders();
+    public configuration = new Configuration();
+    protected basePath = '';
+
+    constructor(
+        protected httpClient: HttpClient,
+        @Optional() @Inject(BASE_PATH) basePath: string,
+        @Optional() configuration: Configuration
+    ) {
+        if (basePath) {
+            this.basePath = basePath;
+        }
+        if (configuration) {
+            this.configuration = configuration;
+            this.basePath = basePath || configuration.basePath || this.basePath;
+        }
+    }
+
+    /**
+     * Creates or updates a dossier.
+     * None
+     * @param body dossier
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public createOrUpdateDossier(
+        body: DossierRequest,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<Dossier>;
+
+    public createOrUpdateDossier(
+        body: DossierRequest,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<Dossier>>;
+
+    public createOrUpdateDossier(
+        body: DossierRequest,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<Dossier>>;
+
+    public createOrUpdateDossier(
+        body: DossierRequest,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (body === null || body === undefined) {
+            throw new Error(
+                'Required parameter body was null or undefined when calling createOrUpdateDossier.'
+            );
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (RED-OAUTH) required
+        if (this.configuration.accessToken) {
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
+        // to determine the Accept header
+        const httpHeaderAccepts: string[] = ['application/json'];
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected !== undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = ['application/json'];
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected !== undefined) {
+            headers = headers.set('Content-Type', httpContentTypeSelected);
+        }
+
+        return this.httpClient.request<Dossier>('post', `${this.basePath}/dossier`, {
+            body: body,
+            withCredentials: this.configuration.withCredentials,
+            headers: headers,
+            observe: observe,
+            reportProgress: reportProgress
+        });
+    }
+
+    /**
+     * Deletes an existing dossier.
+     * None
+     * @param dossierId dossierId
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public deleteDossier(
+        dossierId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+
+    public deleteDossier(
+        dossierId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
+
+    public deleteDossier(
+        dossierId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
+
+    public deleteDossier(
+        dossierId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling deleteDossier.'
+            );
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (RED-OAUTH) required
+        if (this.configuration.accessToken) {
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
+        // to determine the Accept header
+        const httpHeaderAccepts: string[] = [];
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected !== undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [];
+
+        return this.httpClient.request<any>(
+            'delete',
+            `${this.basePath}/dossier/${encodeURIComponent(String(dossierId))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * Gets an existing dossier.
+     * None
+     * @param dossierId dossierId
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getDossier(
+        dossierId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<Dossier>;
+
+    public getDossier(
+        dossierId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<Dossier>>;
+
+    public getDossier(
+        dossierId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<Dossier>>;
+
+    public getDossier(
+        dossierId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling getDossier.'
+            );
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (RED-OAUTH) required
+        if (this.configuration.accessToken) {
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
+        // to determine the Accept header
+        const httpHeaderAccepts: string[] = ['application/json'];
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected !== undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [];
+
+        return this.httpClient.request<Dossier>(
+            'get',
+            `${this.basePath}/dossier/${encodeURIComponent(String(dossierId))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * Gets all existing dossiers.
+     * None
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getDossiers(observe?: 'body', reportProgress?: boolean): Observable<Array<Dossier>>;
+
+    public getDossiers(
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<Array<Dossier>>>;
+
+    public getDossiers(
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<Array<Dossier>>>;
+
+    public getDossiers(observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+        let headers = this.defaultHeaders;
+
+        // authentication (RED-OAUTH) required
+        if (this.configuration.accessToken) {
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
+        // to determine the Accept header
+        const httpHeaderAccepts: string[] = ['application/json'];
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected !== undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [];
+
+        return this.httpClient.request<Array<Dossier>>('get', `${this.basePath}/dossier`, {
+            withCredentials: this.configuration.withCredentials,
+            headers: headers,
+            observe: observe,
+            reportProgress: reportProgress
+        });
+    }
+
+    /**
+     * @param consumes string[] mime-types
+     * @return true: consumes contains 'multipart/form-data', false: otherwise
+     */
+    private canConsumeForm(consumes: string[]): boolean {
+        const form = 'multipart/form-data';
+        for (const consume of consumes) {
+            if (form === consume) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/libs/red-ui-http/src/lib/api/dossierTemplateController.service.ts b/libs/red-ui-http/src/lib/api/dossierTemplateController.service.ts
new file mode 100644
index 000000000..1776bb8f1
--- /dev/null
+++ b/libs/red-ui-http/src/lib/api/dossierTemplateController.service.ts
@@ -0,0 +1,327 @@
+/**
+ * API Documentation for Redaction Gateway
+ * Description for redaction
+ *
+ * OpenAPI spec version: 1.0
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */ /* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/member-ordering */
+
+import { Inject, Injectable, Optional } from '@angular/core';
+import { HttpClient, HttpEvent, HttpHeaders, HttpResponse } from '@angular/common/http';
+
+import { Observable } from 'rxjs';
+
+import { DossierTemplateModel } from '../model/dossierTemplateModel';
+
+import { BASE_PATH } from '../variables';
+import { Configuration } from '../configuration';
+
+@Injectable()
+export class DossierTemplateControllerService {
+    public defaultHeaders = new HttpHeaders();
+    public configuration = new Configuration();
+    protected basePath = '';
+
+    constructor(
+        protected httpClient: HttpClient,
+        @Optional() @Inject(BASE_PATH) basePath: string,
+        @Optional() configuration: Configuration
+    ) {
+        if (basePath) {
+            this.basePath = basePath;
+        }
+        if (configuration) {
+            this.configuration = configuration;
+            this.basePath = basePath || configuration.basePath || this.basePath;
+        }
+    }
+
+    /**
+     * Creates a new DossierTemplates or updates an existing one.
+     * None
+     * @param body dossierTemplateModel
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public createOrUpdateDossierTemplate(
+        body: DossierTemplateModel,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<DossierTemplateModel>;
+
+    public createOrUpdateDossierTemplate(
+        body: DossierTemplateModel,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<DossierTemplateModel>>;
+
+    public createOrUpdateDossierTemplate(
+        body: DossierTemplateModel,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<DossierTemplateModel>>;
+
+    public createOrUpdateDossierTemplate(
+        body: DossierTemplateModel,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (body === null || body === undefined) {
+            throw new Error(
+                'Required parameter body was null or undefined when calling createOrUpdateDossierTemplate.'
+            );
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (RED-OAUTH) required
+        if (this.configuration.accessToken) {
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
+        // to determine the Accept header
+        const httpHeaderAccepts: string[] = ['*/*'];
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected !== undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = ['application/json'];
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected !== undefined) {
+            headers = headers.set('Content-Type', httpContentTypeSelected);
+        }
+
+        return this.httpClient.request<DossierTemplateModel>('post', `${this.basePath}/rule-set`, {
+            body: body,
+            withCredentials: this.configuration.withCredentials,
+            headers: headers,
+            observe: observe,
+            reportProgress: reportProgress
+        });
+    }
+
+    /**
+     * Get a specific DossierTemplate by its ID
+     * None
+     * @param dossierTemplateId dossierTemplateId
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getAllDossierTemplates(
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+
+    public getAllDossierTemplates(
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
+
+    public getAllDossierTemplates(
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
+
+    public getAllDossierTemplates(
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling getAllDossierTemplates.'
+            );
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (RED-OAUTH) required
+        if (this.configuration.accessToken) {
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
+        // to determine the Accept header
+        const httpHeaderAccepts: string[] = [];
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected !== undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [];
+
+        return this.httpClient.request<any>(
+            'delete',
+            `${this.basePath}/rule-set/${encodeURIComponent(String(dossierTemplateId))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * Lists all existing DossierTemplates.
+     * None
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getAllDossierTemplates1(
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<Array<DossierTemplateModel>>;
+
+    public getAllDossierTemplates1(
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<Array<DossierTemplateModel>>>;
+
+    public getAllDossierTemplates1(
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<Array<DossierTemplateModel>>>;
+
+    public getAllDossierTemplates1(
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        let headers = this.defaultHeaders;
+
+        // authentication (RED-OAUTH) required
+        if (this.configuration.accessToken) {
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
+        // to determine the Accept header
+        const httpHeaderAccepts: string[] = ['application/json'];
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected !== undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [];
+
+        return this.httpClient.request<Array<DossierTemplateModel>>(
+            'get',
+            `${this.basePath}/rule-set`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * Get a specific DossierTemplate by its ID
+     * None
+     * @param dossierTemplateId dossierTemplateId
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public getAllDossierTemplates2(
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<DossierTemplateModel>;
+
+    public getAllDossierTemplates2(
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<DossierTemplateModel>>;
+
+    public getAllDossierTemplates2(
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<DossierTemplateModel>>;
+
+    public getAllDossierTemplates2(
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling getAllDossierTemplates2.'
+            );
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (RED-OAUTH) required
+        if (this.configuration.accessToken) {
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
+        // to determine the Accept header
+        const httpHeaderAccepts: string[] = ['application/json'];
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected !== undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [];
+
+        return this.httpClient.request<DossierTemplateModel>(
+            'get',
+            `${this.basePath}/rule-set/${encodeURIComponent(String(dossierTemplateId))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * @param consumes string[] mime-types
+     * @return true: consumes contains 'multipart/form-data', false: otherwise
+     */
+    private canConsumeForm(consumes: string[]): boolean {
+        const form = 'multipart/form-data';
+        for (const consume of consumes) {
+            if (form === consume) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/libs/red-ui-http/src/lib/api/fileAttributesController.service.ts b/libs/red-ui-http/src/lib/api/fileAttributesController.service.ts
index 5fef95fb0..0c602ce92 100644
--- a/libs/red-ui-http/src/lib/api/fileAttributesController.service.ts
+++ b/libs/red-ui-http/src/lib/api/fileAttributesController.service.ts
@@ -28,7 +28,11 @@ export class FileAttributesControllerService {
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
-    constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+    constructor(
+        protected httpClient: HttpClient,
+        @Optional() @Inject(BASE_PATH) basePath: string,
+        @Optional() configuration: Configuration
+    ) {
         if (basePath) {
             this.basePath = basePath;
         }
@@ -55,34 +59,62 @@ export class FileAttributesControllerService {
     /**
      * Delete a specific file attribute.
      * None
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param fileAttributeId fileAttributeId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public deleteFileAttribute(ruleSetId: string, fileAttributeId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public deleteFileAttribute(ruleSetId: string, fileAttributeId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public deleteFileAttribute(ruleSetId: string, fileAttributeId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public deleteFileAttribute(ruleSetId: string, fileAttributeId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling deleteFileAttribute.');
+    public deleteFileAttribute(
+        dossierTemplateId: string,
+        fileAttributeId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+    public deleteFileAttribute(
+        dossierTemplateId: string,
+        fileAttributeId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
+    public deleteFileAttribute(
+        dossierTemplateId: string,
+        fileAttributeId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
+    public deleteFileAttribute(
+        dossierTemplateId: string,
+        fileAttributeId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling deleteFileAttribute.'
+            );
         }
 
         if (fileAttributeId === null || fileAttributeId === undefined) {
-            throw new Error('Required parameter fileAttributeId was null or undefined when calling deleteFileAttribute.');
+            throw new Error(
+                'Required parameter fileAttributeId was null or undefined when calling deleteFileAttribute.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -92,7 +124,9 @@ export class FileAttributesControllerService {
 
         return this.httpClient.request<any>(
             'delete',
-            `${this.basePath}/fileAttributes/config/fileAttribute/${encodeURIComponent(String(ruleSetId))}/${encodeURIComponent(String(fileAttributeId))}`,
+            `${this.basePath}/fileAttributes/config/fileAttribute/${encodeURIComponent(
+                String(dossierTemplateId)
+            )}/${encodeURIComponent(String(fileAttributeId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -106,79 +140,136 @@ export class FileAttributesControllerService {
      * Bulk delete file attributes.
      * None
      * @param body fileAttributeIds
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public deleteFileAttributes(body: Array<string>, ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
-    public deleteFileAttributes(body: Array<string>, ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-    public deleteFileAttributes(body: Array<string>, ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public deleteFileAttributes(body: Array<string>, ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public deleteFileAttributes(
+        body: Array<string>,
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+    public deleteFileAttributes(
+        body: Array<string>,
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
+    public deleteFileAttributes(
+        body: Array<string>,
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
+    public deleteFileAttributes(
+        body: Array<string>,
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling deleteFileAttributes.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling deleteFileAttributes.'
+            );
         }
 
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling deleteFileAttributes.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling deleteFileAttributes.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('post', `${this.basePath}/fileAttributes/config/fileAttribute/${encodeURIComponent(String(ruleSetId))}/delete`, {
-            body: body,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<any>(
+            'post',
+            `${this.basePath}/fileAttributes/config/fileAttribute/${encodeURIComponent(
+                String(dossierTemplateId)
+            )}/delete`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Get the file attributes that can be used at importing csv.
      * None
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getFileAttributesConfiguration(ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<FileAttributesConfig>;
-    public getFileAttributesConfiguration(ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<FileAttributesConfig>>;
-    public getFileAttributesConfiguration(ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<FileAttributesConfig>>;
-    public getFileAttributesConfiguration(ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling getFileAttributesConfiguration.');
+    public getFileAttributesConfiguration(
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<FileAttributesConfig>;
+    public getFileAttributesConfiguration(
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<FileAttributesConfig>>;
+    public getFileAttributesConfiguration(
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<FileAttributesConfig>>;
+    public getFileAttributesConfiguration(
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling getFileAttributesConfiguration.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -186,70 +277,107 @@ export class FileAttributesControllerService {
         // to determine the Content-Type header
         const consumes: string[] = [];
 
-        return this.httpClient.request<FileAttributesConfig>('get', `${this.basePath}/fileAttributes/config/${encodeURIComponent(String(ruleSetId))}`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<FileAttributesConfig>(
+            'get',
+            `${this.basePath}/fileAttributes/config/${encodeURIComponent(
+                String(dossierTemplateId)
+            )}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Set file attributes to a existing file
      * None
      * @param body fileAttributes
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public setFileAttributes(body: FileAttributes, projectId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
     public setFileAttributes(
         body: FileAttributes,
-        projectId: string,
+        dossierId: string,
+        fileId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+    public setFileAttributes(
+        body: FileAttributes,
+        dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
-    public setFileAttributes(body: FileAttributes, projectId: string, fileId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public setFileAttributes(body: FileAttributes, projectId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public setFileAttributes(
+        body: FileAttributes,
+        dossierId: string,
+        fileId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
+    public setFileAttributes(
+        body: FileAttributes,
+        dossierId: string,
+        fileId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling setFileAttributes.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling setFileAttributes.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling setFileAttributes.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling setFileAttributes.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling setFileAttributes.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling setFileAttributes.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/fileAttributes/set/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/fileAttributes/set/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -264,57 +392,78 @@ export class FileAttributesControllerService {
      * Set file attributes base configuration and a list of file attributes,
      * None
      * @param body fileAttributesConfig
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public setFileAttributesConfig(body: FileAttributesConfig, ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<FileAttributesConfig>;
     public setFileAttributesConfig(
         body: FileAttributesConfig,
-        ruleSetId: string,
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<FileAttributesConfig>;
+    public setFileAttributesConfig(
+        body: FileAttributesConfig,
+        dossierTemplateId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<FileAttributesConfig>>;
     public setFileAttributesConfig(
         body: FileAttributesConfig,
-        ruleSetId: string,
+        dossierTemplateId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<FileAttributesConfig>>;
-    public setFileAttributesConfig(body: FileAttributesConfig, ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public setFileAttributesConfig(
+        body: FileAttributesConfig,
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling setFileAttributesConfig.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling setFileAttributesConfig.'
+            );
         }
 
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling setFileAttributesConfig.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling setFileAttributesConfig.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<FileAttributesConfig>(
             'put',
-            `${this.basePath}/fileAttributes/config/baseConfig/${encodeURIComponent(String(ruleSetId))}`,
+            `${this.basePath}/fileAttributes/config/baseConfig/${encodeURIComponent(
+                String(dossierTemplateId)
+            )}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -329,67 +478,78 @@ export class FileAttributesControllerService {
      * Add or update a file attribute that can be used at importing csv.
      * None
      * @param body fileAttribute
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public setFileAttributesConfiguration(
         body: FileAttributeConfig,
-        ruleSetId: string,
+        dossierTemplateId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<FileAttributeConfig>;
     public setFileAttributesConfiguration(
         body: FileAttributeConfig,
-        ruleSetId: string,
+        dossierTemplateId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<FileAttributeConfig>>;
     public setFileAttributesConfiguration(
         body: FileAttributeConfig,
-        ruleSetId: string,
+        dossierTemplateId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<FileAttributeConfig>>;
     public setFileAttributesConfiguration(
         body: FileAttributeConfig,
-        ruleSetId: string,
+        dossierTemplateId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling setFileAttributesConfiguration.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling setFileAttributesConfiguration.'
+            );
         }
 
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling setFileAttributesConfiguration.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling setFileAttributesConfiguration.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<FileAttributeConfig>(
             'post',
-            `${this.basePath}/fileAttributes/config/fileAttribute/${encodeURIComponent(String(ruleSetId))}`,
+            `${this.basePath}/fileAttributes/config/fileAttribute/${encodeURIComponent(
+                String(dossierTemplateId)
+            )}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
diff --git a/libs/red-ui-http/src/lib/api/fileManagementController.service.ts b/libs/red-ui-http/src/lib/api/fileManagementController.service.ts
index fffdf3e2f..072bc50f2 100644
--- a/libs/red-ui-http/src/lib/api/fileManagementController.service.ts
+++ b/libs/red-ui-http/src/lib/api/fileManagementController.service.ts
@@ -29,7 +29,11 @@ export class FileManagementControllerService {
     public configuration = new Configuration();
     protected basePath = '';
 
-    constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+    constructor(
+        protected httpClient: HttpClient,
+        @Optional() @Inject(BASE_PATH) basePath: string,
+        @Optional() configuration: Configuration
+    ) {
         if (basePath) {
             this.basePath = basePath;
         }
@@ -40,39 +44,67 @@ export class FileManagementControllerService {
     }
 
     /**
-     * Deletes a file for a given projectId and FileId
+     * Deletes a file for a given dossierId and FileId
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public deleteFile(projectId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public deleteFile(
+        dossierId: string,
+        fileId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
 
-    public deleteFile(projectId: string, fileId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public deleteFile(
+        dossierId: string,
+        fileId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
 
-    public deleteFile(projectId: string, fileId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public deleteFile(
+        dossierId: string,
+        fileId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
 
-    public deleteFile(projectId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling deleteFile.');
+    public deleteFile(
+        dossierId: string,
+        fileId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling deleteFile.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling deleteFile.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling deleteFile.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -82,7 +114,9 @@ export class FileManagementControllerService {
 
         return this.httpClient.request<any>(
             'delete',
-            `${this.basePath}/delete/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/delete/${encodeURIComponent(String(dossierId))}/${encodeURIComponent(
+                String(fileId)
+            )}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -93,70 +127,103 @@ export class FileManagementControllerService {
     }
 
     /**
-     * Deletes a a list of files for a given projectId
+     * Deletes a a list of files for a given dossierId
      * None
      * @param body fileIds
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public deleteFiles(body: Array<string>, projectId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public deleteFiles(
+        body: Array<string>,
+        dossierId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
 
-    public deleteFiles(body: Array<string>, projectId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public deleteFiles(
+        body: Array<string>,
+        dossierId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
 
-    public deleteFiles(body: Array<string>, projectId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public deleteFiles(
+        body: Array<string>,
+        dossierId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
 
-    public deleteFiles(body: Array<string>, projectId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public deleteFiles(
+        body: Array<string>,
+        dossierId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling deleteFiles.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling deleteFiles.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling deleteFiles.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling deleteFiles.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('post', `${this.basePath}/delete/${encodeURIComponent(String(projectId))}`, {
-            body: body,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<any>(
+            'post',
+            `${this.basePath}/delete/${encodeURIComponent(String(dossierId))}`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Returns a downloadable byte stream of the annotated file with the specified fileId
      * Use the optional \&quot;inline\&quot; request parameter to select, if this downloadAnnotated will be opened in the browser.
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param inline inline
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public downloadAnnotatedFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -165,7 +232,7 @@ export class FileManagementControllerService {
     ): Observable<any>;
 
     public downloadAnnotatedFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -174,7 +241,7 @@ export class FileManagementControllerService {
     ): Observable<HttpResponse<any>>;
 
     public downloadAnnotatedFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -183,19 +250,23 @@ export class FileManagementControllerService {
     ): Observable<HttpEvent<any>>;
 
     public downloadAnnotatedFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling downloadAnnotatedFile.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling downloadAnnotatedFile.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling downloadAnnotatedFile.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling downloadAnnotatedFile.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -210,13 +281,17 @@ export class FileManagementControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -226,7 +301,9 @@ export class FileManagementControllerService {
 
         return this.httpClient.request(
             'get',
-            `${this.basePath}/download/annotated/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/download/annotated/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 responseType: 'blob',
                 params: queryParameters,
@@ -241,14 +318,14 @@ export class FileManagementControllerService {
     /**
      * Returns a downloadable byte stream of the fatted redacted file with the specified fileId
      * Use the optional \&quot;inline\&quot; request parameter to select, if this file will be opened in the browser.
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param inline inline
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public downloadFlatRedacted(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -257,7 +334,7 @@ export class FileManagementControllerService {
     ): Observable<any>;
 
     public downloadFlatRedacted(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -266,7 +343,7 @@ export class FileManagementControllerService {
     ): Observable<HttpResponse<any>>;
 
     public downloadFlatRedacted(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -275,7 +352,7 @@ export class FileManagementControllerService {
     ): Observable<HttpEvent<any>>;
 
     public downloadFlatRedacted(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -283,11 +360,15 @@ export class FileManagementControllerService {
         reportProgress: boolean = false
     ): Observable<any> {
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling downloadFlatRedacted.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling downloadFlatRedacted.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling downloadFlatRedacted.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling downloadFlatRedacted.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -302,13 +383,17 @@ export class FileManagementControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -318,7 +403,9 @@ export class FileManagementControllerService {
 
         return this.httpClient.request(
             'get',
-            `${this.basePath}/download/flatted/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/download/flatted/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 responseType: 'blob',
                 params: queryParameters,
@@ -333,14 +420,14 @@ export class FileManagementControllerService {
     /**
      * Returns a downloadable byte stream of the original file with the specified fileId
      * Use the optional \&quot;inline\&quot; request parameter to select, if this downloadAnnotated will be opened in the browser.
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param inline inline
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public downloadOriginalFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -349,7 +436,7 @@ export class FileManagementControllerService {
     ): Observable<any>;
 
     public downloadOriginalFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -358,7 +445,7 @@ export class FileManagementControllerService {
     ): Observable<HttpResponse<any>>;
 
     public downloadOriginalFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -367,19 +454,23 @@ export class FileManagementControllerService {
     ): Observable<HttpEvent<any>>;
 
     public downloadOriginalFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling downloadOriginalFile.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling downloadOriginalFile.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling downloadOriginalFile.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling downloadOriginalFile.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -394,13 +485,17 @@ export class FileManagementControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -410,7 +505,9 @@ export class FileManagementControllerService {
 
         return this.httpClient.request(
             'get',
-            `${this.basePath}/download/original/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/download/original/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 responseType: 'blob',
                 params: queryParameters,
@@ -425,14 +522,14 @@ export class FileManagementControllerService {
     /**
      * Returns a downloadable byte stream of the redaction preview file with the specified fileId
      * Use the optional \&quot;inline\&quot; request parameter to select, if this downloadAnnotated will be opened in the browser.
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param inline inline
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public downloadPreviewFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -441,7 +538,7 @@ export class FileManagementControllerService {
     ): Observable<any>;
 
     public downloadPreviewFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -450,7 +547,7 @@ export class FileManagementControllerService {
     ): Observable<HttpResponse<any>>;
 
     public downloadPreviewFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -459,19 +556,23 @@ export class FileManagementControllerService {
     ): Observable<HttpEvent<any>>;
 
     public downloadPreviewFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling downloadPreviewFile.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling downloadPreviewFile.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling downloadPreviewFile.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling downloadPreviewFile.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -486,13 +587,17 @@ export class FileManagementControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -502,7 +607,9 @@ export class FileManagementControllerService {
 
         return this.httpClient.request(
             'get',
-            `${this.basePath}/download/preview/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/download/preview/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 responseType: 'blob',
                 params: queryParameters,
@@ -518,30 +625,52 @@ export class FileManagementControllerService {
      * Returns a downloadable byte stream of the requested files in a zip format
      * Use the optional \&quot;inline\&quot; request parameter to select, if this report will be opened in the browser.
      * @param body fileIds
-     * @param projectId The projectId
+     * @param dossierId The dossierId
      * @param inline inline
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public downloadPreviewFiles(body: FileIds, projectId: string, inline?: boolean, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public downloadPreviewFiles(
+        body: FileIds,
+        dossierId: string,
+        inline?: boolean,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
 
     public downloadPreviewFiles(
         body: FileIds,
-        projectId: string,
+        dossierId: string,
         inline?: boolean,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
 
-    public downloadPreviewFiles(body: FileIds, projectId: string, inline?: boolean, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public downloadPreviewFiles(
+        body: FileIds,
+        dossierId: string,
+        inline?: boolean,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
 
-    public downloadPreviewFiles(body: FileIds, projectId: string, inline?: boolean, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public downloadPreviewFiles(
+        body: FileIds,
+        dossierId: string,
+        inline?: boolean,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling downloadPreviewFiles.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling downloadPreviewFiles.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling downloadPreviewFiles.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling downloadPreviewFiles.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -553,46 +682,55 @@ export class FileManagementControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request('post', `${this.basePath}/download/bulk/preview/${encodeURIComponent(String(projectId))}`, {
-            responseType: 'blob',
-            body: body,
-            params: queryParameters,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request(
+            'post',
+            `${this.basePath}/download/bulk/preview/${encodeURIComponent(String(dossierId))}`,
+            {
+                responseType: 'blob',
+                body: body,
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Returns a downloadable byte stream of the redacted file with the specified fileId
      * Use the optional \&quot;inline\&quot; request parameter to select, if this downloadAnnotated will be opened in the browser.
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param inline inline
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public downloadRedactedFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -601,7 +739,7 @@ export class FileManagementControllerService {
     ): Observable<any>;
 
     public downloadRedactedFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -610,7 +748,7 @@ export class FileManagementControllerService {
     ): Observable<HttpResponse<any>>;
 
     public downloadRedactedFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
@@ -619,19 +757,23 @@ export class FileManagementControllerService {
     ): Observable<HttpEvent<any>>;
 
     public downloadRedactedFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         inline?: boolean,
         indicator?: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling downloadRedactedFile.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling downloadRedactedFile.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling downloadRedactedFile.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling downloadRedactedFile.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -646,13 +788,17 @@ export class FileManagementControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -662,7 +808,9 @@ export class FileManagementControllerService {
 
         return this.httpClient.request(
             'get',
-            `${this.basePath}/download/redacted/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/download/redacted/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 responseType: 'blob',
                 params: queryParameters,
@@ -678,30 +826,52 @@ export class FileManagementControllerService {
      * Returns a downloadable byte stream of the requested files in a zip format
      * Use the optional \&quot;inline\&quot; request parameter to select, if this report will be opened in the browser.
      * @param body fileIds
-     * @param projectId The projectId
+     * @param dossierId The dossierId
      * @param inline inline
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public downloadRedactedFiles(body: FileIds, projectId: string, inline?: boolean, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public downloadRedactedFiles(
+        body: FileIds,
+        dossierId: string,
+        inline?: boolean,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
 
     public downloadRedactedFiles(
         body: FileIds,
-        projectId: string,
+        dossierId: string,
         inline?: boolean,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
 
-    public downloadRedactedFiles(body: FileIds, projectId: string, inline?: boolean, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public downloadRedactedFiles(
+        body: FileIds,
+        dossierId: string,
+        inline?: boolean,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
 
-    public downloadRedactedFiles(body: FileIds, projectId: string, inline?: boolean, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public downloadRedactedFiles(
+        body: FileIds,
+        dossierId: string,
+        inline?: boolean,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling downloadRedactedFiles.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling downloadRedactedFiles.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling downloadRedactedFiles.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling downloadRedactedFiles.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -713,40 +883,49 @@ export class FileManagementControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request('post', `${this.basePath}/download/bulk/redacted/${encodeURIComponent(String(projectId))}`, {
-            responseType: 'blob',
-            body: body,
-            params: queryParameters,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request(
+            'post',
+            `${this.basePath}/download/bulk/redacted/${encodeURIComponent(String(dossierId))}`,
+            {
+                responseType: 'blob',
+                body: body,
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Returns a downloadable byte stream of the redaction report file for the specified fileIds
      * Use the optional \&quot;inline\&quot; request parameter to select, if this report will be opened in the browser.
      * @param body fileIds
-     * @param projectId The projectId
+     * @param dossierId The dossierId
      * @param inline inline
      * @param template template
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
@@ -754,7 +933,7 @@ export class FileManagementControllerService {
      */
     public downloadRedactionReport(
         body: FileIds,
-        projectId: string,
+        dossierId: string,
         inline?: boolean,
         template?: string,
         observe?: 'body',
@@ -763,7 +942,7 @@ export class FileManagementControllerService {
 
     public downloadRedactionReport(
         body: FileIds,
-        projectId: string,
+        dossierId: string,
         inline?: boolean,
         template?: string,
         observe?: 'response',
@@ -772,7 +951,7 @@ export class FileManagementControllerService {
 
     public downloadRedactionReport(
         body: FileIds,
-        projectId: string,
+        dossierId: string,
         inline?: boolean,
         template?: string,
         observe?: 'events',
@@ -781,18 +960,22 @@ export class FileManagementControllerService {
 
     public downloadRedactionReport(
         body: FileIds,
-        projectId: string,
+        dossierId: string,
         inline?: boolean,
         template?: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling downloadRedactionReport.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling downloadRedactionReport.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling downloadRedactionReport.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling downloadRedactionReport.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -807,77 +990,88 @@ export class FileManagementControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request('post', `${this.basePath}/download/report/${encodeURIComponent(String(projectId))}`, {
-            responseType: 'blob',
-            body: body,
-            params: queryParameters,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request(
+            'post',
+            `${this.basePath}/download/report/${encodeURIComponent(String(dossierId))}`,
+            {
+                responseType: 'blob',
+                body: body,
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
-     * Returns a downloadable byte stream of the redaction report file for the specified project
+     * Returns a downloadable byte stream of the redaction report file for the specified dossier
      * Use the optional \&quot;inline\&quot; request parameter to select, if this report will be opened in the browser.
-     * @param projectId The projectId
+     * @param dossierId The dossierId
      * @param inline inline
      * @param template template
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public downloadRedactionReportForProject(
-        projectId: string,
+    public downloadRedactionReportForDossier(
+        dossierId: string,
         inline?: boolean,
         template?: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
 
-    public downloadRedactionReportForProject(
-        projectId: string,
+    public downloadRedactionReportForDossier(
+        dossierId: string,
         inline?: boolean,
         template?: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
 
-    public downloadRedactionReportForProject(
-        projectId: string,
+    public downloadRedactionReportForDossier(
+        dossierId: string,
         inline?: boolean,
         template?: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
 
-    public downloadRedactionReportForProject(
-        projectId: string,
+    public downloadRedactionReportForDossier(
+        dossierId: string,
         inline?: boolean,
         template?: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling downloadRedactionReportForProject.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling downloadRedactionReportForDossier.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -892,13 +1086,17 @@ export class FileManagementControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -906,28 +1104,32 @@ export class FileManagementControllerService {
         // to determine the Content-Type header
         const consumes: string[] = [];
 
-        return this.httpClient.request('get', `${this.basePath}/download/report/${encodeURIComponent(String(projectId))}`, {
-            responseType: 'blob',
-            params: queryParameters,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request(
+            'get',
+            `${this.basePath}/download/report/${encodeURIComponent(String(dossierId))}`,
+            {
+                responseType: 'blob',
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Returns a zip archive containing all preview, redacted and report files
      * Use the optional \&quot;inline\&quot; request parameter to select, if this report will be opened in the browser.
      * @param body downloadSubmissionPackageRequest
-     * @param projectId The projectId
+     * @param dossierId The dossierId
      * @param inline inline
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public downloadSubmissionPackage(
         body: DownloadSubmissionPackageRequest,
-        projectId: string,
+        dossierId: string,
         inline?: boolean,
         observe?: 'body',
         reportProgress?: boolean
@@ -935,7 +1137,7 @@ export class FileManagementControllerService {
 
     public downloadSubmissionPackage(
         body: DownloadSubmissionPackageRequest,
-        projectId: string,
+        dossierId: string,
         inline?: boolean,
         observe?: 'response',
         reportProgress?: boolean
@@ -943,7 +1145,7 @@ export class FileManagementControllerService {
 
     public downloadSubmissionPackage(
         body: DownloadSubmissionPackageRequest,
-        projectId: string,
+        dossierId: string,
         inline?: boolean,
         observe?: 'events',
         reportProgress?: boolean
@@ -951,17 +1153,21 @@ export class FileManagementControllerService {
 
     public downloadSubmissionPackage(
         body: DownloadSubmissionPackageRequest,
-        projectId: string,
+        dossierId: string,
         inline?: boolean,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling downloadSubmissionPackage.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling downloadSubmissionPackage.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling downloadSubmissionPackage.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling downloadSubmissionPackage.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
@@ -973,69 +1179,106 @@ export class FileManagementControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request('post', `${this.basePath}/download/bulk/submission/${encodeURIComponent(String(projectId))}`, {
-            responseType: 'blob',
-            body: body,
-            params: queryParameters,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request(
+            'post',
+            `${this.basePath}/download/bulk/submission/${encodeURIComponent(String(dossierId))}`,
+            {
+                responseType: 'blob',
+                body: body,
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Receives an uploaded file and returns its fileId.
      * None
      * @param file
-     * @param projectId The projectId, the file belongs to
+     * @param dossierId The dossierId, the file belongs to
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public uploadFileForm(file: Blob, projectId: string, observe?: 'body', reportProgress?: boolean): Observable<FileUploadResult>;
+    public uploadFileForm(
+        file: Blob,
+        dossierId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<FileUploadResult>;
 
-    public uploadFileForm(file: Blob, projectId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<FileUploadResult>>;
+    public uploadFileForm(
+        file: Blob,
+        dossierId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<FileUploadResult>>;
 
-    public uploadFileForm(file: Blob, projectId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<FileUploadResult>>;
+    public uploadFileForm(
+        file: Blob,
+        dossierId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<FileUploadResult>>;
 
-    public uploadFileForm(file: Blob, projectId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public uploadFileForm(
+        file: Blob,
+        dossierId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (file === null || file === undefined) {
-            throw new Error('Required parameter file was null or undefined when calling uploadFile.');
+            throw new Error(
+                'Required parameter file was null or undefined when calling uploadFile.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling uploadFile.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling uploadFile.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -1061,13 +1304,17 @@ export class FileManagementControllerService {
             formParams = (formParams.append('file', <any>file) as any) || formParams;
         }
 
-        return this.httpClient.request<FileUploadResult>('post', `${this.basePath}/upload/${encodeURIComponent(String(projectId))}`, {
-            body: convertFormParamsToString ? formParams.toString() : formParams,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<FileUploadResult>(
+            'post',
+            `${this.basePath}/upload/${encodeURIComponent(String(dossierId))}`,
+            {
+                body: convertFormParamsToString ? formParams.toString() : formParams,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
diff --git a/libs/red-ui-http/src/lib/api/legalBasisMappingController.service.ts b/libs/red-ui-http/src/lib/api/legalBasisMappingController.service.ts
index 4ff734e04..e35c93c58 100644
--- a/libs/red-ui-http/src/lib/api/legalBasisMappingController.service.ts
+++ b/libs/red-ui-http/src/lib/api/legalBasisMappingController.service.ts
@@ -26,7 +26,11 @@ export class LegalBasisMappingControllerService {
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
-    constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+    constructor(
+        protected httpClient: HttpClient,
+        @Optional() @Inject(BASE_PATH) basePath: string,
+        @Optional() configuration: Configuration
+    ) {
         if (basePath) {
             this.basePath = basePath;
         }
@@ -53,29 +57,51 @@ export class LegalBasisMappingControllerService {
     /**
      * Set the mapping between legal basis and redaction reason.
      * None
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getLegalBasisMapping(ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<Array<LegalBasisMapping>>;
-    public getLegalBasisMapping(ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<LegalBasisMapping>>>;
-    public getLegalBasisMapping(ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<LegalBasisMapping>>>;
-    public getLegalBasisMapping(ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling getLegalBasisMapping.');
+    public getLegalBasisMapping(
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<Array<LegalBasisMapping>>;
+    public getLegalBasisMapping(
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<Array<LegalBasisMapping>>>;
+    public getLegalBasisMapping(
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<Array<LegalBasisMapping>>>;
+    public getLegalBasisMapping(
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling getLegalBasisMapping.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -83,67 +109,99 @@ export class LegalBasisMappingControllerService {
         // to determine the Content-Type header
         const consumes: string[] = [];
 
-        return this.httpClient.request<Array<LegalBasisMapping>>('get', `${this.basePath}/legalBasis/${encodeURIComponent(String(ruleSetId))}`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<Array<LegalBasisMapping>>(
+            'get',
+            `${this.basePath}/legalBasis/${encodeURIComponent(String(dossierTemplateId))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Set the mapping between legal basis and redaction reason.
      * None
      * @param body legalBasisMapping
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public setLegalBasisMapping(body: Array<LegalBasisMapping>, ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
     public setLegalBasisMapping(
         body: Array<LegalBasisMapping>,
-        ruleSetId: string,
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
+    public setLegalBasisMapping(
+        body: Array<LegalBasisMapping>,
+        dossierTemplateId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
-    public setLegalBasisMapping(body: Array<LegalBasisMapping>, ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-    public setLegalBasisMapping(body: Array<LegalBasisMapping>, ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public setLegalBasisMapping(
+        body: Array<LegalBasisMapping>,
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
+    public setLegalBasisMapping(
+        body: Array<LegalBasisMapping>,
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling setLegalBasisMapping.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling setLegalBasisMapping.'
+            );
         }
 
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling setLegalBasisMapping.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling setLegalBasisMapping.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<any>('post', `${this.basePath}/legalBasis/${encodeURIComponent(String(ruleSetId))}`, {
-            body: body,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<any>(
+            'post',
+            `${this.basePath}/legalBasis/${encodeURIComponent(String(dossierTemplateId))}`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 }
diff --git a/libs/red-ui-http/src/lib/api/manualRedactionController.service.ts b/libs/red-ui-http/src/lib/api/manualRedactionController.service.ts
index 296b0620d..d96dfbeac 100644
--- a/libs/red-ui-http/src/lib/api/manualRedactionController.service.ts
+++ b/libs/red-ui-http/src/lib/api/manualRedactionController.service.ts
@@ -33,7 +33,11 @@ export class ManualRedactionControllerService {
     public configuration = new Configuration();
     protected basePath = '';
 
-    constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+    constructor(
+        protected httpClient: HttpClient,
+        @Optional() @Inject(BASE_PATH) basePath: string,
+        @Optional() configuration: Configuration
+    ) {
         if (basePath) {
             this.basePath = basePath;
         }
@@ -47,7 +51,7 @@ export class ManualRedactionControllerService {
      * Adds a comment to a redaction/redaction request
      * None
      * @param body addCommentRequest
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param annotationId annotationId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
@@ -55,7 +59,7 @@ export class ManualRedactionControllerService {
      */
     public addComment(
         body: AddCommentRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         annotationId: string,
         observe?: 'body',
@@ -64,7 +68,7 @@ export class ManualRedactionControllerService {
 
     public addComment(
         body: AddCommentRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         annotationId: string,
         observe?: 'response',
@@ -73,7 +77,7 @@ export class ManualRedactionControllerService {
 
     public addComment(
         body: AddCommentRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         annotationId: string,
         observe?: 'events',
@@ -82,55 +86,68 @@ export class ManualRedactionControllerService {
 
     public addComment(
         body: AddCommentRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         annotationId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling addComment.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling addComment.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling addComment.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling addComment.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling addComment.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling addComment.'
+            );
         }
 
         if (annotationId === null || annotationId === undefined) {
-            throw new Error('Required parameter annotationId was null or undefined when calling addComment.');
+            throw new Error(
+                'Required parameter annotationId was null or undefined when calling addComment.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<CommentResponse>(
             'post',
-            `${this.basePath}/manualRedaction/comment/add/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}/${encodeURIComponent(
-                String(annotationId)
-            )}`,
+            `${this.basePath}/manualRedaction/comment/add/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}/${encodeURIComponent(String(annotationId))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -145,76 +162,89 @@ export class ManualRedactionControllerService {
      * Forces a redaction
      * None
      * @param body forceRedactionRequest
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public forceRedaction(
         body: ForceRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<ManualAddResponse>;
     public forceRedaction(
         body: ForceRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<ManualAddResponse>>;
     public forceRedaction(
         body: ForceRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<ManualAddResponse>>;
     public forceRedaction(
         body: ForceRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling forceRedaction.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling forceRedaction.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling forceRedaction.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling forceRedaction.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling forceRedaction.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling forceRedaction.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<ManualAddResponse>(
             'post',
-            `${this.basePath}/manualRedaction/redaction/force/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/manualRedaction/redaction/force/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -229,76 +259,89 @@ export class ManualRedactionControllerService {
      * Adds a request to force a redaction.
      * None
      * @param body forceRedactionRequest
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public requestForceRedaction(
         body: ForceRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<ManualAddResponse>;
     public requestForceRedaction(
         body: ForceRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<ManualAddResponse>>;
     public requestForceRedaction(
         body: ForceRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<ManualAddResponse>>;
     public requestForceRedaction(
         body: ForceRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling requestForceRedaction.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling requestForceRedaction.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling requestForceRedaction.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling requestForceRedaction.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling requestForceRedaction.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling requestForceRedaction.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<ManualAddResponse>(
             'post',
-            `${this.basePath}/manualRedaction/request/force/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/manualRedaction/request/force/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -313,14 +356,14 @@ export class ManualRedactionControllerService {
      * Adds a manual redaction
      * None
      * @param body addRedactionRequest
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public addRedaction(
         body: AddRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'body',
         reportProgress?: boolean
@@ -328,7 +371,7 @@ export class ManualRedactionControllerService {
 
     public addRedaction(
         body: AddRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
@@ -336,50 +379,69 @@ export class ManualRedactionControllerService {
 
     public addRedaction(
         body: AddRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<ManualAddResponse>>;
 
-    public addRedaction(body: AddRedactionRequest, projectId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public addRedaction(
+        body: AddRedactionRequest,
+        dossierId: string,
+        fileId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling addRedaction.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling addRedaction.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling addRedaction.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling addRedaction.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling addRedaction.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling addRedaction.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<ManualAddResponse>(
             'post',
-            `${this.basePath}/manualRedaction/redaction/add/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/manualRedaction/redaction/add/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -394,7 +456,7 @@ export class ManualRedactionControllerService {
      * Approves a redaction request/ remove redaction request
      * None
      * @param body approveRequest
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param annotationId annotationId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
@@ -402,7 +464,7 @@ export class ManualRedactionControllerService {
      */
     public approveRequest(
         body: ApproveRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         annotationId: string,
         observe?: 'body',
@@ -411,7 +473,7 @@ export class ManualRedactionControllerService {
 
     public approveRequest(
         body: ApproveRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         annotationId: string,
         observe?: 'response',
@@ -420,7 +482,7 @@ export class ManualRedactionControllerService {
 
     public approveRequest(
         body: ApproveRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         annotationId: string,
         observe?: 'events',
@@ -429,55 +491,68 @@ export class ManualRedactionControllerService {
 
     public approveRequest(
         body: ApproveRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         annotationId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling approveRequest.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling approveRequest.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling approveRequest.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling approveRequest.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling approveRequest.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling approveRequest.'
+            );
         }
 
         if (annotationId === null || annotationId === undefined) {
-            throw new Error('Required parameter annotationId was null or undefined when calling approveRequest.');
+            throw new Error(
+                'Required parameter annotationId was null or undefined when calling approveRequest.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/manualRedaction/approve/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}/${encodeURIComponent(
-                String(annotationId)
-            )}`,
+            `${this.basePath}/manualRedaction/approve/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}/${encodeURIComponent(String(annotationId))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -491,48 +566,76 @@ export class ManualRedactionControllerService {
     /**
      * Declines a redaction request/ remove redaction request
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param annotationId annotationId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public declineRequest(projectId: string, fileId: string, annotationId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public declineRequest(
+        dossierId: string,
+        fileId: string,
+        annotationId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
 
     public declineRequest(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         annotationId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
 
-    public declineRequest(projectId: string, fileId: string, annotationId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public declineRequest(
+        dossierId: string,
+        fileId: string,
+        annotationId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
 
-    public declineRequest(projectId: string, fileId: string, annotationId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling declineRequest.');
+    public declineRequest(
+        dossierId: string,
+        fileId: string,
+        annotationId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling declineRequest.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling declineRequest.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling declineRequest.'
+            );
         }
 
         if (annotationId === null || annotationId === undefined) {
-            throw new Error('Required parameter annotationId was null or undefined when calling declineRequest.');
+            throw new Error(
+                'Required parameter annotationId was null or undefined when calling declineRequest.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -542,9 +645,9 @@ export class ManualRedactionControllerService {
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/manualRedaction/decline/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}/${encodeURIComponent(
-                String(annotationId)
-            )}`,
+            `${this.basePath}/manualRedaction/decline/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}/${encodeURIComponent(String(annotationId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -557,37 +660,65 @@ export class ManualRedactionControllerService {
     /**
      * Returns the manual redactions
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getManualRedaction(projectId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable<ManualRedactions>;
+    public getManualRedaction(
+        dossierId: string,
+        fileId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<ManualRedactions>;
 
-    public getManualRedaction(projectId: string, fileId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<ManualRedactions>>;
+    public getManualRedaction(
+        dossierId: string,
+        fileId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<ManualRedactions>>;
 
-    public getManualRedaction(projectId: string, fileId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<ManualRedactions>>;
+    public getManualRedaction(
+        dossierId: string,
+        fileId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<ManualRedactions>>;
 
-    public getManualRedaction(projectId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling getManualRedaction.');
+    public getManualRedaction(
+        dossierId: string,
+        fileId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling getManualRedaction.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling getManualRedaction.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling getManualRedaction.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -597,7 +728,9 @@ export class ManualRedactionControllerService {
 
         return this.httpClient.request<ManualRedactions>(
             'get',
-            `${this.basePath}/manualRedaction/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/manualRedaction/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -611,14 +744,14 @@ export class ManualRedactionControllerService {
      * Removes a redaction
      * None
      * @param body removeRedactionRequest
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public removeRedaction(
         body: RemoveRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'body',
         reportProgress?: boolean
@@ -626,7 +759,7 @@ export class ManualRedactionControllerService {
 
     public removeRedaction(
         body: RemoveRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
@@ -634,7 +767,7 @@ export class ManualRedactionControllerService {
 
     public removeRedaction(
         body: RemoveRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'events',
         reportProgress?: boolean
@@ -642,48 +775,61 @@ export class ManualRedactionControllerService {
 
     public removeRedaction(
         body: RemoveRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling removeRedaction.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling removeRedaction.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling removeRedaction.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling removeRedaction.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling removeRedaction.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling removeRedaction.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<ManualAddResponse>(
             'post',
-            `${this.basePath}/manualRedaction/redaction/remove/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/manualRedaction/redaction/remove/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -698,14 +844,14 @@ export class ManualRedactionControllerService {
      * Adds a request for a redaction.
      * None
      * @param body addRedactionRequest
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public requestAddRedaction(
         body: AddRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'body',
         reportProgress?: boolean
@@ -713,7 +859,7 @@ export class ManualRedactionControllerService {
 
     public requestAddRedaction(
         body: AddRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
@@ -721,7 +867,7 @@ export class ManualRedactionControllerService {
 
     public requestAddRedaction(
         body: AddRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'events',
         reportProgress?: boolean
@@ -729,48 +875,61 @@ export class ManualRedactionControllerService {
 
     public requestAddRedaction(
         body: AddRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling requestAddRedaction.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling requestAddRedaction.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling requestAddRedaction.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling requestAddRedaction.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling requestAddRedaction.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling requestAddRedaction.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<ManualAddResponse>(
             'post',
-            `${this.basePath}/manualRedaction/request/add/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/manualRedaction/request/add/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -785,14 +944,14 @@ export class ManualRedactionControllerService {
      * Adds a request to remove a redaction.
      * None
      * @param body removeRedactionRequest
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public requestRemoveRedaction(
         body: RemoveRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'body',
         reportProgress?: boolean
@@ -800,7 +959,7 @@ export class ManualRedactionControllerService {
 
     public requestRemoveRedaction(
         body: RemoveRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
@@ -808,7 +967,7 @@ export class ManualRedactionControllerService {
 
     public requestRemoveRedaction(
         body: RemoveRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'events',
         reportProgress?: boolean
@@ -816,48 +975,61 @@ export class ManualRedactionControllerService {
 
     public requestRemoveRedaction(
         body: RemoveRedactionRequest,
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling requestRemoveRedaction.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling requestRemoveRedaction.'
+            );
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling requestRemoveRedaction.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling requestRemoveRedaction.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling requestRemoveRedaction.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling requestRemoveRedaction.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<ManualAddResponse>(
             'post',
-            `${this.basePath}/manualRedaction/request/remove/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/manualRedaction/request/remove/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -871,21 +1043,47 @@ export class ManualRedactionControllerService {
     /**
      * Undo a manual request or redaction
      * Can only be done be the user who added the request/redaction.
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param annotationId annotationId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public undo(projectId: string, fileId: string, annotationId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public undo(
+        dossierId: string,
+        fileId: string,
+        annotationId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
 
-    public undo(projectId: string, fileId: string, annotationId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public undo(
+        dossierId: string,
+        fileId: string,
+        annotationId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
 
-    public undo(projectId: string, fileId: string, annotationId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public undo(
+        dossierId: string,
+        fileId: string,
+        annotationId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
 
-    public undo(projectId: string, fileId: string, annotationId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling undo.');
+    public undo(
+        dossierId: string,
+        fileId: string,
+        annotationId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling undo.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
@@ -893,20 +1091,26 @@ export class ManualRedactionControllerService {
         }
 
         if (annotationId === null || annotationId === undefined) {
-            throw new Error('Required parameter annotationId was null or undefined when calling undo.');
+            throw new Error(
+                'Required parameter annotationId was null or undefined when calling undo.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -916,9 +1120,9 @@ export class ManualRedactionControllerService {
 
         return this.httpClient.request<any>(
             'delete',
-            `${this.basePath}/manualRedaction/undo/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}/${encodeURIComponent(
-                String(annotationId)
-            )}`,
+            `${this.basePath}/manualRedaction/undo/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}/${encodeURIComponent(String(annotationId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -931,17 +1135,24 @@ export class ManualRedactionControllerService {
     /**
      * Undo a comment
      * Can only be done be the user who added the comment.
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param annotationId annotationId
      * @param commentId commentId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public undoComment(projectId: string, fileId: string, annotationId: string, commentId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public undoComment(
+        dossierId: string,
+        fileId: string,
+        annotationId: string,
+        commentId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
 
     public undoComment(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         annotationId: string,
         commentId: string,
@@ -950,7 +1161,7 @@ export class ManualRedactionControllerService {
     ): Observable<HttpResponse<any>>;
 
     public undoComment(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         annotationId: string,
         commentId: string,
@@ -959,40 +1170,52 @@ export class ManualRedactionControllerService {
     ): Observable<HttpEvent<any>>;
 
     public undoComment(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         annotationId: string,
         commentId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling undoComment.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling undoComment.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling undoComment.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling undoComment.'
+            );
         }
 
         if (annotationId === null || annotationId === undefined) {
-            throw new Error('Required parameter annotationId was null or undefined when calling undoComment.');
+            throw new Error(
+                'Required parameter annotationId was null or undefined when calling undoComment.'
+            );
         }
 
         if (commentId === null || commentId === undefined) {
-            throw new Error('Required parameter commentId was null or undefined when calling undoComment.');
+            throw new Error(
+                'Required parameter commentId was null or undefined when calling undoComment.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -1002,7 +1225,9 @@ export class ManualRedactionControllerService {
 
         return this.httpClient.request<any>(
             'delete',
-            `${this.basePath}/manualRedaction/comment/undo/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}/${encodeURIComponent(
+            `${this.basePath}/manualRedaction/comment/undo/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}/${encodeURIComponent(
                 String(annotationId)
             )}/${encodeURIComponent(String(commentId))}`,
             {
diff --git a/libs/red-ui-http/src/lib/api/projectController.service.ts b/libs/red-ui-http/src/lib/api/projectController.service.ts
deleted file mode 100644
index 10626208d..000000000
--- a/libs/red-ui-http/src/lib/api/projectController.service.ts
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * API Documentation for Redaction Gateway
- * Description for redaction
- *
- * OpenAPI spec version: 1.0
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */ /* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/member-ordering */
-
-import { Inject, Injectable, Optional } from '@angular/core';
-import { HttpClient, HttpEvent, HttpHeaders, HttpResponse } from '@angular/common/http';
-
-import { Observable } from 'rxjs';
-
-import { Project } from '../model/project';
-import { ProjectRequest } from '../model/projectRequest';
-
-import { BASE_PATH } from '../variables';
-import { Configuration } from '../configuration';
-
-@Injectable()
-export class ProjectControllerService {
-    public defaultHeaders = new HttpHeaders();
-    public configuration = new Configuration();
-    protected basePath = '';
-
-    constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
-        if (basePath) {
-            this.basePath = basePath;
-        }
-        if (configuration) {
-            this.configuration = configuration;
-            this.basePath = basePath || configuration.basePath || this.basePath;
-        }
-    }
-
-    /**
-     * Creates or updates a project.
-     * None
-     * @param body project
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public createOrUpdateProject(body: ProjectRequest, observe?: 'body', reportProgress?: boolean): Observable<Project>;
-
-    public createOrUpdateProject(body: ProjectRequest, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Project>>;
-
-    public createOrUpdateProject(body: ProjectRequest, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Project>>;
-
-    public createOrUpdateProject(body: ProjectRequest, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling createOrUpdateProject.');
-        }
-
-        let headers = this.defaultHeaders;
-
-        // authentication (RED-OAUTH) required
-        if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        // to determine the Accept header
-        const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        if (httpHeaderAcceptSelected !== undefined) {
-            headers = headers.set('Accept', httpHeaderAcceptSelected);
-        }
-
-        // to determine the Content-Type header
-        const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
-        if (httpContentTypeSelected !== undefined) {
-            headers = headers.set('Content-Type', httpContentTypeSelected);
-        }
-
-        return this.httpClient.request<Project>('post', `${this.basePath}/project`, {
-            body: body,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
-    }
-
-    /**
-     * Deletes an existing project.
-     * None
-     * @param projectId projectId
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public deleteProject(projectId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
-
-    public deleteProject(projectId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-
-    public deleteProject(projectId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-
-    public deleteProject(projectId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling deleteProject.');
-        }
-
-        let headers = this.defaultHeaders;
-
-        // authentication (RED-OAUTH) required
-        if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        // to determine the Accept header
-        const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        if (httpHeaderAcceptSelected !== undefined) {
-            headers = headers.set('Accept', httpHeaderAcceptSelected);
-        }
-
-        // to determine the Content-Type header
-        const consumes: string[] = [];
-
-        return this.httpClient.request<any>('delete', `${this.basePath}/project/${encodeURIComponent(String(projectId))}`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
-    }
-
-    /**
-     * Gets an existing project.
-     * None
-     * @param projectId projectId
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public getProject(projectId: string, observe?: 'body', reportProgress?: boolean): Observable<Project>;
-
-    public getProject(projectId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Project>>;
-
-    public getProject(projectId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Project>>;
-
-    public getProject(projectId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling getProject.');
-        }
-
-        let headers = this.defaultHeaders;
-
-        // authentication (RED-OAUTH) required
-        if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        // to determine the Accept header
-        const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        if (httpHeaderAcceptSelected !== undefined) {
-            headers = headers.set('Accept', httpHeaderAcceptSelected);
-        }
-
-        // to determine the Content-Type header
-        const consumes: string[] = [];
-
-        return this.httpClient.request<Project>('get', `${this.basePath}/project/${encodeURIComponent(String(projectId))}`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
-    }
-
-    /**
-     * Gets all existing projects.
-     * None
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public getProjects(observe?: 'body', reportProgress?: boolean): Observable<Array<Project>>;
-
-    public getProjects(observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<Project>>>;
-
-    public getProjects(observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<Project>>>;
-
-    public getProjects(observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        let headers = this.defaultHeaders;
-
-        // authentication (RED-OAUTH) required
-        if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        // to determine the Accept header
-        const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        if (httpHeaderAcceptSelected !== undefined) {
-            headers = headers.set('Accept', httpHeaderAcceptSelected);
-        }
-
-        // to determine the Content-Type header
-        const consumes: string[] = [];
-
-        return this.httpClient.request<Array<Project>>('get', `${this.basePath}/project`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
-    }
-
-    /**
-     * @param consumes string[] mime-types
-     * @return true: consumes contains 'multipart/form-data', false: otherwise
-     */
-    private canConsumeForm(consumes: string[]): boolean {
-        const form = 'multipart/form-data';
-        for (const consume of consumes) {
-            if (form === consume) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/libs/red-ui-http/src/lib/api/reanalysisController.service.ts b/libs/red-ui-http/src/lib/api/reanalysisController.service.ts
index 2e79aa22a..a67cb0780 100644
--- a/libs/red-ui-http/src/lib/api/reanalysisController.service.ts
+++ b/libs/red-ui-http/src/lib/api/reanalysisController.service.ts
@@ -56,38 +56,38 @@ export class ReanalysisControllerService {
     /**
      * Ocr and reanalyze a file
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public ocrFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
     public ocrFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
     public ocrFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
     public ocrFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling ocrFile.'
+                'Required parameter dossierId was null or undefined when calling ocrFile.'
             );
         }
 
@@ -122,7 +122,7 @@ export class ReanalysisControllerService {
         return this.httpClient.request<any>(
             'post',
             `${this.basePath}/ocr/reanalyze/${encodeURIComponent(
-                String(projectId)
+                String(dossierId)
             )}/${encodeURIComponent(String(fileId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
@@ -134,34 +134,34 @@ export class ReanalysisControllerService {
     }
 
     /**
-     * Ocr and reanalyze multiple files for a project
+     * Ocr and reanalyze multiple files for a dossier
      * None
      * @param body fileIds
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public ocrFiles(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
     public ocrFiles(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
     public ocrFiles(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
     public ocrFiles(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
@@ -169,9 +169,9 @@ export class ReanalysisControllerService {
             throw new Error('Required parameter body was null or undefined when calling ocrFiles.');
         }
 
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling ocrFiles.'
+                'Required parameter dossierId was null or undefined when calling ocrFiles.'
             );
         }
 
@@ -204,7 +204,7 @@ export class ReanalysisControllerService {
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/ocr/reanalyze/${encodeURIComponent(String(projectId))}/bulk`,
+            `${this.basePath}/ocr/reanalyze/${encodeURIComponent(String(dossierId))}/bulk`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -216,35 +216,35 @@ export class ReanalysisControllerService {
     }
 
     /**
-     * Ocr and reanalyze a project
+     * Ocr and reanalyze a dossier
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public ocrProject(
-        projectId: string,
+    public ocrDossier(
+        dossierId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
-    public ocrProject(
-        projectId: string,
+    public ocrDossier(
+        dossierId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
-    public ocrProject(
-        projectId: string,
+    public ocrDossier(
+        dossierId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
-    public ocrProject(
-        projectId: string,
+    public ocrDossier(
+        dossierId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling ocrProject.'
+                'Required parameter dossierId was null or undefined when calling ocrDossier.'
             );
         }
 
@@ -272,7 +272,7 @@ export class ReanalysisControllerService {
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/ocr/reanalyze/${encodeURIComponent(String(projectId))}`,
+            `${this.basePath}/ocr/reanalyze/${encodeURIComponent(String(dossierId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -285,14 +285,14 @@ export class ReanalysisControllerService {
     /**
      * Reanalyze a file
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param priority priority
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public reanalyzeFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         priority?: number,
         observe?: 'body',
@@ -300,7 +300,7 @@ export class ReanalysisControllerService {
     ): Observable<any>;
 
     public reanalyzeFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         priority?: number,
         observe?: 'response',
@@ -308,7 +308,7 @@ export class ReanalysisControllerService {
     ): Observable<HttpResponse<any>>;
 
     public reanalyzeFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         priority?: number,
         observe?: 'events',
@@ -316,15 +316,15 @@ export class ReanalysisControllerService {
     ): Observable<HttpEvent<any>>;
 
     public reanalyzeFile(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         priority?: number,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling reanalyzeFile.'
+                'Required parameter dossierId was null or undefined when calling reanalyzeFile.'
             );
         }
 
@@ -364,7 +364,7 @@ export class ReanalysisControllerService {
         return this.httpClient.request<any>(
             'post',
             `${this.basePath}/reanalyze/${encodeURIComponent(
-                String(projectId)
+                String(dossierId)
             )}/${encodeURIComponent(String(fileId))}`,
             {
                 params: queryParameters,
@@ -377,51 +377,51 @@ export class ReanalysisControllerService {
     }
 
     /**
-     * Reanalyze multiple files for a project
+     * Reanalyze multiple files for a dossier
      * None
      * @param body fileIds
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param force force
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public reanalyzeFilesForProject(
+    public reanalyzeFilesForDossier(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         force?: boolean,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
-    public reanalyzeFilesForProject(
+    public reanalyzeFilesForDossier(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         force?: boolean,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
-    public reanalyzeFilesForProject(
+    public reanalyzeFilesForDossier(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         force?: boolean,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
-    public reanalyzeFilesForProject(
+    public reanalyzeFilesForDossier(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         force?: boolean,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
             throw new Error(
-                'Required parameter body was null or undefined when calling reanalyzeFilesForProject.'
+                'Required parameter body was null or undefined when calling reanalyzeFilesForDossier.'
             );
         }
 
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling reanalyzeFilesForProject.'
+                'Required parameter dossierId was null or undefined when calling reanalyzeFilesForDossier.'
             );
         }
 
@@ -459,7 +459,7 @@ export class ReanalysisControllerService {
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/reanalyze/${encodeURIComponent(String(projectId))}/bulk`,
+            `${this.basePath}/reanalyze/${encodeURIComponent(String(dossierId))}/bulk`,
             {
                 body: body,
                 params: queryParameters,
@@ -472,40 +472,40 @@ export class ReanalysisControllerService {
     }
 
     /**
-     * Reanalyze all files of the project.
+     * Reanalyze all files of the dossier.
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param force force
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public reanalyzeProject(
-        projectId: string,
+    public reanalyzeDossier(
+        dossierId: string,
         force?: boolean,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
-    public reanalyzeProject(
-        projectId: string,
+    public reanalyzeDossier(
+        dossierId: string,
         force?: boolean,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
-    public reanalyzeProject(
-        projectId: string,
+    public reanalyzeDossier(
+        dossierId: string,
         force?: boolean,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
-    public reanalyzeProject(
-        projectId: string,
+    public reanalyzeDossier(
+        dossierId: string,
         force?: boolean,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling reanalyzeProject.'
+                'Required parameter dossierId was null or undefined when calling reanalyzeDossier.'
             );
         }
 
@@ -538,7 +538,7 @@ export class ReanalysisControllerService {
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/reanalyze/${encodeURIComponent(String(projectId))}`,
+            `${this.basePath}/reanalyze/${encodeURIComponent(String(dossierId))}`,
             {
                 params: queryParameters,
                 withCredentials: this.configuration.withCredentials,
@@ -553,35 +553,35 @@ export class ReanalysisControllerService {
      * Exclude or re-include a file to analysis
      * None
      * @param fileId fileId
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param excluded excluded
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public toggleAnalysis(
         fileId: string,
-        projectId: string,
+        dossierId: string,
         excluded?: boolean,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
     public toggleAnalysis(
         fileId: string,
-        projectId: string,
+        dossierId: string,
         excluded?: boolean,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
     public toggleAnalysis(
         fileId: string,
-        projectId: string,
+        dossierId: string,
         excluded?: boolean,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
     public toggleAnalysis(
         fileId: string,
-        projectId: string,
+        dossierId: string,
         excluded?: boolean,
         observe: any = 'body',
         reportProgress: boolean = false
@@ -592,9 +592,9 @@ export class ReanalysisControllerService {
             );
         }
 
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling toggleAnalysis.'
+                'Required parameter dossierId was null or undefined when calling toggleAnalysis.'
             );
         }
 
@@ -625,7 +625,7 @@ export class ReanalysisControllerService {
         return this.httpClient.request<any>(
             'post',
             `${this.basePath}/toggle-analysis/${encodeURIComponent(
-                String(projectId)
+                String(dossierId)
             )}/${encodeURIComponent(String(fileId))}`,
             {
                 params: queryParameters,
diff --git a/libs/red-ui-http/src/lib/api/redactionLogController.service.ts b/libs/red-ui-http/src/lib/api/redactionLogController.service.ts
index 047f6a143..4d2fd116a 100644
--- a/libs/red-ui-http/src/lib/api/redactionLogController.service.ts
+++ b/libs/red-ui-http/src/lib/api/redactionLogController.service.ts
@@ -28,7 +28,11 @@ export class RedactionLogControllerService {
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
-    constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+    constructor(
+        protected httpClient: HttpClient,
+        @Optional() @Inject(BASE_PATH) basePath: string,
+        @Optional() configuration: Configuration
+    ) {
         if (basePath) {
             this.basePath = basePath;
         }
@@ -55,39 +59,62 @@ export class RedactionLogControllerService {
     /**
      * Gets the redaction changelog for a fileId
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getRedactionChangeLog(projectId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable<RedactionChangeLog>;
     public getRedactionChangeLog(
-        projectId: string,
+        dossierId: string,
+        fileId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<RedactionChangeLog>;
+    public getRedactionChangeLog(
+        dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<RedactionChangeLog>>;
-    public getRedactionChangeLog(projectId: string, fileId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<RedactionChangeLog>>;
-    public getRedactionChangeLog(projectId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling getRedactionLog.');
+    public getRedactionChangeLog(
+        dossierId: string,
+        fileId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<RedactionChangeLog>>;
+    public getRedactionChangeLog(
+        dossierId: string,
+        fileId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling getRedactionLog.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling getRedactionLog.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling getRedactionLog.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -97,7 +124,9 @@ export class RedactionLogControllerService {
 
         return this.httpClient.request<RedactionChangeLog>(
             'get',
-            `${this.basePath}/redactionChnageLog/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/redactionChnageLog/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -110,34 +139,62 @@ export class RedactionLogControllerService {
     /**
      * Gets the redaction log for a fileId
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getRedactionLog(projectId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable<RedactionLog>;
-    public getRedactionLog(projectId: string, fileId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<RedactionLog>>;
-    public getRedactionLog(projectId: string, fileId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<RedactionLog>>;
-    public getRedactionLog(projectId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling getRedactionLog1.');
+    public getRedactionLog(
+        dossierId: string,
+        fileId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<RedactionLog>;
+    public getRedactionLog(
+        dossierId: string,
+        fileId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<RedactionLog>>;
+    public getRedactionLog(
+        dossierId: string,
+        fileId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<RedactionLog>>;
+    public getRedactionLog(
+        dossierId: string,
+        fileId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling getRedactionLog1.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling getRedactionLog1.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling getRedactionLog1.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -147,7 +204,9 @@ export class RedactionLogControllerService {
 
         return this.httpClient.request<RedactionLog>(
             'get',
-            `${this.basePath}/redactionLog/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/redactionLog/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -160,34 +219,62 @@ export class RedactionLogControllerService {
     /**
      * Gets the section grid for a fileId
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getSectionGrid(projectId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable<SectionGrid>;
-    public getSectionGrid(projectId: string, fileId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<SectionGrid>>;
-    public getSectionGrid(projectId: string, fileId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<SectionGrid>>;
-    public getSectionGrid(projectId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling getSectionGrid.');
+    public getSectionGrid(
+        dossierId: string,
+        fileId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<SectionGrid>;
+    public getSectionGrid(
+        dossierId: string,
+        fileId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<SectionGrid>>;
+    public getSectionGrid(
+        dossierId: string,
+        fileId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<SectionGrid>>;
+    public getSectionGrid(
+        dossierId: string,
+        fileId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling getSectionGrid.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling getSectionGrid.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling getSectionGrid.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -197,7 +284,9 @@ export class RedactionLogControllerService {
 
         return this.httpClient.request<SectionGrid>(
             'get',
-            `${this.basePath}/sectionGrid/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/sectionGrid/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
diff --git a/libs/red-ui-http/src/lib/api/ruleSetController.service.ts b/libs/red-ui-http/src/lib/api/ruleSetController.service.ts
deleted file mode 100644
index ecde2f793..000000000
--- a/libs/red-ui-http/src/lib/api/ruleSetController.service.ts
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * API Documentation for Redaction Gateway
- * Description for redaction
- *
- * OpenAPI spec version: 1.0
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */ /* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/member-ordering */
-
-import { Inject, Injectable, Optional } from '@angular/core';
-import { HttpClient, HttpEvent, HttpHeaders, HttpResponse } from '@angular/common/http';
-
-import { Observable } from 'rxjs';
-
-import { RuleSetModel } from '../model/ruleSetModel';
-
-import { BASE_PATH } from '../variables';
-import { Configuration } from '../configuration';
-
-@Injectable()
-export class RuleSetControllerService {
-    public defaultHeaders = new HttpHeaders();
-    public configuration = new Configuration();
-    protected basePath = '';
-
-    constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
-        if (basePath) {
-            this.basePath = basePath;
-        }
-        if (configuration) {
-            this.configuration = configuration;
-            this.basePath = basePath || configuration.basePath || this.basePath;
-        }
-    }
-
-    /**
-     * Creates a new RuleSets or updates an existing one.
-     * None
-     * @param body ruleSetModel
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public createOrUpdateRuleSet(body: RuleSetModel, observe?: 'body', reportProgress?: boolean): Observable<RuleSetModel>;
-
-    public createOrUpdateRuleSet(body: RuleSetModel, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<RuleSetModel>>;
-
-    public createOrUpdateRuleSet(body: RuleSetModel, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<RuleSetModel>>;
-
-    public createOrUpdateRuleSet(body: RuleSetModel, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling createOrUpdateRuleSet.');
-        }
-
-        let headers = this.defaultHeaders;
-
-        // authentication (RED-OAUTH) required
-        if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        // to determine the Accept header
-        const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        if (httpHeaderAcceptSelected !== undefined) {
-            headers = headers.set('Accept', httpHeaderAcceptSelected);
-        }
-
-        // to determine the Content-Type header
-        const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
-        if (httpContentTypeSelected !== undefined) {
-            headers = headers.set('Content-Type', httpContentTypeSelected);
-        }
-
-        return this.httpClient.request<RuleSetModel>('post', `${this.basePath}/rule-set`, {
-            body: body,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
-    }
-
-    /**
-     * Get a specific RuleSet by its ID
-     * None
-     * @param ruleSetId ruleSetId
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public getAllRuleSets(ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
-
-    public getAllRuleSets(ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
-
-    public getAllRuleSets(ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
-
-    public getAllRuleSets(ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling getAllRuleSets.');
-        }
-
-        let headers = this.defaultHeaders;
-
-        // authentication (RED-OAUTH) required
-        if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        // to determine the Accept header
-        const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        if (httpHeaderAcceptSelected !== undefined) {
-            headers = headers.set('Accept', httpHeaderAcceptSelected);
-        }
-
-        // to determine the Content-Type header
-        const consumes: string[] = [];
-
-        return this.httpClient.request<any>('delete', `${this.basePath}/rule-set/${encodeURIComponent(String(ruleSetId))}`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
-    }
-
-    /**
-     * Lists all existing RuleSets.
-     * None
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public getAllRuleSets1(observe?: 'body', reportProgress?: boolean): Observable<Array<RuleSetModel>>;
-
-    public getAllRuleSets1(observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Array<RuleSetModel>>>;
-
-    public getAllRuleSets1(observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Array<RuleSetModel>>>;
-
-    public getAllRuleSets1(observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        let headers = this.defaultHeaders;
-
-        // authentication (RED-OAUTH) required
-        if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        // to determine the Accept header
-        const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        if (httpHeaderAcceptSelected !== undefined) {
-            headers = headers.set('Accept', httpHeaderAcceptSelected);
-        }
-
-        // to determine the Content-Type header
-        const consumes: string[] = [];
-
-        return this.httpClient.request<Array<RuleSetModel>>('get', `${this.basePath}/rule-set`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
-    }
-
-    /**
-     * Get a specific RuleSet by its ID
-     * None
-     * @param ruleSetId ruleSetId
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public getAllRuleSets2(ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<RuleSetModel>;
-
-    public getAllRuleSets2(ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<RuleSetModel>>;
-
-    public getAllRuleSets2(ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<RuleSetModel>>;
-
-    public getAllRuleSets2(ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling getAllRuleSets2.');
-        }
-
-        let headers = this.defaultHeaders;
-
-        // authentication (RED-OAUTH) required
-        if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
-            headers = headers.set('Authorization', 'Bearer ' + accessToken);
-        }
-
-        // to determine the Accept header
-        const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        if (httpHeaderAcceptSelected !== undefined) {
-            headers = headers.set('Accept', httpHeaderAcceptSelected);
-        }
-
-        // to determine the Content-Type header
-        const consumes: string[] = [];
-
-        return this.httpClient.request<RuleSetModel>('get', `${this.basePath}/rule-set/${encodeURIComponent(String(ruleSetId))}`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
-    }
-
-    /**
-     * @param consumes string[] mime-types
-     * @return true: consumes contains 'multipart/form-data', false: otherwise
-     */
-    private canConsumeForm(consumes: string[]): boolean {
-        const form = 'multipart/form-data';
-        for (const consume of consumes) {
-            if (form === consume) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/libs/red-ui-http/src/lib/api/rulesController.service.ts b/libs/red-ui-http/src/lib/api/rulesController.service.ts
index c92d75ccf..eabc5a2ab 100644
--- a/libs/red-ui-http/src/lib/api/rulesController.service.ts
+++ b/libs/red-ui-http/src/lib/api/rulesController.service.ts
@@ -27,7 +27,11 @@ export class RulesControllerService {
     public configuration = new Configuration();
     protected basePath = '';
 
-    constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+    constructor(
+        protected httpClient: HttpClient,
+        @Optional() @Inject(BASE_PATH) basePath: string,
+        @Optional() configuration: Configuration
+    ) {
         if (basePath) {
             this.basePath = basePath;
         }
@@ -40,32 +44,54 @@ export class RulesControllerService {
     /**
      * Returns object containing the currently used Drools rules.
      *
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public downloadRules(ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<Rules>;
+    public downloadRules(
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<Rules>;
 
-    public downloadRules(ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<Rules>>;
+    public downloadRules(
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<Rules>>;
 
-    public downloadRules(ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<Rules>>;
+    public downloadRules(
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<Rules>>;
 
-    public downloadRules(ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling downloadRules.');
+    public downloadRules(
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling downloadRules.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -73,43 +99,69 @@ export class RulesControllerService {
         // to determine the Content-Type header
         const consumes: string[] = [];
 
-        return this.httpClient.request<Rules>('get', `${this.basePath}/rules/${encodeURIComponent(String(ruleSetId))}`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<Rules>(
+            'get',
+            `${this.basePath}/rules/${encodeURIComponent(String(dossierTemplateId))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Returns file containing the currently used Drools rules.
      *
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public downloadRulesFile(ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public downloadRulesFile(
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
 
-    public downloadRulesFile(ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public downloadRulesFile(
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
 
-    public downloadRulesFile(ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public downloadRulesFile(
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
 
-    public downloadRulesFile(ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling downloadRulesFile.');
+    public downloadRulesFile(
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling downloadRulesFile.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -117,51 +169,74 @@ export class RulesControllerService {
         // to determine the Content-Type header
         const consumes: string[] = [];
 
-        return this.httpClient.request<any>('get', `${this.basePath}/rules/${encodeURIComponent(String(ruleSetId))}/download`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<any>(
+            'get',
+            `${this.basePath}/rules/${encodeURIComponent(String(dossierTemplateId))}/download`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Takes object containing string or rules as argument, which will be used by the redaction service.
      *
      * @param body rules
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public uploadRules(body: Rules, observe?: 'body', reportProgress?: boolean): Observable<any>;
 
-    public uploadRules(body: Rules, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public uploadRules(
+        body: Rules,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
 
-    public uploadRules(body: Rules, bserve?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public uploadRules(
+        body: Rules,
+        bserve?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
 
-    public uploadRules(body: Rules, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public uploadRules(
+        body: Rules,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling uploadRules.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling uploadRules.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
@@ -179,36 +254,64 @@ export class RulesControllerService {
      * Takes object containing string or rules as argument, which will be used by the redaction service.
      *
      * @param file
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public uploadRulesFileForm(file: Blob, ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public uploadRulesFileForm(
+        file: Blob,
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
 
-    public uploadRulesFileForm(file: Blob, ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public uploadRulesFileForm(
+        file: Blob,
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
 
-    public uploadRulesFileForm(file: Blob, ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public uploadRulesFileForm(
+        file: Blob,
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
 
-    public uploadRulesFileForm(file: Blob, ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public uploadRulesFileForm(
+        file: Blob,
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (file === null || file === undefined) {
-            throw new Error('Required parameter file was null or undefined when calling uploadRulesFile.');
+            throw new Error(
+                'Required parameter file was null or undefined when calling uploadRulesFile.'
+            );
         }
 
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling uploadRulesFile.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling uploadRulesFile.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -234,13 +337,17 @@ export class RulesControllerService {
             formParams = (formParams.append('file', <any>file) as any) || formParams;
         }
 
-        return this.httpClient.request<any>('post', `${this.basePath}/rules/${encodeURIComponent(String(ruleSetId))}/upload`, {
-            body: convertFormParamsToString ? formParams.toString() : formParams,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<any>(
+            'post',
+            `${this.basePath}/rules/${encodeURIComponent(String(dossierTemplateId))}/upload`,
+            {
+                body: convertFormParamsToString ? formParams.toString() : formParams,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
diff --git a/libs/red-ui-http/src/lib/api/statusController.service.ts b/libs/red-ui-http/src/lib/api/statusController.service.ts
index 9464c4f2d..5e2d4f1ba 100644
--- a/libs/red-ui-http/src/lib/api/statusController.service.ts
+++ b/libs/red-ui-http/src/lib/api/statusController.service.ts
@@ -44,41 +44,41 @@ export class StatusControllerService {
     /**
      * Gets the status for a file.
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public getFileStatus(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<FileStatus>;
 
     public getFileStatus(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<FileStatus>>;
 
     public getFileStatus(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<FileStatus>>;
 
     public getFileStatus(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling getFileStatus.'
+                'Required parameter dossierId was null or undefined when calling getFileStatus.'
             );
         }
 
@@ -112,7 +112,7 @@ export class StatusControllerService {
 
         return this.httpClient.request<FileStatus>(
             'get',
-            `${this.basePath}/status/${encodeURIComponent(String(projectId))}/${encodeURIComponent(
+            `${this.basePath}/status/${encodeURIComponent(String(dossierId))}/${encodeURIComponent(
                 String(fileId)
             )}`,
             {
@@ -125,38 +125,38 @@ export class StatusControllerService {
     }
 
     /**
-     * Gets the status for all files of a list of projects.
+     * Gets the status for all files of a list of dossiers.
      * None
-     * @param body projectIds
+     * @param body dossierIds
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getFileStatusForProjects(
+    public getFileStatusForDossiers(
         body: Array<string>,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<{ [key: string]: Array<FileStatus> }>;
 
-    public getFileStatusForProjects(
+    public getFileStatusForDossiers(
         body: Array<string>,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<{ [key: string]: Array<FileStatus> }>>;
 
-    public getFileStatusForProjects(
+    public getFileStatusForDossiers(
         body: Array<string>,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<{ [key: string]: Array<FileStatus> }>>;
 
-    public getFileStatusForProjects(
+    public getFileStatusForDossiers(
         body: Array<string>,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
         if (body === null || body === undefined) {
             throw new Error(
-                'Required parameter body was null or undefined when calling getFileStatusForProjects.'
+                'Required parameter body was null or undefined when calling getFileStatusForDossiers.'
             );
         }
 
@@ -201,38 +201,38 @@ export class StatusControllerService {
     }
 
     /**
-     * Gets the status for all files in a project.
+     * Gets the status for all files in a dossier.
      * None
-     * @param projectId The id of the project you want the status for.
+     * @param dossierId The id of the dossier you want the status for.
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getProjectStatus(
-        projectId: string,
+    public getDossierStatus(
+        dossierId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<Array<FileStatus>>;
 
-    public getProjectStatus(
-        projectId: string,
+    public getDossierStatus(
+        dossierId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<Array<FileStatus>>>;
 
-    public getProjectStatus(
-        projectId: string,
+    public getDossierStatus(
+        dossierId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<Array<FileStatus>>>;
 
-    public getProjectStatus(
-        projectId: string,
+    public getDossierStatus(
+        dossierId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling getProjectStatus.'
+                'Required parameter dossierId was null or undefined when calling getDossierStatus.'
             );
         }
 
@@ -260,7 +260,7 @@ export class StatusControllerService {
 
         return this.httpClient.request<Array<FileStatus>>(
             'get',
-            `${this.basePath}/status/${encodeURIComponent(String(projectId))}`,
+            `${this.basePath}/status/${encodeURIComponent(String(dossierId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -273,14 +273,14 @@ export class StatusControllerService {
     /**
      * Assigns a reviewer for a file.
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param reviewerId reviewerId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public setFileReviewer(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         reviewerId: string,
         observe?: 'body',
@@ -288,7 +288,7 @@ export class StatusControllerService {
     ): Observable<any>;
 
     public setFileReviewer(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         reviewerId: string,
         observe?: 'response',
@@ -296,7 +296,7 @@ export class StatusControllerService {
     ): Observable<HttpResponse<any>>;
 
     public setFileReviewer(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         reviewerId: string,
         observe?: 'events',
@@ -304,15 +304,15 @@ export class StatusControllerService {
     ): Observable<HttpEvent<any>>;
 
     public setFileReviewer(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         reviewerId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling setFileReviewer.'
+                'Required parameter dossierId was null or undefined when calling setFileReviewer.'
             );
         }
 
@@ -352,7 +352,7 @@ export class StatusControllerService {
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/status/${encodeURIComponent(String(projectId))}/${encodeURIComponent(
+            `${this.basePath}/status/${encodeURIComponent(String(dossierId))}/${encodeURIComponent(
                 String(fileId)
             )}/${encodeURIComponent(String(reviewerId))}`,
             {
@@ -368,14 +368,14 @@ export class StatusControllerService {
      * Assign a reviewer for a list of files.
      * None
      * @param body fileIds
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param reviewerId reviewerId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public setFileReviewerForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         reviewerId: string,
         observe?: 'body',
         reportProgress?: boolean
@@ -383,7 +383,7 @@ export class StatusControllerService {
 
     public setFileReviewerForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         reviewerId: string,
         observe?: 'response',
         reportProgress?: boolean
@@ -391,7 +391,7 @@ export class StatusControllerService {
 
     public setFileReviewerForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         reviewerId: string,
         observe?: 'events',
         reportProgress?: boolean
@@ -399,7 +399,7 @@ export class StatusControllerService {
 
     public setFileReviewerForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         reviewerId: string,
         observe: any = 'body',
         reportProgress: boolean = false
@@ -410,9 +410,9 @@ export class StatusControllerService {
             );
         }
 
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling setFileReviewerForList.'
+                'Required parameter dossierId was null or undefined when calling setFileReviewerForList.'
             );
         }
 
@@ -452,7 +452,7 @@ export class StatusControllerService {
         return this.httpClient.request<any>(
             'post',
             `${this.basePath}/status/${encodeURIComponent(
-                String(projectId)
+                String(dossierId)
             )}/bulk/${encodeURIComponent(String(reviewerId))}`,
             {
                 body: body,
@@ -467,41 +467,41 @@ export class StatusControllerService {
     /**
      * Sets the status APPROVED for a file.
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public setStatusApproved(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
 
     public setStatusApproved(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
 
     public setStatusApproved(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
 
     public setStatusApproved(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling setStatusApproved.'
+                'Required parameter dossierId was null or undefined when calling setStatusApproved.'
             );
         }
 
@@ -536,7 +536,7 @@ export class StatusControllerService {
         return this.httpClient.request<any>(
             'post',
             `${this.basePath}/status/approved/${encodeURIComponent(
-                String(projectId)
+                String(dossierId)
             )}/${encodeURIComponent(String(fileId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
@@ -551,34 +551,34 @@ export class StatusControllerService {
      * Sets the status APPROVED for a list of files.
      * None
      * @param body fileIds
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public setStatusApprovedForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
 
     public setStatusApprovedForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
 
     public setStatusApprovedForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
 
     public setStatusApprovedForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
@@ -588,9 +588,9 @@ export class StatusControllerService {
             );
         }
 
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling setStatusApprovedForList.'
+                'Required parameter dossierId was null or undefined when calling setStatusApprovedForList.'
             );
         }
 
@@ -623,7 +623,7 @@ export class StatusControllerService {
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/status/approved/${encodeURIComponent(String(projectId))}/bulk`,
+            `${this.basePath}/status/approved/${encodeURIComponent(String(dossierId))}/bulk`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -638,35 +638,35 @@ export class StatusControllerService {
      * Sets the status UNDER_APPROVAL for a file.
      * None
      * @param fileId fileId
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param approverId approverId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public setStatusUnderApproval(
         fileId: string,
-        projectId: string,
+        dossierId: string,
         approverId?: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
     public setStatusUnderApproval(
         fileId: string,
-        projectId: string,
+        dossierId: string,
         approverId?: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
     public setStatusUnderApproval(
         fileId: string,
-        projectId: string,
+        dossierId: string,
         approverId?: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
     public setStatusUnderApproval(
         fileId: string,
-        projectId: string,
+        dossierId: string,
         approverId?: string,
         observe: any = 'body',
         reportProgress: boolean = false
@@ -677,9 +677,9 @@ export class StatusControllerService {
             );
         }
 
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling setStatusUnderApproval.'
+                'Required parameter dossierId was null or undefined when calling setStatusUnderApproval.'
             );
         }
 
@@ -713,7 +713,7 @@ export class StatusControllerService {
         return this.httpClient.request<any>(
             'post',
             `${this.basePath}/status/underapproval/${encodeURIComponent(
-                String(projectId)
+                String(dossierId)
             )}/${encodeURIComponent(String(fileId))}`,
             {
                 params: queryParameters,
@@ -730,34 +730,34 @@ export class StatusControllerService {
      * None
      * @param body fileIds
      * @param approverId approverId
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public setStatusUnderApprovalForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         approverId?: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
     public setStatusUnderApprovalForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         approverId?: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
     public setStatusUnderApprovalForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         approverId?: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
     public setStatusUnderApprovalForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         approverId?: string,
         observe: any = 'body',
         reportProgress: boolean = false
@@ -774,9 +774,9 @@ export class StatusControllerService {
             );
         }
 
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling setStatusUnderApprovalForList.'
+                'Required parameter dossierId was null or undefined when calling setStatusUnderApprovalForList.'
             );
         }
 
@@ -812,7 +812,7 @@ export class StatusControllerService {
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/status/underapproval/${encodeURIComponent(String(projectId))}/bulk`,
+            `${this.basePath}/status/underapproval/${encodeURIComponent(String(dossierId))}/bulk`,
             {
                 body: body,
                 params: queryParameters,
@@ -827,41 +827,41 @@ export class StatusControllerService {
     /**
      * Sets the status UNDER_REVIEW for a file.
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public setStatusUnderReview(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
 
     public setStatusUnderReview(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
 
     public setStatusUnderReview(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
 
     public setStatusUnderReview(
-        projectId: string,
+        dossierId: string,
         fileId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling setStatusUnderReview.'
+                'Required parameter dossierId was null or undefined when calling setStatusUnderReview.'
             );
         }
 
@@ -896,7 +896,7 @@ export class StatusControllerService {
         return this.httpClient.request<any>(
             'post',
             `${this.basePath}/status/underreview/${encodeURIComponent(
-                String(projectId)
+                String(dossierId)
             )}/${encodeURIComponent(String(fileId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
@@ -911,34 +911,34 @@ export class StatusControllerService {
      * Sets the status UNDER_REVIEW for a list of files.
      * None
      * @param body fileIds
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
     public setStatusUnderReviewForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         observe?: 'body',
         reportProgress?: boolean
     ): Observable<any>;
 
     public setStatusUnderReviewForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         observe?: 'response',
         reportProgress?: boolean
     ): Observable<HttpResponse<any>>;
 
     public setStatusUnderReviewForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         observe?: 'events',
         reportProgress?: boolean
     ): Observable<HttpEvent<any>>;
 
     public setStatusUnderReviewForList(
         body: Array<string>,
-        projectId: string,
+        dossierId: string,
         observe: any = 'body',
         reportProgress: boolean = false
     ): Observable<any> {
@@ -948,9 +948,9 @@ export class StatusControllerService {
             );
         }
 
-        if (projectId === null || projectId === undefined) {
+        if (dossierId === null || dossierId === undefined) {
             throw new Error(
-                'Required parameter projectId was null or undefined when calling setStatusUnderReviewForList.'
+                'Required parameter dossierId was null or undefined when calling setStatusUnderReviewForList.'
             );
         }
 
@@ -983,7 +983,7 @@ export class StatusControllerService {
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/status/underreview/${encodeURIComponent(String(projectId))}/bulk`,
+            `${this.basePath}/status/underreview/${encodeURIComponent(String(dossierId))}/bulk`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
diff --git a/libs/red-ui-http/src/lib/api/versionsController.service.ts b/libs/red-ui-http/src/lib/api/versionsController.service.ts
index 1416c0a41..65fa2ddb1 100644
--- a/libs/red-ui-http/src/lib/api/versionsController.service.ts
+++ b/libs/red-ui-http/src/lib/api/versionsController.service.ts
@@ -27,7 +27,11 @@ export class VersionsControllerService {
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
-    constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+    constructor(
+        protected httpClient: HttpClient,
+        @Optional() @Inject(BASE_PATH) basePath: string,
+        @Optional() configuration: Configuration
+    ) {
         if (basePath) {
             this.basePath = basePath;
         }
@@ -55,40 +59,70 @@ export class VersionsControllerService {
      * Retrieves current version for dossier dictionary.
      * None
      * @param dossierId dossierId
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getDossierDictionaryVersion(dossierId: string, ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<number>;
-    public getDossierDictionaryVersion(dossierId: string, ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<number>>;
-    public getDossierDictionaryVersion(dossierId: string, ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<number>>;
-    public getDossierDictionaryVersion(dossierId: string, ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public getDossierDictionaryVersion(
+        dossierId: string,
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<number>;
+    public getDossierDictionaryVersion(
+        dossierId: string,
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<number>>;
+    public getDossierDictionaryVersion(
+        dossierId: string,
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<number>>;
+    public getDossierDictionaryVersion(
+        dossierId: string,
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (dossierId === null || dossierId === undefined) {
-            throw new Error('Required parameter dossierId was null or undefined when calling getDossierDictionaryVersion.');
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling getDossierDictionaryVersion.'
+            );
         }
 
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling getDossierDictionaryVersion.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling getDossierDictionaryVersion.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         return this.httpClient.request<number>(
             'get',
-            `${this.basePath}/version/dossier/${encodeURIComponent(String(ruleSetId))}/${encodeURIComponent(String(dossierId))}`,
+            `${this.basePath}/version/dossier/${encodeURIComponent(
+                String(dossierTemplateId)
+            )}/${encodeURIComponent(String(dossierId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -101,22 +135,40 @@ export class VersionsControllerService {
     /**
      * Retrieves current versions.
      * None
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getVersions(ruleSetId: Array<string>, observe?: 'body', reportProgress?: boolean): Observable<{ [key: string]: VersionsResponse }>;
-    public getVersions(ruleSetId: Array<string>, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<{ [key: string]: VersionsResponse }>>;
-    public getVersions(ruleSetId: Array<string>, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<{ [key: string]: VersionsResponse }>>;
-    public getVersions(ruleSetId: Array<string>, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling getVersions.');
+    public getVersions(
+        dossierTemplateId: Array<string>,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<{ [key: string]: VersionsResponse }>;
+    public getVersions(
+        dossierTemplateId: Array<string>,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<{ [key: string]: VersionsResponse }>>;
+    public getVersions(
+        dossierTemplateId: Array<string>,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<{ [key: string]: VersionsResponse }>>;
+    public getVersions(
+        dossierTemplateId: Array<string>,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling getVersions.'
+            );
         }
 
         let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
-        if (ruleSetId) {
-            ruleSetId.forEach((element) => {
-                queryParameters = queryParameters.append('ruleSetId', <any>element);
+        if (dossierTemplateId) {
+            dossierTemplateId.forEach((element) => {
+                queryParameters = queryParameters.append('dossierTemplateId', <any>element);
             });
         }
 
@@ -124,23 +176,31 @@ export class VersionsControllerService {
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['*/*'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
-        return this.httpClient.request<{ [key: string]: VersionsResponse }>('get', `${this.basePath}/version`, {
-            params: queryParameters,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<{ [key: string]: VersionsResponse }>(
+            'get',
+            `${this.basePath}/version`,
+            {
+                params: queryParameters,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 }
diff --git a/libs/red-ui-http/src/lib/api/viewedPagesController.service.ts b/libs/red-ui-http/src/lib/api/viewedPagesController.service.ts
index 40239b008..237077423 100644
--- a/libs/red-ui-http/src/lib/api/viewedPagesController.service.ts
+++ b/libs/red-ui-http/src/lib/api/viewedPagesController.service.ts
@@ -27,7 +27,11 @@ export class ViewedPagesControllerService {
     public configuration = new Configuration();
     protected basePath = '';
 
-    constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+    constructor(
+        protected httpClient: HttpClient,
+        @Optional() @Inject(BASE_PATH) basePath: string,
+        @Optional() configuration: Configuration
+    ) {
         if (basePath) {
             this.basePath = basePath;
         }
@@ -41,55 +45,90 @@ export class ViewedPagesControllerService {
      * Adds a page to the viewed pages
      * None
      * @param body viewedPagesRequest
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public addPage(body: ViewedPagesRequest, projectId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public addPage(
+        body: ViewedPagesRequest,
+        dossierId: string,
+        fileId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
 
-    public addPage(body: ViewedPagesRequest, projectId: string, fileId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public addPage(
+        body: ViewedPagesRequest,
+        dossierId: string,
+        fileId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
 
-    public addPage(body: ViewedPagesRequest, projectId: string, fileId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public addPage(
+        body: ViewedPagesRequest,
+        dossierId: string,
+        fileId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
 
-    public addPage(body: ViewedPagesRequest, projectId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public addPage(
+        body: ViewedPagesRequest,
+        dossierId: string,
+        fileId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
             throw new Error('Required parameter body was null or undefined when calling addPage.');
         }
 
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling addPage.');
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling addPage.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling addPage.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling addPage.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
         return this.httpClient.request<any>(
             'post',
-            `${this.basePath}/viewedPages/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/viewedPages/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 body: body,
                 withCredentials: this.configuration.withCredentials,
@@ -103,37 +142,65 @@ export class ViewedPagesControllerService {
     /**
      * Gets the viewed pages for a file, depending on the users role.
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getViewedPages(projectId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable<ViewedPages>;
+    public getViewedPages(
+        dossierId: string,
+        fileId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<ViewedPages>;
 
-    public getViewedPages(projectId: string, fileId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<ViewedPages>>;
+    public getViewedPages(
+        dossierId: string,
+        fileId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<ViewedPages>>;
 
-    public getViewedPages(projectId: string, fileId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<ViewedPages>>;
+    public getViewedPages(
+        dossierId: string,
+        fileId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<ViewedPages>>;
 
-    public getViewedPages(projectId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling getViewedPages.');
+    public getViewedPages(
+        dossierId: string,
+        fileId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling getViewedPages.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling getViewedPages.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling getViewedPages.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -143,7 +210,9 @@ export class ViewedPagesControllerService {
 
         return this.httpClient.request<ViewedPages>(
             'get',
-            `${this.basePath}/viewedPages/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}`,
+            `${this.basePath}/viewedPages/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -156,42 +225,76 @@ export class ViewedPagesControllerService {
     /**
      * Removes a page to the viewed pages
      * None
-     * @param projectId projectId
+     * @param dossierId dossierId
      * @param fileId fileId
      * @param page page
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public removePage(projectId: string, fileId: string, page: number, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public removePage(
+        dossierId: string,
+        fileId: string,
+        page: number,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
 
-    public removePage(projectId: string, fileId: string, page: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public removePage(
+        dossierId: string,
+        fileId: string,
+        page: number,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
 
-    public removePage(projectId: string, fileId: string, page: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public removePage(
+        dossierId: string,
+        fileId: string,
+        page: number,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
 
-    public removePage(projectId: string, fileId: string, page: number, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling removePage.');
+    public removePage(
+        dossierId: string,
+        fileId: string,
+        page: number,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierId === null || dossierId === undefined) {
+            throw new Error(
+                'Required parameter dossierId was null or undefined when calling removePage.'
+            );
         }
 
         if (fileId === null || fileId === undefined) {
-            throw new Error('Required parameter fileId was null or undefined when calling removePage.');
+            throw new Error(
+                'Required parameter fileId was null or undefined when calling removePage.'
+            );
         }
 
         if (page === null || page === undefined) {
-            throw new Error('Required parameter page was null or undefined when calling removePage.');
+            throw new Error(
+                'Required parameter page was null or undefined when calling removePage.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -201,7 +304,9 @@ export class ViewedPagesControllerService {
 
         return this.httpClient.request<any>(
             'delete',
-            `${this.basePath}/viewedPages/${encodeURIComponent(String(projectId))}/${encodeURIComponent(String(fileId))}/${encodeURIComponent(String(page))}`,
+            `${this.basePath}/viewedPages/${encodeURIComponent(
+                String(dossierId)
+            )}/${encodeURIComponent(String(fileId))}/${encodeURIComponent(String(page))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
diff --git a/libs/red-ui-http/src/lib/api/watermarkController.service.ts b/libs/red-ui-http/src/lib/api/watermarkController.service.ts
index bf32bd2b3..952253a95 100644
--- a/libs/red-ui-http/src/lib/api/watermarkController.service.ts
+++ b/libs/red-ui-http/src/lib/api/watermarkController.service.ts
@@ -26,7 +26,11 @@ export class WatermarkControllerService {
     public configuration = new Configuration();
     protected basePath = '';
 
-    constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+    constructor(
+        protected httpClient: HttpClient,
+        @Optional() @Inject(BASE_PATH) basePath: string,
+        @Optional() configuration: Configuration
+    ) {
         if (basePath) {
             this.basePath = basePath;
         }
@@ -39,32 +43,54 @@ export class WatermarkControllerService {
     /**
      * Remove watermark configuration
      * None
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public deleteWatermark(ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<any>;
+    public deleteWatermark(
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<any>;
 
-    public deleteWatermark(ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<any>>;
+    public deleteWatermark(
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<any>>;
 
-    public deleteWatermark(ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
+    public deleteWatermark(
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<any>>;
 
-    public deleteWatermark(ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling deleteWatermark.');
+    public deleteWatermark(
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling deleteWatermark.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = [];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -72,43 +98,69 @@ export class WatermarkControllerService {
         // to determine the Content-Type header
         const consumes: string[] = [];
 
-        return this.httpClient.request<any>('delete', `${this.basePath}/watermark/${encodeURIComponent(String(ruleSetId))}`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<any>(
+            'delete',
+            `${this.basePath}/watermark/${encodeURIComponent(String(dossierTemplateId))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Get the current watermark configuration
      * None
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public getWatermark(ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<WatermarkModel>;
+    public getWatermark(
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<WatermarkModel>;
 
-    public getWatermark(ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<WatermarkModel>>;
+    public getWatermark(
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<WatermarkModel>>;
 
-    public getWatermark(ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<WatermarkModel>>;
+    public getWatermark(
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<WatermarkModel>>;
 
-    public getWatermark(ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling getWatermark.');
+    public getWatermark(
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling getWatermark.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
@@ -116,66 +168,103 @@ export class WatermarkControllerService {
         // to determine the Content-Type header
         const consumes: string[] = [];
 
-        return this.httpClient.request<WatermarkModel>('get', `${this.basePath}/watermark/${encodeURIComponent(String(ruleSetId))}`, {
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<WatermarkModel>(
+            'get',
+            `${this.basePath}/watermark/${encodeURIComponent(String(dossierTemplateId))}`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
      * Save/Update watermark configuration
      * None
      * @param body watermark
-     * @param ruleSetId ruleSetId
+     * @param dossierTemplateId dossierTemplateId
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public saveWatermark(body: WatermarkModel, ruleSetId: string, observe?: 'body', reportProgress?: boolean): Observable<WatermarkModel>;
+    public saveWatermark(
+        body: WatermarkModel,
+        dossierTemplateId: string,
+        observe?: 'body',
+        reportProgress?: boolean
+    ): Observable<WatermarkModel>;
 
-    public saveWatermark(body: WatermarkModel, ruleSetId: string, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<WatermarkModel>>;
+    public saveWatermark(
+        body: WatermarkModel,
+        dossierTemplateId: string,
+        observe?: 'response',
+        reportProgress?: boolean
+    ): Observable<HttpResponse<WatermarkModel>>;
 
-    public saveWatermark(body: WatermarkModel, ruleSetId: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<WatermarkModel>>;
+    public saveWatermark(
+        body: WatermarkModel,
+        dossierTemplateId: string,
+        observe?: 'events',
+        reportProgress?: boolean
+    ): Observable<HttpEvent<WatermarkModel>>;
 
-    public saveWatermark(body: WatermarkModel, ruleSetId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
+    public saveWatermark(
+        body: WatermarkModel,
+        dossierTemplateId: string,
+        observe: any = 'body',
+        reportProgress: boolean = false
+    ): Observable<any> {
         if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling saveWatermark.');
+            throw new Error(
+                'Required parameter body was null or undefined when calling saveWatermark.'
+            );
         }
 
-        if (ruleSetId === null || ruleSetId === undefined) {
-            throw new Error('Required parameter ruleSetId was null or undefined when calling saveWatermark.');
+        if (dossierTemplateId === null || dossierTemplateId === undefined) {
+            throw new Error(
+                'Required parameter dossierTemplateId was null or undefined when calling saveWatermark.'
+            );
         }
 
         let headers = this.defaultHeaders;
 
         // authentication (RED-OAUTH) required
         if (this.configuration.accessToken) {
-            const accessToken = typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
+            const accessToken =
+                typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken()
+                    : this.configuration.accessToken;
             headers = headers.set('Authorization', 'Bearer ' + accessToken);
         }
 
         // to determine the Accept header
         const httpHeaderAccepts: string[] = ['application/json'];
-        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined =
+            this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
             headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
         const consumes: string[] = ['application/json'];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        const httpContentTypeSelected: string | undefined =
+            this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<WatermarkModel>('post', `${this.basePath}/watermark/${encodeURIComponent(String(ruleSetId))}`, {
-            body: body,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<WatermarkModel>(
+            'post',
+            `${this.basePath}/watermark/${encodeURIComponent(String(dossierTemplateId))}`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
diff --git a/libs/red-ui-http/src/lib/model/dictionary.ts b/libs/red-ui-http/src/lib/model/dictionary.ts
index 872ff8a3b..ac1eec22f 100644
--- a/libs/red-ui-http/src/lib/model/dictionary.ts
+++ b/libs/red-ui-http/src/lib/model/dictionary.ts
@@ -39,9 +39,9 @@ export interface Dictionary {
      */
     recommendation?: boolean;
     /**
-     * The RuleSet Id for this type
+     * The DossierTemplate Id for this type
      */
-    ruleSetId?: string;
+    dossierTemplateId?: string;
     /**
      * The description of this dictionary
      */
diff --git a/libs/red-ui-http/src/lib/model/project.ts b/libs/red-ui-http/src/lib/model/dossier.ts
similarity index 56%
rename from libs/red-ui-http/src/lib/model/project.ts
rename to libs/red-ui-http/src/lib/model/dossier.ts
index e3bbacdd3..d574e669c 100644
--- a/libs/red-ui-http/src/lib/model/project.ts
+++ b/libs/red-ui-http/src/lib/model/dossier.ts
@@ -10,22 +10,27 @@
  * Do not edit the class manually.
  */
 
-export interface Project {
+export interface Dossier {
     approverIds?: Array<string>;
     date?: string;
     description?: string;
-    downloadFileTypes?: Array<Project.DownloadFileTypesEnum>;
+    downloadFileTypes?: Array<Dossier.DownloadFileTypesEnum>;
     dueDate?: string;
     memberIds?: Array<string>;
     ownerId?: string;
-    projectId?: string;
-    projectName?: string;
-    reportTypes?: Array<Project.ReportTypesEnum>;
-    ruleSetId?: string;
-    status?: Project.StatusEnum;
+    dossierId?: string;
+    dossierName?: string;
+    reportTypes?: Array<Dossier.ReportTypesEnum>;
+    dossierTemplateId?: string;
+    status?: Dossier.StatusEnum;
 }
-export namespace Project {
-    export type DownloadFileTypesEnum = 'ORIGINAL' | 'PREVIEW' | 'REDACTED' | 'ANNOTATED' | 'FLATTEN';
+export namespace Dossier {
+    export type DownloadFileTypesEnum =
+        | 'ORIGINAL'
+        | 'PREVIEW'
+        | 'REDACTED'
+        | 'ANNOTATED'
+        | 'FLATTEN';
     export const DownloadFileTypesEnum = {
         ORIGINAL: 'ORIGINAL' as DownloadFileTypesEnum,
         PREVIEW: 'PREVIEW' as DownloadFileTypesEnum,
@@ -33,10 +38,16 @@ export namespace Project {
         ANNOTATED: 'ANNOTATED' as DownloadFileTypesEnum,
         FLATTEN: 'FLATTEN' as DownloadFileTypesEnum
     };
-    export type ReportTypesEnum = 'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE' | 'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE' | 'EXCEL_MULTI_FILE' | 'EXCEL_SINGLE_FILE';
+    export type ReportTypesEnum =
+        | 'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE'
+        | 'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE'
+        | 'EXCEL_MULTI_FILE'
+        | 'EXCEL_SINGLE_FILE';
     export const ReportTypesEnum = {
-        WORDSINGLEFILEAPPENDIXA1TEMPLATE: 'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE' as ReportTypesEnum,
-        WORDSINGLEFILEAPPENDIXA2TEMPLATE: 'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE' as ReportTypesEnum,
+        WORDSINGLEFILEAPPENDIXA1TEMPLATE:
+            'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE' as ReportTypesEnum,
+        WORDSINGLEFILEAPPENDIXA2TEMPLATE:
+            'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE' as ReportTypesEnum,
         EXCELMULTIFILE: 'EXCEL_MULTI_FILE' as ReportTypesEnum,
         EXCELSINGLEFILE: 'EXCEL_SINGLE_FILE' as ReportTypesEnum
     };
diff --git a/libs/red-ui-http/src/lib/model/dossierRequest.ts b/libs/red-ui-http/src/lib/model/dossierRequest.ts
new file mode 100644
index 000000000..49ef9709b
--- /dev/null
+++ b/libs/red-ui-http/src/lib/model/dossierRequest.ts
@@ -0,0 +1,81 @@
+/**
+ * API Documentation for Redaction Gateway
+ * Description for redaction
+ *
+ * OpenAPI spec version: 1.0
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * Object containing information about a dossier.
+ */
+export interface DossierRequest {
+    /**
+     * The dossier's description (optional).
+     */
+    description?: string;
+    /**
+     * Download File Types for this dossiers submission package.
+     */
+    downloadFileTypes?: Array<DossierRequest.DownloadFileTypesEnum>;
+    /**
+     * The date when the dossier is due.
+     */
+    dueDate?: string;
+    /**
+     * The id(s) of members associated to this dossier.
+     */
+    memberIds?: Array<string>;
+    /**
+     * The id of the owning user.
+     */
+    ownerId?: string;
+    /**
+     * The id of the dossier, can be null for create requests.
+     */
+    dossierId?: string;
+    /**
+     * The name of the dossier. Must be unique.
+     */
+    dossierName?: string;
+    /**
+     * Report File Types for this dossiers submission package.
+     */
+    reportTypes?: Array<DossierRequest.ReportTypesEnum>;
+    /**
+     * The dossierTemplateId for this dossier. can be null for update request.
+     */
+    dossierTemplateId?: string;
+}
+export namespace DossierRequest {
+    export type DownloadFileTypesEnum =
+        | 'ORIGINAL'
+        | 'PREVIEW'
+        | 'REDACTED'
+        | 'ANNOTATED'
+        | 'FLATTEN';
+    export const DownloadFileTypesEnum = {
+        ORIGINAL: 'ORIGINAL' as DownloadFileTypesEnum,
+        PREVIEW: 'PREVIEW' as DownloadFileTypesEnum,
+        REDACTED: 'REDACTED' as DownloadFileTypesEnum,
+        ANNOTATED: 'ANNOTATED' as DownloadFileTypesEnum,
+        FLATTEN: 'FLATTEN' as DownloadFileTypesEnum
+    };
+    export type ReportTypesEnum =
+        | 'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE'
+        | 'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE'
+        | 'EXCEL_MULTI_FILE'
+        | 'EXCEL_SINGLE_FILE';
+    export const ReportTypesEnum = {
+        WORDSINGLEFILEAPPENDIXA1TEMPLATE:
+            'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE' as ReportTypesEnum,
+        WORDSINGLEFILEAPPENDIXA2TEMPLATE:
+            'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE' as ReportTypesEnum,
+        EXCELMULTIFILE: 'EXCEL_MULTI_FILE' as ReportTypesEnum,
+        EXCELSINGLEFILE: 'EXCEL_SINGLE_FILE' as ReportTypesEnum
+    };
+}
diff --git a/libs/red-ui-http/src/lib/model/dossierTemplateModel.ts b/libs/red-ui-http/src/lib/model/dossierTemplateModel.ts
new file mode 100644
index 000000000..8791591fa
--- /dev/null
+++ b/libs/red-ui-http/src/lib/model/dossierTemplateModel.ts
@@ -0,0 +1,89 @@
+/**
+ * API Documentation for Redaction Gateway
+ * Description for redaction
+ *
+ * OpenAPI spec version: 1.0
+ *
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+export interface DossierTemplateModel {
+    /**
+     * The userId of the user who created this DossierTemplate. Set by the system.
+     */
+    createdBy?: string;
+    /**
+     * The date when this dossierTemplate was created. Set by System on create.
+     */
+    dateAdded?: string;
+    /**
+     * The date when this dossierTemplate was last modified. Set by System on create.
+     */
+    dateModified?: string;
+    /**
+     * The description of this dossierTemplate
+     */
+    description?: string;
+    /**
+     * Download File Types for this dossierTemplate's dossiers submission package.
+     */
+    downloadFileTypes?: Array<DossierTemplateModel.DownloadFileTypesEnum>;
+    /**
+     * The userId of the user who last modified this DossierTemplate. Set by the system.
+     */
+    modifiedBy?: string;
+    /**
+     * The name of this dossierTemplate. Must be set on create / update requests
+     */
+    name?: string;
+    /**
+     * Report File Types for this dossierTemplate's dossiers submission package.
+     */
+    reportTypes?: Array<DossierTemplateModel.ReportTypesEnum>;
+    /**
+     * The Rule Set Id. Generated by the system on create.
+     */
+    dossierTemplateId?: string;
+    /**
+     * Validity of start this dossierTemplate.
+     */
+    validFrom?: string;
+    /**
+     * Validity of end this dossierTemplate.
+     */
+    validTo?: string;
+
+    dictionariesCount?: number;
+    totalDictionaryEntries?: number;
+}
+export namespace DossierTemplateModel {
+    export type DownloadFileTypesEnum =
+        | 'ORIGINAL'
+        | 'PREVIEW'
+        | 'REDACTED'
+        | 'ANNOTATED'
+        | 'FLATTEN';
+    export const DownloadFileTypesEnum = {
+        ORIGINAL: 'ORIGINAL' as DownloadFileTypesEnum,
+        PREVIEW: 'PREVIEW' as DownloadFileTypesEnum,
+        REDACTED: 'REDACTED' as DownloadFileTypesEnum,
+        ANNOTATED: 'ANNOTATED' as DownloadFileTypesEnum,
+        FLATTEN: 'FLATTEN' as DownloadFileTypesEnum
+    };
+    export type ReportTypesEnum =
+        | 'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE'
+        | 'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE'
+        | 'EXCEL_MULTI_FILE'
+        | 'EXCEL_SINGLE_FILE';
+    export const ReportTypesEnum = {
+        WORDSINGLEFILEAPPENDIXA1TEMPLATE:
+            'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE' as ReportTypesEnum,
+        WORDSINGLEFILEAPPENDIXA2TEMPLATE:
+            'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE' as ReportTypesEnum,
+        EXCELMULTIFILE: 'EXCEL_MULTI_FILE' as ReportTypesEnum,
+        EXCELSINGLEFILE: 'EXCEL_SINGLE_FILE' as ReportTypesEnum
+    };
+}
diff --git a/libs/red-ui-http/src/lib/model/downloadStatus.ts b/libs/red-ui-http/src/lib/model/downloadStatus.ts
index ae7897b88..2d66d6c9d 100644
--- a/libs/red-ui-http/src/lib/model/downloadStatus.ts
+++ b/libs/red-ui-http/src/lib/model/downloadStatus.ts
@@ -17,7 +17,7 @@ export interface DownloadStatus {
     filename?: string;
     lastDownload?: string;
     mimeType?: string;
-    projectId?: string;
+    dossierId?: string;
     fileSize?: number;
     status?: DownloadStatus.StatusEnum;
     storageId?: string;
diff --git a/libs/red-ui-http/src/lib/model/fileStatus.ts b/libs/red-ui-http/src/lib/model/fileStatus.ts
index 11c4da42d..dc5c9793d 100644
--- a/libs/red-ui-http/src/lib/model/fileStatus.ts
+++ b/libs/red-ui-http/src/lib/model/fileStatus.ts
@@ -117,13 +117,13 @@ export interface FileStatus {
      */
     numberOfPages?: number;
     /**
-     * The ID of the project the file belongs to.
+     * The ID of the dossier the file belongs to.
      */
-    projectId?: string;
+    dossierId?: string;
     /**
-     * The ruleSetId for this file.
+     * The dossierTemplateId for this file.
      */
-    ruleSetId?: string;
+    dossierTemplateId?: string;
     /**
      * Shows which rules versions was used during the analysis.
      */
diff --git a/libs/red-ui-http/src/lib/model/licenseReport.ts b/libs/red-ui-http/src/lib/model/licenseReport.ts
index a4e02a519..01a188361 100644
--- a/libs/red-ui-http/src/lib/model/licenseReport.ts
+++ b/libs/red-ui-http/src/lib/model/licenseReport.ts
@@ -18,7 +18,7 @@ export interface LicenseReport {
     numberOfAnalyses?: number;
     numberOfAnalyzedFiles?: number;
     numberOfAnalyzedPages?: number;
-    numberOfProjects?: number;
+    numberOfDossiers?: number;
     offset?: number;
     requestId?: string;
     startDate?: Date;
diff --git a/libs/red-ui-http/src/lib/model/licenseReportRequest.ts b/libs/red-ui-http/src/lib/model/licenseReportRequest.ts
index a46f6c3b6..859666400 100644
--- a/libs/red-ui-http/src/lib/model/licenseReportRequest.ts
+++ b/libs/red-ui-http/src/lib/model/licenseReportRequest.ts
@@ -14,5 +14,5 @@ export interface LicenseReportRequest {
     requestId?: string;
     startDate?: Date;
     endDate?: Date;
-    projectIds?: Array<string>;
+    dossierIds?: Array<string>;
 }
diff --git a/libs/red-ui-http/src/lib/model/models.ts b/libs/red-ui-http/src/lib/model/models.ts
index 4bed78bc7..6623d00d5 100644
--- a/libs/red-ui-http/src/lib/model/models.ts
+++ b/libs/red-ui-http/src/lib/model/models.ts
@@ -20,15 +20,15 @@ export * from './manualRedactionEntry';
 export * from './manualRedactions';
 export * from './modelFile';
 export * from './point';
-export * from './project';
-export * from './projectRequest';
+export * from './dossier';
+export * from './dossierRequest';
 export * from './rectangle';
 export * from './redactionLog';
 export * from './redactionLogEntry';
 export * from './removeRedactionRequest';
 export * from './reportData';
 export * from './rolesRequest';
-export * from './ruleSetModel';
+export * from './dossierTemplateModel';
 export * from './rules';
 export * from './sectionGrid';
 export * from './sectionRectangle';
diff --git a/libs/red-ui-http/src/lib/model/prepareDownloadRequest.ts b/libs/red-ui-http/src/lib/model/prepareDownloadRequest.ts
index 2da274e9c..95869fb1b 100644
--- a/libs/red-ui-http/src/lib/model/prepareDownloadRequest.ts
+++ b/libs/red-ui-http/src/lib/model/prepareDownloadRequest.ts
@@ -18,7 +18,7 @@ export interface PrepareDownloadRequest {
      * Which files should be included. Possible values are ORIGINAL, PREVIEW, REDACTED, ANNOTATED, FLATTEN
      */
     downloadFileTypes?: Array<string>;
-    projectId?: string;
+    dossierId?: string;
     /**
      * Which reports should be included. Possible values are SINGLE_FILE_EFSA_TEMPLATE, SINGLE_FILE_SYNGENTA_TEMPLATE, MULTI_FILE_EFSA_TEMPLATE, MULTI_FILE_SYNGENTA_TEMPLATE
      */
diff --git a/libs/red-ui-http/src/lib/model/projectRequest.ts b/libs/red-ui-http/src/lib/model/projectRequest.ts
deleted file mode 100644
index cadbc22ca..000000000
--- a/libs/red-ui-http/src/lib/model/projectRequest.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * API Documentation for Redaction Gateway
- * Description for redaction
- *
- * OpenAPI spec version: 1.0
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-/**
- * Object containing information about a project.
- */
-export interface ProjectRequest {
-    /**
-     * The project's description (optional).
-     */
-    description?: string;
-    /**
-     * Download File Types for this projects submission package.
-     */
-    downloadFileTypes?: Array<ProjectRequest.DownloadFileTypesEnum>;
-    /**
-     * The date when the project is due.
-     */
-    dueDate?: string;
-    /**
-     * The id(s) of members associated to this project.
-     */
-    memberIds?: Array<string>;
-    /**
-     * The id of the owning user.
-     */
-    ownerId?: string;
-    /**
-     * The id of the project, can be null for create requests.
-     */
-    projectId?: string;
-    /**
-     * The name of the project. Must be unique.
-     */
-    projectName?: string;
-    /**
-     * Report File Types for this projects submission package.
-     */
-    reportTypes?: Array<ProjectRequest.ReportTypesEnum>;
-    /**
-     * The ruleSetId for this project. can be null for update request.
-     */
-    ruleSetId?: string;
-}
-export namespace ProjectRequest {
-    export type DownloadFileTypesEnum = 'ORIGINAL' | 'PREVIEW' | 'REDACTED' | 'ANNOTATED' | 'FLATTEN';
-    export const DownloadFileTypesEnum = {
-        ORIGINAL: 'ORIGINAL' as DownloadFileTypesEnum,
-        PREVIEW: 'PREVIEW' as DownloadFileTypesEnum,
-        REDACTED: 'REDACTED' as DownloadFileTypesEnum,
-        ANNOTATED: 'ANNOTATED' as DownloadFileTypesEnum,
-        FLATTEN: 'FLATTEN' as DownloadFileTypesEnum
-    };
-    export type ReportTypesEnum = 'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE' | 'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE' | 'EXCEL_MULTI_FILE' | 'EXCEL_SINGLE_FILE';
-    export const ReportTypesEnum = {
-        WORDSINGLEFILEAPPENDIXA1TEMPLATE: 'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE' as ReportTypesEnum,
-        WORDSINGLEFILEAPPENDIXA2TEMPLATE: 'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE' as ReportTypesEnum,
-        EXCELMULTIFILE: 'EXCEL_MULTI_FILE' as ReportTypesEnum,
-        EXCELSINGLEFILE: 'EXCEL_SINGLE_FILE' as ReportTypesEnum
-    };
-}
diff --git a/libs/red-ui-http/src/lib/model/redactionChangeLog.ts b/libs/red-ui-http/src/lib/model/redactionChangeLog.ts
index 3b1d3bf05..30919e07f 100644
--- a/libs/red-ui-http/src/lib/model/redactionChangeLog.ts
+++ b/libs/red-ui-http/src/lib/model/redactionChangeLog.ts
@@ -15,6 +15,6 @@ export interface RedactionChangeLog {
     dictionaryVersion?: number;
     filename?: string;
     redactionLogEntry?: Array<RedactionChangeLogEntry>;
-    ruleSetId?: string;
+    dossierTemplateId?: string;
     rulesVersion?: number;
 }
diff --git a/libs/red-ui-http/src/lib/model/redactionLog.ts b/libs/red-ui-http/src/lib/model/redactionLog.ts
index 4ac23dc46..96077ffa3 100644
--- a/libs/red-ui-http/src/lib/model/redactionLog.ts
+++ b/libs/red-ui-http/src/lib/model/redactionLog.ts
@@ -15,6 +15,6 @@ export interface RedactionLog {
     dictionaryVersion?: number;
     filename?: string;
     redactionLogEntry?: Array<RedactionLogEntry>;
-    ruleSetId?: string;
+    dossierTemplateId?: string;
     rulesVersion?: number;
 }
diff --git a/libs/red-ui-http/src/lib/model/reportData.ts b/libs/red-ui-http/src/lib/model/reportData.ts
index c756cb181..472b9c63d 100644
--- a/libs/red-ui-http/src/lib/model/reportData.ts
+++ b/libs/red-ui-http/src/lib/model/reportData.ts
@@ -17,12 +17,21 @@ export interface ReportData {
     fileName?: string;
     lastUpdatedDate?: Date;
     numberOfAnalyzedPages?: number;
-    project?: string;
+    dossier?: string;
     status?: ReportData.StatusEnum;
 }
 
 export namespace ReportData {
-    export type StatusEnum = 'UNPROCESSED' | 'REPROCESS' | 'PROCESSING' | 'ERROR' | 'DELETED' | 'UNASSIGNED' | 'UNDER_REVIEW' | 'UNDER_APPROVAL' | 'APPROVED';
+    export type StatusEnum =
+        | 'UNPROCESSED'
+        | 'REPROCESS'
+        | 'PROCESSING'
+        | 'ERROR'
+        | 'DELETED'
+        | 'UNASSIGNED'
+        | 'UNDER_REVIEW'
+        | 'UNDER_APPROVAL'
+        | 'APPROVED';
     export const StatusEnum = {
         UNPROCESSED: 'UNPROCESSED' as StatusEnum,
         REPROCESS: 'REPROCESS' as StatusEnum,
diff --git a/libs/red-ui-http/src/lib/model/ruleSetModel.ts b/libs/red-ui-http/src/lib/model/ruleSetModel.ts
deleted file mode 100644
index b7c28c9af..000000000
--- a/libs/red-ui-http/src/lib/model/ruleSetModel.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * API Documentation for Redaction Gateway
- * Description for redaction
- *
- * OpenAPI spec version: 1.0
- *
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-export interface RuleSetModel {
-    /**
-     * The userId of the user who created this RuleSet. Set by the system.
-     */
-    createdBy?: string;
-    /**
-     * The date when this ruleSet was created. Set by System on create.
-     */
-    dateAdded?: string;
-    /**
-     * The date when this ruleSet was last modified. Set by System on create.
-     */
-    dateModified?: string;
-    /**
-     * The description of this ruleSet
-     */
-    description?: string;
-    /**
-     * Download File Types for this ruleSet's projects submission package.
-     */
-    downloadFileTypes?: Array<RuleSetModel.DownloadFileTypesEnum>;
-    /**
-     * The userId of the user who last modified this RuleSet. Set by the system.
-     */
-    modifiedBy?: string;
-    /**
-     * The name of this ruleSet. Must be set on create / update requests
-     */
-    name?: string;
-    /**
-     * Report File Types for this ruleSet's projects submission package.
-     */
-    reportTypes?: Array<RuleSetModel.ReportTypesEnum>;
-    /**
-     * The Rule Set Id. Generated by the system on create.
-     */
-    ruleSetId?: string;
-    /**
-     * Validity of start this ruleSet.
-     */
-    validFrom?: string;
-    /**
-     * Validity of end this ruleSet.
-     */
-    validTo?: string;
-
-    dictionariesCount?: number;
-    totalDictionaryEntries?: number;
-}
-export namespace RuleSetModel {
-    export type DownloadFileTypesEnum = 'ORIGINAL' | 'PREVIEW' | 'REDACTED' | 'ANNOTATED' | 'FLATTEN';
-    export const DownloadFileTypesEnum = {
-        ORIGINAL: 'ORIGINAL' as DownloadFileTypesEnum,
-        PREVIEW: 'PREVIEW' as DownloadFileTypesEnum,
-        REDACTED: 'REDACTED' as DownloadFileTypesEnum,
-        ANNOTATED: 'ANNOTATED' as DownloadFileTypesEnum,
-        FLATTEN: 'FLATTEN' as DownloadFileTypesEnum
-    };
-    export type ReportTypesEnum = 'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE' | 'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE' | 'EXCEL_MULTI_FILE' | 'EXCEL_SINGLE_FILE';
-    export const ReportTypesEnum = {
-        WORDSINGLEFILEAPPENDIXA1TEMPLATE: 'WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE' as ReportTypesEnum,
-        WORDSINGLEFILEAPPENDIXA2TEMPLATE: 'WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE' as ReportTypesEnum,
-        EXCELMULTIFILE: 'EXCEL_MULTI_FILE' as ReportTypesEnum,
-        EXCELSINGLEFILE: 'EXCEL_SINGLE_FILE' as ReportTypesEnum
-    };
-}
diff --git a/libs/red-ui-http/src/lib/model/rules.ts b/libs/red-ui-http/src/lib/model/rules.ts
index 3a4d5f6fd..9898fc7a7 100644
--- a/libs/red-ui-http/src/lib/model/rules.ts
+++ b/libs/red-ui-http/src/lib/model/rules.ts
@@ -19,7 +19,7 @@ export interface Rules {
      */
     rules?: string;
     /**
-     * The ruleSetId for these rules
+     * The dossierTemplateId for these rules
      */
-    ruleSetId?: string;
+    dossierTemplateId?: string;
 }
diff --git a/libs/red-ui-http/src/lib/model/typeValue.ts b/libs/red-ui-http/src/lib/model/typeValue.ts
index f3be607f4..e4c7a1655 100644
--- a/libs/red-ui-http/src/lib/model/typeValue.ts
+++ b/libs/red-ui-http/src/lib/model/typeValue.ts
@@ -44,9 +44,9 @@ export interface TypeValue {
     type?: string;
 
     /**
-     * The ruleSetId for this type
+     * The dossierTemplateId for this type
      */
-    ruleSetId?: string;
+    dossierTemplateId?: string;
 
     /**
      * The description of this dictionary