From 8d29bfd69f3aaf768fb1068e845dcd939f2b6598 Mon Sep 17 00:00:00 2001
From: sebo <sebastian.bergandy@external.mgm-cp.com>
Date: Wed, 19 Mar 2025 20:52:20 +0100
Subject: [PATCH] OZG-73743 rename statistik to aggregation-mapping

---
 ...aggregation-mapping-form.e2e.component.ts} |  2 +-
 .../aggregation-mapping.e2e.component.ts}     |  4 +-
 .../aggregation-mapping.cy.ts}                | 14 +++---
 alfa-client/apps/admin/src/app/app.routes.ts  | 10 ++--
 ...regation-mapping-form-page.component.html} |  0
 ...ation-mapping-form-page.component.spec.ts} | 14 +++---
 ...ggregation-mapping-form-page.component.ts} |  8 ++--
 ...regation-mapping-list-page.component.html} |  2 +-
 ...ation-mapping-list-page.component.spec.ts} | 15 +++---
 ...ggregation-mapping-list-page.component.ts} | 10 ++--
 .../.eslintrc.json                            |  0
 .../libs/admin/aggregation-mapping/README.md  |  1 +
 .../jest.config.ts                            |  4 +-
 .../project.json                              |  8 ++--
 .../admin/aggregation-mapping/src/index.ts    |  2 +
 ...tion-mapping-form-container.component.html |  3 ++
 ...n-mapping-form-container.component.spec.ts |  6 +--
 ...gation-mapping-form-container.component.ts |  4 +-
 ...egation-mapping-field-form.component.html} |  2 +-
 ...tion-mapping-field-form.component.spec.ts} | 30 ++++++------
 ...gregation-mapping-field-form.component.ts} | 12 ++---
 ...ion-mapping-field-list-form.component.html | 10 ++++
 ...mapping-field-list-form.component.spec.ts} | 38 ++++++++-------
 ...ation-mapping-field-list-form.component.ts | 20 ++++++++
 .../aggregation-mapping-form.component.html}  | 16 +++----
 ...ggregation-mapping-form.component.spec.ts} | 46 +++++++++----------
 .../aggregation-mapping-form.component.ts}    | 18 ++++----
 .../aggregation-mapping-form.service.ts}      | 20 ++++----
 .../aggregation-mapping.formservice.spec.ts}  | 34 +++++++-------
 ...ion-mapping-list-container.component.html} |  2 +-
 ...-mapping-list-container.component.spec.ts} | 14 +++---
 ...ation-mapping-list-container.component.ts} |  8 ++--
 ...gregation-mapping-list-item.component.html |  0
 ...gation-mapping-list-item.component.spec.ts |  2 +-
 ...aggregation-mapping-list-item.component.ts |  0
 .../aggregation-mapping-list.component.html   |  0
 ...aggregation-mapping-list.component.spec.ts |  4 +-
 .../aggregation-mapping-list.component.ts     |  2 +-
 .../src/test-setup.ts                         |  0
 .../tsconfig.json                             |  0
 .../tsconfig.lib.json                         |  0
 .../tsconfig.spec.json                        |  0
 alfa-client/libs/admin/statistik/README.md    |  7 ---
 alfa-client/libs/admin/statistik/src/index.ts |  3 --
 ...tion-mapping-form-container.component.html |  3 --
 ...tistik-fields-mappings-form.component.html | 10 ----
 ...tatistik-fields-mappings-form.component.ts | 20 --------
 alfa-client/tsconfig.base.json                |  2 +-
 48 files changed, 212 insertions(+), 218 deletions(-)
 rename alfa-client/apps/admin-e2e/src/components/{statistik/statistik-fields-form.e2e.component.ts => aggregation-mapping/aggregation-mapping-form.e2e.component.ts} (97%)
 rename alfa-client/apps/admin-e2e/src/components/{statistik/statistik.e2e.component.ts => aggregation-mapping/aggregation-mapping.e2e.component.ts} (73%)
 rename alfa-client/apps/admin-e2e/src/e2e/main-tests/{statistik/statistik-fields.cy.ts => aggregation-mapping/aggregation-mapping.cy.ts} (70%)
 rename alfa-client/apps/admin/src/pages/{statistik/statistik-fields-form-page/statistik-fields-form-page.component.html => aggregation-mapping/aggregation-mapping-form-page/aggregation-mapping-form-page.component.html} (100%)
 rename alfa-client/apps/admin/src/pages/{statistik/statistik-fields-form-page/statistik-fields-form-page.component.spec.ts => aggregation-mapping/aggregation-mapping-form-page/aggregation-mapping-form-page.component.spec.ts} (59%)
 rename alfa-client/apps/admin/src/pages/{statistik/statistik-fields-form-page/statistik-fields-form-page.component.ts => aggregation-mapping/aggregation-mapping-form-page/aggregation-mapping-form-page.component.ts} (50%)
 rename alfa-client/apps/admin/src/pages/{statistik/statistik-page/statistik-page.component.html => aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component.html} (91%)
 rename alfa-client/apps/admin/src/pages/{statistik/statistik-page/statistik-page.component.spec.ts => aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component.spec.ts} (70%)
 rename alfa-client/apps/admin/src/pages/{statistik/statistik-page/statistik-page.component.ts => aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component.ts} (76%)
 rename alfa-client/libs/admin/{statistik => aggregation-mapping}/.eslintrc.json (100%)
 create mode 100644 alfa-client/libs/admin/aggregation-mapping/README.md
 rename alfa-client/libs/admin/{statistik => aggregation-mapping}/jest.config.ts (83%)
 rename alfa-client/libs/admin/{statistik => aggregation-mapping}/project.json (62%)
 create mode 100644 alfa-client/libs/admin/aggregation-mapping/src/index.ts
 create mode 100644 alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.html
 rename alfa-client/libs/admin/{statistik => aggregation-mapping}/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.spec.ts (85%)
 rename alfa-client/libs/admin/{statistik => aggregation-mapping}/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.ts (82%)
 rename alfa-client/libs/admin/{statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-field-mapping-form/statistik-field-mapping-form.component.html => aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html} (95%)
 rename alfa-client/libs/admin/{statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-field-mapping-form/statistik-field-mapping-form.component.spec.ts => aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.spec.ts} (70%)
 rename alfa-client/libs/admin/{statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-field-mapping-form/statistik-field-mapping-form.component.ts => aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.ts} (52%)
 create mode 100644 alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component.html
 rename alfa-client/libs/admin/{statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-fields-mappings-form.component.spec.ts => aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component.spec.ts} (51%)
 create mode 100644 alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component.ts
 rename alfa-client/libs/admin/{statistik/src/lib/statistik-fields-form/statistik-fields-form.component.html => aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.html} (68%)
 rename alfa-client/libs/admin/{statistik/src/lib/statistik-fields-form/statistik-fields-form.component.spec.ts => aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.spec.ts} (69%)
 rename alfa-client/libs/admin/{statistik/src/lib/statistik-fields-form/statistik-fields-form.component.ts => aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts} (59%)
 rename alfa-client/libs/admin/{statistik/src/lib/statistik-fields-form/statistik-fields.formservice.ts => aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.service.ts} (71%)
 rename alfa-client/libs/admin/{statistik/src/lib/statistik-fields-form/statistik-fields.formservice.spec.ts => aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.spec.ts} (77%)
 rename alfa-client/libs/admin/{statistik/src/lib/statistik-container/statistik-container.component.html => aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component.html} (93%)
 rename alfa-client/libs/admin/{statistik/src/lib/statistik-container/statistik-container.component.spec.ts => aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component.spec.ts} (87%)
 rename alfa-client/libs/admin/{statistik/src/lib/statistik-container/statistik-container.component.ts => aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component.ts} (84%)
 rename alfa-client/libs/admin/{statistik/src/lib => aggregation-mapping/src/lib/aggregation-mapping-list-container}/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html (100%)
 rename alfa-client/libs/admin/{statistik/src/lib => aggregation-mapping/src/lib/aggregation-mapping-list-container}/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.spec.ts (93%)
 rename alfa-client/libs/admin/{statistik/src/lib => aggregation-mapping/src/lib/aggregation-mapping-list-container}/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.ts (100%)
 rename alfa-client/libs/admin/{statistik/src/lib => aggregation-mapping/src/lib/aggregation-mapping-list-container}/aggregation-mapping-list/aggregation-mapping-list.component.html (100%)
 rename alfa-client/libs/admin/{statistik/src/lib => aggregation-mapping/src/lib/aggregation-mapping-list-container}/aggregation-mapping-list/aggregation-mapping-list.component.spec.ts (96%)
 rename alfa-client/libs/admin/{statistik/src/lib => aggregation-mapping/src/lib/aggregation-mapping-list-container}/aggregation-mapping-list/aggregation-mapping-list.component.ts (92%)
 rename alfa-client/libs/admin/{statistik => aggregation-mapping}/src/test-setup.ts (100%)
 rename alfa-client/libs/admin/{statistik => aggregation-mapping}/tsconfig.json (100%)
 rename alfa-client/libs/admin/{statistik => aggregation-mapping}/tsconfig.lib.json (100%)
 rename alfa-client/libs/admin/{statistik => aggregation-mapping}/tsconfig.spec.json (100%)
 delete mode 100644 alfa-client/libs/admin/statistik/README.md
 delete mode 100644 alfa-client/libs/admin/statistik/src/index.ts
 delete mode 100644 alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.html
 delete mode 100644 alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-fields-mappings-form.component.html
 delete mode 100644 alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-fields-mappings-form.component.ts

diff --git a/alfa-client/apps/admin-e2e/src/components/statistik/statistik-fields-form.e2e.component.ts b/alfa-client/apps/admin-e2e/src/components/aggregation-mapping/aggregation-mapping-form.e2e.component.ts
similarity index 97%
rename from alfa-client/apps/admin-e2e/src/components/statistik/statistik-fields-form.e2e.component.ts
rename to alfa-client/apps/admin-e2e/src/components/aggregation-mapping/aggregation-mapping-form.e2e.component.ts
index 8936e02edb..112cc9e0aa 100644
--- a/alfa-client/apps/admin-e2e/src/components/statistik/statistik-fields-form.e2e.component.ts
+++ b/alfa-client/apps/admin-e2e/src/components/aggregation-mapping/aggregation-mapping-form.e2e.component.ts
@@ -1,6 +1,6 @@
 import { enterWith } from '../../support/cypress.util';
 
-export class StatistikFieldsFormE2EComponent {
+export class AggregationMappingFormE2EComponent {
   private readonly formEngineInput: string = 'form-engine-name-text-input';
   private readonly formIdInput: string = 'form-id-text-input';
   private readonly formDataFieldInput: string = 'mapping-field-';
diff --git a/alfa-client/apps/admin-e2e/src/components/statistik/statistik.e2e.component.ts b/alfa-client/apps/admin-e2e/src/components/aggregation-mapping/aggregation-mapping.e2e.component.ts
similarity index 73%
rename from alfa-client/apps/admin-e2e/src/components/statistik/statistik.e2e.component.ts
rename to alfa-client/apps/admin-e2e/src/components/aggregation-mapping/aggregation-mapping.e2e.component.ts
index b7467232f5..8e9ad4a76d 100644
--- a/alfa-client/apps/admin-e2e/src/components/statistik/statistik.e2e.component.ts
+++ b/alfa-client/apps/admin-e2e/src/components/aggregation-mapping/aggregation-mapping.e2e.component.ts
@@ -1,5 +1,5 @@
-export class StatistikE2EComponent {
-  private readonly locatorHeaderText: string = 'statistik-header-text';
+export class AggregationMappingE2EComponent {
+  private readonly locatorHeaderText: string = 'aggregation-mapping-header-text';
   private readonly locatorWeitereFelderAuswertenButton = 'weitere-felder-auswerten-button';
 
   public getHeaderText(): Cypress.Chainable<Element> {
diff --git a/alfa-client/apps/admin-e2e/src/e2e/main-tests/statistik/statistik-fields.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/main-tests/aggregation-mapping/aggregation-mapping.cy.ts
similarity index 70%
rename from alfa-client/apps/admin-e2e/src/e2e/main-tests/statistik/statistik-fields.cy.ts
rename to alfa-client/apps/admin-e2e/src/e2e/main-tests/aggregation-mapping/aggregation-mapping.cy.ts
index d877ae4b90..91ed35a2dd 100644
--- a/alfa-client/apps/admin-e2e/src/e2e/main-tests/statistik/statistik-fields.cy.ts
+++ b/alfa-client/apps/admin-e2e/src/e2e/main-tests/aggregation-mapping/aggregation-mapping.cy.ts
@@ -1,11 +1,11 @@
-import { StatistikE2EComponent } from 'apps/admin-e2e/src/components/statistik/statistik.e2e.component';
-import { StatistikFieldsFormE2EComponent } from '../../../components/statistik/statistik-fields-form.e2e.component';
-import { exist, haveText, haveValue } from '../../../support/cypress.util';
+import { AggregationMappingFormE2EComponent } from '../../../components/aggregation-mapping/aggregation-mapping-form.e2e.component';
+import { AggregationMappingE2EComponent } from '../../../components/aggregation-mapping/aggregation-mapping.e2e.component';
+import { exist, haveValue } from '../../../support/cypress.util';
 import { loginAsDaria } from '../../../support/user-util';
 
-describe('Felder in Statistik hinzufügen', () => {
-  const component: StatistikE2EComponent = new StatistikE2EComponent();
-  const fieldsFormComponent: StatistikFieldsFormE2EComponent = new StatistikFieldsFormE2EComponent();
+describe('Aggregation Mapping hinzufügen', () => {
+  const component: AggregationMappingE2EComponent = new AggregationMappingE2EComponent();
+  const fieldsFormComponent: AggregationMappingFormE2EComponent = new AggregationMappingFormE2EComponent();
 
   const dataText1: string = 'Eingabe A';
   const dataText2: string = 'Eingabe B';
@@ -49,7 +49,7 @@ describe('Felder in Statistik hinzufügen', () => {
     haveValue(fieldsFormComponent.getDataFieldInput(0), dataText2);
   });
 
-  it('should navigate to statistik on cancel', () => {
+  it('should navigate to aggregation mapping on cancel', () => {
     fieldsFormComponent.cancel();
 
     exist(component.getWeitereFelderAuswertenButton());
diff --git a/alfa-client/apps/admin/src/app/app.routes.ts b/alfa-client/apps/admin/src/app/app.routes.ts
index 2d21b25201..25576ae40b 100644
--- a/alfa-client/apps/admin/src/app/app.routes.ts
+++ b/alfa-client/apps/admin/src/app/app.routes.ts
@@ -26,10 +26,10 @@ import { ROUTES } from '@admin-client/shared';
 import { UserFormComponent } from '@admin-client/user';
 import { ApiRootLinkRel } from '@alfa-client/api-root-shared';
 import { Route } from '@angular/router';
+import { AggregationMappingFormPageComponent } from '../pages/aggregation-mapping/aggregation-mapping-form-page/aggregation-mapping-form-page.component';
+import { AggregationMappingListPageComponent } from '../pages/aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component';
 import { OrganisationsEinheitPageComponent } from '../pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component';
 import { PostfachPageComponent } from '../pages/postfach/postfach-page/postfach-page.component';
-import { StatistikFieldsFormPageComponent } from '../pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component';
-import { StatistikPageComponent } from '../pages/statistik/statistik-page/statistik-page.component';
 import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/unavailable-page.component';
 import { UserFormPageComponent } from '../pages/user/user-form-page/user-form-page.component';
 import { UserListPageComponent } from '../pages/user/user-list-page/user-list-page.component';
@@ -84,7 +84,7 @@ export const appRoutes: Route[] = [
   },
   {
     path: ROUTES.AGGREGATION_MAPPING,
-    component: StatistikPageComponent,
+    component: AggregationMappingListPageComponent,
     title: 'Admin | Statistik',
     runGuardsAndResolvers: 'always',
     canActivate: [configurationGuard],
@@ -92,7 +92,7 @@ export const appRoutes: Route[] = [
   },
   {
     path: ROUTES.AGGREGATION_MAPPING_NEU,
-    component: StatistikFieldsFormPageComponent,
+    component: AggregationMappingFormPageComponent,
     title: 'Admin | Statistik weitere Felder auswerten',
     runGuardsAndResolvers: 'always',
     canActivate: [configurationGuard],
@@ -100,7 +100,7 @@ export const appRoutes: Route[] = [
   },
   {
     path: ROUTES.AGGREGATION_MAPPING_ID,
-    component: StatistikFieldsFormPageComponent,
+    component: AggregationMappingFormPageComponent,
     title: 'Admin | Statistik weitere Felder auswerten',
     runGuardsAndResolvers: 'always',
     canActivate: [configurationGuard],
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.html b/alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-form-page/aggregation-mapping-form-page.component.html
similarity index 100%
rename from alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.html
rename to alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-form-page/aggregation-mapping-form-page.component.html
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.spec.ts b/alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-form-page/aggregation-mapping-form-page.component.spec.ts
similarity index 59%
rename from alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.spec.ts
rename to alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-form-page/aggregation-mapping-form-page.component.spec.ts
index 7101165d69..f8d31cfc83 100644
--- a/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-form-page/aggregation-mapping-form-page.component.spec.ts
@@ -1,19 +1,19 @@
-import { AggregationMappingFormContainerComponent } from '@admin-client/statistik';
+import { AggregationMappingFormContainerComponent } from '@admin-client/aggregation-mapping';
 import { expectComponentExistsInTemplate } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MockComponent } from 'ng-mocks';
-import { StatistikFieldsFormPageComponent } from './statistik-fields-form-page.component';
+import { AggregationMappingFormPageComponent } from './aggregation-mapping-form-page.component';
 
-describe('StatistikFieldsFormPageComponent', () => {
-  let component: StatistikFieldsFormPageComponent;
-  let fixture: ComponentFixture<StatistikFieldsFormPageComponent>;
+describe('AggregationMappingFormPageComponent', () => {
+  let component: AggregationMappingFormPageComponent;
+  let fixture: ComponentFixture<AggregationMappingFormPageComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [StatistikFieldsFormPageComponent, MockComponent(AggregationMappingFormContainerComponent)],
+      imports: [AggregationMappingFormPageComponent, MockComponent(AggregationMappingFormContainerComponent)],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(StatistikFieldsFormPageComponent);
+    fixture = TestBed.createComponent(AggregationMappingFormPageComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.ts b/alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-form-page/aggregation-mapping-form-page.component.ts
similarity index 50%
rename from alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.ts
rename to alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-form-page/aggregation-mapping-form-page.component.ts
index 638bba3a0a..a85688c8b2 100644
--- a/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.ts
+++ b/alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-form-page/aggregation-mapping-form-page.component.ts
@@ -1,10 +1,10 @@
-import { AggregationMappingFormContainerComponent } from '@admin-client/statistik';
+import { AggregationMappingFormContainerComponent } from '@admin-client/aggregation-mapping';
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'statistik-fields-form-page',
+  selector: 'admin-aggregation-mapping-form-page',
   standalone: true,
   imports: [AggregationMappingFormContainerComponent],
-  templateUrl: './statistik-fields-form-page.component.html',
+  templateUrl: './aggregation-mapping-form-page.component.html',
 })
-export class StatistikFieldsFormPageComponent {}
+export class AggregationMappingFormPageComponent {}
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.html b/alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component.html
similarity index 91%
rename from alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.html
rename to alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component.html
index 5213f51259..ac183ce76a 100644
--- a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.html
+++ b/alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component.html
@@ -23,4 +23,4 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<admin-statistik-container data-test-id="statistik-container" />
+<admin-aggregation-mapping-list-container data-test-id="aggregation-mapping-container" />
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.spec.ts b/alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component.spec.ts
similarity index 70%
rename from alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.spec.ts
rename to alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component.spec.ts
index 2166339888..b036d9be9e 100644
--- a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component.spec.ts
@@ -21,24 +21,23 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { StatistikContainerComponent } from '@admin-client/statistik';
+import { AggregationMappingListContainerComponent } from '@admin-client/aggregation-mapping';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MockComponent } from 'ng-mocks';
-import { StatistikPageComponent } from './statistik-page.component';
+import { AggregationMappingListPageComponent } from './aggregation-mapping-list-page.component';
 
-describe('StatistikPageComponent', () => {
-  let component: StatistikPageComponent;
-  let fixture: ComponentFixture<StatistikPageComponent>;
+describe('AggregationMappingListPageComponent', () => {
+  let component: AggregationMappingListPageComponent;
+  let fixture: ComponentFixture<AggregationMappingListPageComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [],
-      declarations: [StatistikPageComponent, MockComponent(StatistikContainerComponent)],
+      imports: [AggregationMappingListPageComponent, MockComponent(AggregationMappingListContainerComponent)],
     }).compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(StatistikPageComponent);
+    fixture = TestBed.createComponent(AggregationMappingListPageComponent);
     component = fixture.componentInstance;
 
     fixture.detectChanges();
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.ts b/alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component.ts
similarity index 76%
rename from alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.ts
rename to alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component.ts
index 53fd00fc7c..47858d2978 100644
--- a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.ts
+++ b/alfa-client/apps/admin/src/pages/aggregation-mapping/aggregation-mapping-list-page/aggregation-mapping-list-page.component.ts
@@ -21,13 +21,13 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { StatistikContainerComponent } from '@admin-client/statistik';
+import { AggregationMappingListContainerComponent } from '@admin-client/aggregation-mapping';
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'statistik-page',
+  selector: 'admin-aggregation-mapping-list-page',
   standalone: true,
-  imports: [StatistikContainerComponent],
-  templateUrl: './statistik-page.component.html',
+  imports: [AggregationMappingListContainerComponent],
+  templateUrl: './aggregation-mapping-list-page.component.html',
 })
-export class StatistikPageComponent {}
+export class AggregationMappingListPageComponent {}
diff --git a/alfa-client/libs/admin/statistik/.eslintrc.json b/alfa-client/libs/admin/aggregation-mapping/.eslintrc.json
similarity index 100%
rename from alfa-client/libs/admin/statistik/.eslintrc.json
rename to alfa-client/libs/admin/aggregation-mapping/.eslintrc.json
diff --git a/alfa-client/libs/admin/aggregation-mapping/README.md b/alfa-client/libs/admin/aggregation-mapping/README.md
new file mode 100644
index 0000000000..4e7c28147d
--- /dev/null
+++ b/alfa-client/libs/admin/aggregation-mapping/README.md
@@ -0,0 +1 @@
+# Aggregation Mapping
\ No newline at end of file
diff --git a/alfa-client/libs/admin/statistik/jest.config.ts b/alfa-client/libs/admin/aggregation-mapping/jest.config.ts
similarity index 83%
rename from alfa-client/libs/admin/statistik/jest.config.ts
rename to alfa-client/libs/admin/aggregation-mapping/jest.config.ts
index fc41bd8816..8ae2a4a3db 100644
--- a/alfa-client/libs/admin/statistik/jest.config.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/jest.config.ts
@@ -1,8 +1,8 @@
 export default {
-  displayName: 'admin-statistik',
+  displayName: 'admin-aggregation-mapping',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../../coverage/libs/admin/statistik',
+  coverageDirectory: '../../../coverage/libs/admin/aggregation-mapping',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/alfa-client/libs/admin/statistik/project.json b/alfa-client/libs/admin/aggregation-mapping/project.json
similarity index 62%
rename from alfa-client/libs/admin/statistik/project.json
rename to alfa-client/libs/admin/aggregation-mapping/project.json
index a5c36fc013..ab4704d303 100644
--- a/alfa-client/libs/admin/statistik/project.json
+++ b/alfa-client/libs/admin/aggregation-mapping/project.json
@@ -1,7 +1,7 @@
 {
-  "name": "admin-statistik",
+  "name": "admin-aggregation-mapping",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "libs/admin/statistik/src",
+  "sourceRoot": "libs/admin/aggregation-mapping/src",
   "prefix": "admin",
   "projectType": "library",
   "tags": [],
@@ -10,8 +10,8 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "tsConfig": "libs/admin/statistik/tsconfig.lib.json",
-        "jestConfig": "libs/admin/statistik/jest.config.ts"
+        "tsConfig": "libs/admin/aggregation-mapping/tsconfig.lib.json",
+        "jestConfig": "libs/admin/aggregation-mapping/jest.config.ts"
       }
     },
     "lint": {
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/index.ts b/alfa-client/libs/admin/aggregation-mapping/src/index.ts
new file mode 100644
index 0000000000..aa299f4458
--- /dev/null
+++ b/alfa-client/libs/admin/aggregation-mapping/src/index.ts
@@ -0,0 +1,2 @@
+export * from './lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component';
+export * from './lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component';
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.html
new file mode 100644
index 0000000000..ac4fc2d0cc
--- /dev/null
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.html
@@ -0,0 +1,3 @@
+<ods-spinner [stateResource]="listStateResource$ | async">
+  <admin-aggregation-mapping-form data-test-id="evaluate-fields-form"></admin-aggregation-mapping-form>
+</ods-spinner>
diff --git a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.spec.ts
similarity index 85%
rename from alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.spec.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.spec.ts
index 2f8fc1a4d7..d192a6d428 100644
--- a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.spec.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.spec.ts
@@ -1,11 +1,11 @@
+import { AggregationMappingFormContainerComponent } from '@admin-client/aggregation-mapping';
 import { AggregationMappingService } from '@admin-client/reporting-shared';
-import { StatistikFieldsFormComponent } from '@admin-client/statistik';
 import { Mock, mock } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { expect } from '@jest/globals';
 import { SpinnerComponent } from '@ods/component';
 import { MockComponent } from 'ng-mocks';
-import { AggregationMappingFormContainerComponent } from './aggregation-mapping-form-container.component';
+import { AggregationMappingFormComponent } from './aggregation-mapping-form/aggregation-mapping-form.component';
 
 describe('AggregationMappingFormContainerComponent', () => {
   let component: AggregationMappingFormContainerComponent;
@@ -20,7 +20,7 @@ describe('AggregationMappingFormContainerComponent', () => {
       imports: [
         AggregationMappingFormContainerComponent,
         MockComponent(SpinnerComponent),
-        MockComponent(StatistikFieldsFormComponent),
+        MockComponent(AggregationMappingFormComponent),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.ts
similarity index 82%
rename from alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.ts
index 31b284ec01..f20feab09a 100644
--- a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.ts
@@ -4,12 +4,12 @@ import { AsyncPipe } from '@angular/common';
 import { Component, inject, OnDestroy } from '@angular/core';
 import { SpinnerComponent } from '@ods/component';
 import { Observable } from 'rxjs';
-import { StatistikFieldsFormComponent } from '../statistik-fields-form/statistik-fields-form.component';
+import { AggregationMappingFormComponent } from './aggregation-mapping-form/aggregation-mapping-form.component';
 
 @Component({
   selector: 'admin-aggregation-mapping-form-container',
   standalone: true,
-  imports: [SpinnerComponent, AsyncPipe, StatistikFieldsFormComponent],
+  imports: [SpinnerComponent, AsyncPipe, AggregationMappingFormComponent],
   templateUrl: './aggregation-mapping-form-container.component.html',
 })
 export class AggregationMappingFormContainerComponent implements OnDestroy {
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-field-mapping-form/statistik-field-mapping-form.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
similarity index 95%
rename from alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-field-mapping-form/statistik-field-mapping-form.component.html
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
index 05dd38f408..c5f184738c 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-field-mapping-form/statistik-field-mapping-form.component.html
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="formService.form">
-  <ng-container [formArrayName]="StatistikFieldsFormService.FIELD_MAPPINGS">
+  <ng-container [formArrayName]="AggregationMappingFormService.FIELD_MAPPINGS">
     <ng-container [formGroupName]="index">
       <div class="flex w-full flex-col gap-2 mt-4 bg-gray-100 p-4 rounded-md">
         <div class="flex flex-row items-center justify-between">
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-field-mapping-form/statistik-field-mapping-form.component.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.spec.ts
similarity index 70%
rename from alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-field-mapping-form/statistik-field-mapping-form.component.spec.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.spec.ts
index ff1cd734ac..cd207241e7 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-field-mapping-form/statistik-field-mapping-form.component.spec.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.spec.ts
@@ -7,13 +7,13 @@ import { expect } from '@jest/globals';
 import { TextEditorComponent } from '@ods/component';
 import { ButtonComponent, DeleteIconComponent } from '@ods/system';
 import { MockComponent } from 'ng-mocks';
-import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
-import { StatistikFieldsFormService } from '../../statistik-fields.formservice';
-import { StatistikFieldMappingFormComponent } from './statistik-field-mapping-form.component';
+import { getDataTestIdOf } from '../../../../../../../../tech-shared/test/data-test';
+import { AggregationMappingFormService } from '../../aggregation-mapping-form.service';
+import { AggregationMappingFieldFormComponent } from './aggregation-mapping-field-form.component';
 
-describe('AdminStatistikFieldMappingFormComponent', () => {
-  let component: StatistikFieldMappingFormComponent;
-  let fixture: ComponentFixture<StatistikFieldMappingFormComponent>;
+describe('AggregationMappingFieldFormComponent', () => {
+  let component: AggregationMappingFieldFormComponent;
+  let fixture: ComponentFixture<AggregationMappingFieldFormComponent>;
 
   const formBuilder: FormBuilder = new FormBuilder();
   const fieldIndex: number = 0;
@@ -21,20 +21,20 @@ describe('AdminStatistikFieldMappingFormComponent', () => {
   const targetPathEditorTestId: string = getDataTestIdOf('target-mapping-field-0');
   const removeMappingButtonTestId: string = getDataTestIdOf('remove-mapping-0');
 
-  let formService: Mock<StatistikFieldsFormService>;
+  let formService: Mock<AggregationMappingFormService>;
 
   beforeEach(async () => {
     const form: FormGroup = formBuilder.group({
-      [StatistikFieldsFormService.FIELD_MAPPINGS]: formBuilder.array([
+      [AggregationMappingFormService.FIELD_MAPPINGS]: formBuilder.array([
         new FormGroup({
-          [StatistikFieldsFormService.FIELD_MAPPING_SOURCE_PATH]: new FormControl(EMPTY_STRING),
-          [StatistikFieldsFormService.FIELD_MAPPING_TARGET_PATH]: new FormControl(EMPTY_STRING),
+          [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: new FormControl(EMPTY_STRING),
+          [AggregationMappingFormService.FIELD_MAPPING_TARGET_PATH]: new FormControl(EMPTY_STRING),
         }),
       ]),
     });
 
     formService = <any>{
-      ...mock(StatistikFieldsFormService),
+      ...mock(AggregationMappingFormService),
       form,
       addMapping: jest.fn(),
       removeMapping: jest.fn(),
@@ -42,13 +42,13 @@ describe('AdminStatistikFieldMappingFormComponent', () => {
 
     mockGetValue(
       formService,
-      StatistikFieldsFormService.FIELD_MAPPINGS,
-      form.controls[StatistikFieldsFormService.FIELD_MAPPINGS],
+      AggregationMappingFormService.FIELD_MAPPINGS,
+      form.controls[AggregationMappingFormService.FIELD_MAPPINGS],
     );
 
     await TestBed.configureTestingModule({
       imports: [
-        StatistikFieldMappingFormComponent,
+        AggregationMappingFieldFormComponent,
         MockComponent(TextEditorComponent),
         MockComponent(ButtonComponent),
         MockComponent(DeleteIconComponent),
@@ -61,7 +61,7 @@ describe('AdminStatistikFieldMappingFormComponent', () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(StatistikFieldMappingFormComponent);
+    fixture = TestBed.createComponent(AggregationMappingFieldFormComponent);
     component = fixture.componentInstance;
     component.index = fieldIndex;
     fixture.detectChanges();
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-field-mapping-form/statistik-field-mapping-form.component.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.ts
similarity index 52%
rename from alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-field-mapping-form/statistik-field-mapping-form.component.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.ts
index 0789e17703..e80a74f035 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-field-mapping-form/statistik-field-mapping-form.component.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.ts
@@ -3,18 +3,18 @@ import { Component, inject, Input } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { TextEditorComponent } from '@ods/component';
 import { ButtonComponent, DeleteIconComponent } from '@ods/system';
-import { StatistikFieldsFormService } from '../../statistik-fields.formservice';
+import { AggregationMappingFormService } from '../../aggregation-mapping-form.service';
 
 @Component({
-  selector: 'admin-statistik-field-mapping-form',
+  selector: 'admin-aggregatin-mapping-field-form',
   standalone: true,
-  templateUrl: './statistik-field-mapping-form.component.html',
+  templateUrl: './aggregation-mapping-field-form.component.html',
   imports: [ButtonComponent, DeleteIconComponent, ReactiveFormsModule, TextEditorComponent],
 })
-export class StatistikFieldMappingFormComponent {
+export class AggregationMappingFieldFormComponent {
   @Input({ required: true }) index: number;
 
-  public readonly formService = <StatistikFieldsFormService>inject(ADMIN_FORMSERVICE);
+  public readonly formService = <AggregationMappingFormService>inject(ADMIN_FORMSERVICE);
 
-  public readonly StatistikFieldsFormService = StatistikFieldsFormService;
+  public readonly AggregationMappingFormService = AggregationMappingFormService;
 }
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component.html
new file mode 100644
index 0000000000..ee829b2a70
--- /dev/null
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component.html
@@ -0,0 +1,10 @@
+<form [formGroup]="formService.form">
+  <div class="flex flex-col" [formArrayName]="AggregationMappingFormService.FIELD_MAPPINGS">
+    <div *ngFor="let ignore of mappingsFormArray; let i = index">
+      <admin-aggregatin-mapping-field-form
+        [index]="i"
+        [attr.data-test-id]="'aggregation-mapping-field-mapping-form-' + i"
+      ></admin-aggregatin-mapping-field-form>
+    </div>
+  </div>
+</form>
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-fields-mappings-form.component.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component.spec.ts
similarity index 51%
rename from alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-fields-mappings-form.component.spec.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component.spec.ts
index 6470d91cfe..345f9cbf24 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-fields-mappings-form.component.spec.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component.spec.ts
@@ -6,32 +6,32 @@ import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule } from '@angul
 import { expect } from '@jest/globals';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MockComponent } from 'ng-mocks';
-import { StatistikFieldsFormService } from '../statistik-fields.formservice';
-import { StatistikFieldMappingFormComponent } from './statistik-field-mapping-form/statistik-field-mapping-form.component';
-import { StatistikFieldsMappingsFormComponent } from './statistik-fields-mappings-form.component';
+import { AggregationMappingFormService } from '../aggregation-mapping-form.service';
+import { AggregationMappingFieldFormComponent } from './aggregation-mapping-field-form/aggregation-mapping-field-form.component';
+import { AggregationMappingFieldListFormComponent } from './aggregation-mapping-field-list-form.component';
 
-describe('StatistikFieldsFormMappingComponent', () => {
-  let component: StatistikFieldsMappingsFormComponent;
-  let fixture: ComponentFixture<StatistikFieldsMappingsFormComponent>;
+describe('AggregationMappingFieldListFormComponent', () => {
+  let component: AggregationMappingFieldListFormComponent;
+  let fixture: ComponentFixture<AggregationMappingFieldListFormComponent>;
 
-  const mappingForm: string = getDataTestIdOf('statistik-field-mapping-form-0');
+  const mappingForm: string = getDataTestIdOf('aggregation-mapping-field-mapping-form-0');
 
   const formBuilder: FormBuilder = new FormBuilder();
 
-  let formService: Mock<StatistikFieldsFormService>;
+  let formService: Mock<AggregationMappingFormService>;
 
   beforeEach(async () => {
     const form: FormGroup = formBuilder.group({
-      [StatistikFieldsFormService.FIELD_MAPPINGS]: formBuilder.array([
+      [AggregationMappingFormService.FIELD_MAPPINGS]: formBuilder.array([
         new FormGroup({
-          [StatistikFieldsFormService.FIELD_MAPPING_SOURCE_PATH]: new FormControl(EMPTY_STRING),
-          [StatistikFieldsFormService.FIELD_MAPPING_TARGET_PATH]: new FormControl(EMPTY_STRING),
+          [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: new FormControl(EMPTY_STRING),
+          [AggregationMappingFormService.FIELD_MAPPING_TARGET_PATH]: new FormControl(EMPTY_STRING),
         }),
       ]),
     });
 
     formService = <any>{
-      ...mock(StatistikFieldsFormService),
+      ...mock(AggregationMappingFormService),
       form,
       addMapping: jest.fn(),
       removeMapping: jest.fn(),
@@ -39,12 +39,16 @@ describe('StatistikFieldsFormMappingComponent', () => {
 
     mockGetValue(
       formService,
-      StatistikFieldsFormService.FIELD_MAPPINGS,
-      form.controls[StatistikFieldsFormService.FIELD_MAPPINGS],
+      AggregationMappingFormService.FIELD_MAPPINGS,
+      form.controls[AggregationMappingFormService.FIELD_MAPPINGS],
     );
 
     await TestBed.configureTestingModule({
-      imports: [ReactiveFormsModule, StatistikFieldsMappingsFormComponent, MockComponent(StatistikFieldMappingFormComponent)],
+      imports: [
+        ReactiveFormsModule,
+        AggregationMappingFieldListFormComponent,
+        MockComponent(AggregationMappingFieldFormComponent),
+      ],
       providers: [
         {
           provide: ADMIN_FORMSERVICE,
@@ -53,7 +57,7 @@ describe('StatistikFieldsFormMappingComponent', () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(StatistikFieldsMappingsFormComponent);
+    fixture = TestBed.createComponent(AggregationMappingFieldListFormComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
@@ -71,7 +75,7 @@ describe('StatistikFieldsFormMappingComponent', () => {
       });
 
       it('should have inputs', () => {
-        const mappingComponent: StatistikFieldMappingFormComponent = getElementComponentFromFixtureByCss(fixture, mappingForm);
+        const mappingComponent: AggregationMappingFieldFormComponent = getElementComponentFromFixtureByCss(fixture, mappingForm);
 
         expect(mappingComponent.index).toEqual(0);
       });
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component.ts
new file mode 100644
index 0000000000..2adaffcbef
--- /dev/null
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component.ts
@@ -0,0 +1,20 @@
+import { ADMIN_FORMSERVICE } from '@admin-client/shared';
+import { CommonModule } from '@angular/common';
+import { Component, inject } from '@angular/core';
+import { AbstractControl, ReactiveFormsModule } from '@angular/forms';
+import { AggregationMappingFormService } from '../aggregation-mapping-form.service';
+import { AggregationMappingFieldFormComponent } from './aggregation-mapping-field-form/aggregation-mapping-field-form.component';
+
+@Component({
+  selector: 'admin-aggregation-mapping-field-list-form',
+  templateUrl: './aggregation-mapping-field-list-form.component.html',
+  standalone: true,
+  imports: [CommonModule, ReactiveFormsModule, AggregationMappingFieldFormComponent],
+})
+export class AggregationMappingFieldListFormComponent {
+  public readonly formService = <AggregationMappingFormService>inject(ADMIN_FORMSERVICE);
+
+  public readonly mappingsFormArray: AbstractControl[] = this.formService.mappings.controls;
+
+  public readonly AggregationMappingFormService = AggregationMappingFormService;
+}
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.html
similarity index 68%
rename from alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form.component.html
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.html
index b9f078d75e..abcbef7402 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form.component.html
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.html
@@ -1,19 +1,19 @@
-<h2 class="heading-2" data-test-id="statistik-fields-form-header-text">Felder zur Auswertung hinzufügen</h2>
+<h2 class="heading-2" data-test-id="aggregation-mapping-fields-form-header-text">Felder zur Auswertung hinzufügen</h2>
 
 <ods-spinner [stateResource]="aggregationMappingStateResource$ | async">
   <div class="flex max-w-4xl flex-col gap-4">
     <form class="form flex-col" [formGroup]="formService.form" class="flex flex-col gap-2">
       <ods-text-editor
-        [formControlName]="StatistikFieldsFormService.FIELD_NAME"
+        [formControlName]="AggregationMappingFormService.FIELD_NAME"
         label="Name"
         placeholder=""
         isRequired="true"
-        data-test-id="statistik-name-text-editor"
-        dataTestId="statistik-name"
+        data-test-id="aggregation-mapping-name-text-editor"
+        dataTestId="aggregation-mapping-name"
       ></ods-text-editor>
-      <div [formGroupName]="StatistikFieldsFormService.FIELD_FORM_IDENTIFIER" class="flex flex-col gap-4">
+      <div [formGroupName]="AggregationMappingFormService.FIELD_FORM_IDENTIFIER" class="flex flex-col gap-4">
         <ods-text-editor
-          [formControlName]="StatistikFieldsFormService.FIELD_FORM_ENGINE_NAME"
+          [formControlName]="AggregationMappingFormService.FIELD_FORM_ENGINE_NAME"
           label="Formengine"
           placeholder="Tragen Sie hier die Formengine des Formulars ein."
           isRequired="true"
@@ -21,7 +21,7 @@
           dataTestId="form-engine-name"
         ></ods-text-editor>
         <ods-text-editor
-          [formControlName]="StatistikFieldsFormService.FIELD_FORM_ID"
+          [formControlName]="AggregationMappingFormService.FIELD_FORM_ID"
           label="FormID"
           placeholder="Tragen Sie hier die FormID des Formulars ein."
           isRequired="true"
@@ -29,7 +29,7 @@
           dataTestId="form-id"
         ></ods-text-editor>
       </div>
-      <admin-statistik-fields-form-mapping />
+      <admin-aggregation-mapping-field-list-form />
     </form>
     <ods-button
       text="Datenfeld hinzufügen"
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form.component.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.spec.ts
similarity index 69%
rename from alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form.component.spec.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.spec.ts
index 5dc2a0eafa..e6a2b6989c 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form.component.spec.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.spec.ts
@@ -1,5 +1,5 @@
 import { AggregationMappingResource } from '@admin-client/reporting-shared';
-import { ADMIN_FORMSERVICE, ROUTES } from '@admin-client/shared';
+import { ADMIN_FORMSERVICE, AdminCancelButtonComponent, AdminSaveButtonComponent, ROUTES } from '@admin-client/shared';
 import { createStateResource, EMPTY_STRING, StateResource } from '@alfa-client/tech-shared';
 import {
   dispatchEventFromFixture,
@@ -16,18 +16,16 @@ import { TextEditorComponent } from '@ods/component';
 import { ButtonComponent, PlusIconComponent } from '@ods/system';
 import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
-import { getDataTestIdOf } from '../../../../../tech-shared/test/data-test';
-import { singleColdCompleted } from '../../../../../tech-shared/test/marbles';
-import { createAggregationMappingResource } from '../../../../reporting-shared/test/aggregation-mapping';
-import { AdminCancelButtonComponent } from '../../../../shared/src/lib/admin-cancel-button/admin-cancel-button.component';
-import { AdminSaveButtonComponent } from '../../../../shared/src/lib/admin-save-button/admin-save-button.component';
-import { StatistikFieldsFormComponent } from './statistik-fields-form.component';
-import { StatistikFieldsMappingsFormComponent } from './statistik-fields-mappings-form/statistik-fields-mappings-form.component';
-import { StatistikFieldsFormService } from './statistik-fields.formservice';
-
-describe('AdminStatistikFieldsFormComponent', () => {
-  let component: StatistikFieldsFormComponent;
-  let fixture: ComponentFixture<StatistikFieldsFormComponent>;
+import { getDataTestIdOf } from '../../../../../../tech-shared/test/data-test';
+import { singleColdCompleted } from '../../../../../../tech-shared/test/marbles';
+import { createAggregationMappingResource } from '../../../../../reporting-shared/test/aggregation-mapping';
+import { AggregationMappingFieldListFormComponent } from './aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component';
+import { AggregationMappingFormComponent } from './aggregation-mapping-form.component';
+import { AggregationMappingFormService } from './aggregation-mapping-form.service';
+
+describe('AggregationMappingFormComponent', () => {
+  let component: AggregationMappingFormComponent;
+  let fixture: ComponentFixture<AggregationMappingFormComponent>;
 
   const formEngineNameInputTestId: string = getDataTestIdOf('form-engine-name');
   const formIdInputTestId: string = getDataTestIdOf('form-id');
@@ -39,37 +37,37 @@ describe('AdminStatistikFieldsFormComponent', () => {
 
   const formBuilder: FormBuilder = new FormBuilder();
 
-  let formService: Mock<StatistikFieldsFormService>;
+  let formService: Mock<AggregationMappingFormService>;
 
   beforeEach(async () => {
     const form: FormGroup = formBuilder.group({
-      [StatistikFieldsFormService.FIELD_NAME]: new FormControl(EMPTY_STRING),
-      [StatistikFieldsFormService.FIELD_FORM_IDENTIFIER]: formBuilder.group({
-        [StatistikFieldsFormService.FIELD_FORM_ENGINE_NAME]: new FormControl(EMPTY_STRING),
-        [StatistikFieldsFormService.FIELD_FORM_ID]: new FormControl(EMPTY_STRING),
+      [AggregationMappingFormService.FIELD_NAME]: new FormControl(EMPTY_STRING),
+      [AggregationMappingFormService.FIELD_FORM_IDENTIFIER]: formBuilder.group({
+        [AggregationMappingFormService.FIELD_FORM_ENGINE_NAME]: new FormControl(EMPTY_STRING),
+        [AggregationMappingFormService.FIELD_FORM_ID]: new FormControl(EMPTY_STRING),
       }),
     });
 
-    formService = <any>{ ...mock(StatistikFieldsFormService), form };
+    formService = <any>{ ...mock(AggregationMappingFormService), form };
     formService.get = jest.fn().mockReturnValue(of(aggregationMappingStateResource));
 
     await TestBed.configureTestingModule({
       imports: [
         ReactiveFormsModule,
-        StatistikFieldsFormComponent,
+        AggregationMappingFormComponent,
         MockComponent(TextEditorComponent),
         MockComponent(ButtonComponent),
         MockComponent(PlusIconComponent),
         MockComponent(AdminSaveButtonComponent),
         MockComponent(AdminCancelButtonComponent),
-        MockComponent(StatistikFieldsMappingsFormComponent),
+        MockComponent(AggregationMappingFieldListFormComponent),
       ],
     })
-      .overrideComponent(StatistikFieldsFormComponent, {
+      .overrideComponent(AggregationMappingFormComponent, {
         set: {
           providers: [
             {
-              provide: StatistikFieldsFormService,
+              provide: AggregationMappingFormService,
               useValue: formService,
             },
             {
@@ -81,7 +79,7 @@ describe('AdminStatistikFieldsFormComponent', () => {
       })
       .compileComponents();
 
-    fixture = TestBed.createComponent(StatistikFieldsFormComponent);
+    fixture = TestBed.createComponent(AggregationMappingFormComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form.component.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts
similarity index 59%
rename from alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form.component.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts
index b5f78af0ec..d113a410a3 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form.component.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts
@@ -7,12 +7,12 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { SpinnerComponent, TextEditorComponent } from '@ods/component';
 import { ButtonComponent, PlusIconComponent } from '@ods/system';
 import { Observable } from 'rxjs';
-import { StatistikFieldsMappingsFormComponent } from './statistik-fields-mappings-form/statistik-fields-mappings-form.component';
-import { StatistikFieldsFormService } from './statistik-fields.formservice';
+import { AggregationMappingFieldListFormComponent } from './aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component';
+import { AggregationMappingFormService } from './aggregation-mapping-form.service';
 
 @Component({
-  selector: 'admin-statistik-fields-form',
-  templateUrl: './statistik-fields-form.component.html',
+  selector: 'admin-aggregation-mapping-form',
+  templateUrl: './aggregation-mapping-form.component.html',
   standalone: true,
   imports: [
     ButtonComponent,
@@ -20,19 +20,19 @@ import { StatistikFieldsFormService } from './statistik-fields.formservice';
     ReactiveFormsModule,
     AdminSaveButtonComponent,
     AdminCancelButtonComponent,
-    StatistikFieldsMappingsFormComponent,
+    AggregationMappingFieldListFormComponent,
     SpinnerComponent,
     AsyncPipe,
     TextEditorComponent,
   ],
-  providers: [{ provide: ADMIN_FORMSERVICE, useClass: StatistikFieldsFormService }],
+  providers: [{ provide: ADMIN_FORMSERVICE, useClass: AggregationMappingFormService }],
 })
-export class StatistikFieldsFormComponent {
-  public readonly formService = <StatistikFieldsFormService>inject(ADMIN_FORMSERVICE);
+export class AggregationMappingFormComponent {
+  public readonly formService = <AggregationMappingFormService>inject(ADMIN_FORMSERVICE);
 
   public readonly aggregationMappingStateResource$: Observable<StateResource<AggregationMappingResource>> =
     this.formService.get();
 
-  public readonly StatistikFieldsFormService = StatistikFieldsFormService;
+  public readonly AggregationMappingFormService = AggregationMappingFormService;
   public readonly Routes = ROUTES;
 }
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields.formservice.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.service.ts
similarity index 71%
rename from alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields.formservice.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.service.ts
index 10ba7d8039..664ed43622 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields.formservice.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.service.ts
@@ -5,7 +5,7 @@ import { FormArray, FormControl, FormGroup, UntypedFormGroup } from '@angular/fo
 import { filter, Observable, tap } from 'rxjs';
 
 @Injectable()
-export class StatistikFieldsFormService extends AbstractFormService<AggregationMappingResource> {
+export class AggregationMappingFormService extends AbstractFormService<AggregationMappingResource> {
   public static readonly FIELD_NAME: string = 'name';
   public static readonly FIELD_FORM_IDENTIFIER: string = 'formIdentifier';
   public static readonly FIELD_FORM_ENGINE_NAME: string = 'formEngineName';
@@ -18,12 +18,12 @@ export class StatistikFieldsFormService extends AbstractFormService<AggregationM
 
   protected initForm(): UntypedFormGroup {
     return this.formBuilder.group({
-      [StatistikFieldsFormService.FIELD_NAME]: new FormControl(EMPTY_STRING),
-      [StatistikFieldsFormService.FIELD_FORM_IDENTIFIER]: this.formBuilder.group({
-        [StatistikFieldsFormService.FIELD_FORM_ENGINE_NAME]: new FormControl(EMPTY_STRING),
-        [StatistikFieldsFormService.FIELD_FORM_ID]: new FormControl(EMPTY_STRING),
+      [AggregationMappingFormService.FIELD_NAME]: new FormControl(EMPTY_STRING),
+      [AggregationMappingFormService.FIELD_FORM_IDENTIFIER]: this.formBuilder.group({
+        [AggregationMappingFormService.FIELD_FORM_ENGINE_NAME]: new FormControl(EMPTY_STRING),
+        [AggregationMappingFormService.FIELD_FORM_ID]: new FormControl(EMPTY_STRING),
       }),
-      [StatistikFieldsFormService.FIELD_MAPPINGS]: new FormArray([this.createArrayControl()]),
+      [AggregationMappingFormService.FIELD_MAPPINGS]: new FormArray([this.createArrayControl()]),
     });
   }
 
@@ -44,8 +44,8 @@ export class StatistikFieldsFormService extends AbstractFormService<AggregationM
 
   private createArrayControl(sourcePath: string = EMPTY_STRING, targetPath: string = EMPTY_STRING): FormGroup {
     return new FormGroup({
-      [StatistikFieldsFormService.FIELD_MAPPING_SOURCE_PATH]: new FormControl(sourcePath),
-      [StatistikFieldsFormService.FIELD_MAPPING_TARGET_PATH]: new FormControl(targetPath),
+      [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: new FormControl(sourcePath),
+      [AggregationMappingFormService.FIELD_MAPPING_TARGET_PATH]: new FormControl(targetPath),
     });
   }
 
@@ -54,7 +54,7 @@ export class StatistikFieldsFormService extends AbstractFormService<AggregationM
   }
 
   public get mappings(): FormArray {
-    return this.form.controls[StatistikFieldsFormService.FIELD_MAPPINGS] as FormArray;
+    return this.form.controls[AggregationMappingFormService.FIELD_MAPPINGS] as FormArray;
   }
 
   public get(): Observable<StateResource<AggregationMappingResource>> {
@@ -66,7 +66,7 @@ export class StatistikFieldsFormService extends AbstractFormService<AggregationM
 
   _patchForm(value: AggregationMappingResource): void {
     this.patch(value);
-    const mappingsFormArray: FormArray = this.form.controls[StatistikFieldsFormService.FIELD_MAPPINGS] as FormArray;
+    const mappingsFormArray: FormArray = this.form.controls[AggregationMappingFormService.FIELD_MAPPINGS] as FormArray;
     mappingsFormArray.clear();
     value.mappings.forEach((mapping: FieldMapping) =>
       mappingsFormArray.push(this.createArrayControl(mapping.sourcePath, mapping.targetPath)),
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields.formservice.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.spec.ts
similarity index 77%
rename from alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields.formservice.spec.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.spec.ts
index 45f57f4bef..fab98f538a 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields.formservice.spec.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.spec.ts
@@ -30,11 +30,11 @@ import { expect } from '@jest/globals';
 import { createAggregationMapping, createAggregationMappingResource } from 'libs/admin/reporting-shared/test/aggregation-mapping';
 import { omit } from 'lodash-es';
 import { of } from 'rxjs';
-import { singleColdCompleted } from '../../../../../tech-shared/test/marbles';
-import { StatistikFieldsFormService } from './statistik-fields.formservice';
+import { singleColdCompleted } from '../../../../../../tech-shared/test/marbles';
+import { AggregationMappingFormService } from './aggregation-mapping-form.service';
 
-describe('StatistikFieldsFormService', () => {
-  let formService: StatistikFieldsFormService;
+describe('AggregationMappingFormService', () => {
+  let formService: AggregationMappingFormService;
 
   let service: Mock<AggregationMappingService>;
 
@@ -42,10 +42,10 @@ describe('StatistikFieldsFormService', () => {
     service = mock(AggregationMappingService);
 
     TestBed.configureTestingModule({
-      providers: [StatistikFieldsFormService, { provide: AggregationMappingService, useValue: service }],
+      providers: [AggregationMappingFormService, { provide: AggregationMappingService, useValue: service }],
     });
 
-    formService = TestBed.inject(StatistikFieldsFormService);
+    formService = TestBed.inject(AggregationMappingFormService);
   });
 
   it('should create', () => {
@@ -83,31 +83,31 @@ describe('StatistikFieldsFormService', () => {
     it('should add mapping control', () => {
       formService.addMapping();
 
-      const mappingFormArray: FormArray = <FormArray>formService.form.controls[StatistikFieldsFormService.FIELD_MAPPINGS];
+      const mappingFormArray: FormArray = <FormArray>formService.form.controls[AggregationMappingFormService.FIELD_MAPPINGS];
       expect(mappingFormArray).toHaveLength(2);
       expect(mappingFormArray.controls[0].value).toEqual({
-        [StatistikFieldsFormService.FIELD_MAPPING_SOURCE_PATH]: EMPTY_STRING,
-        [StatistikFieldsFormService.FIELD_MAPPING_TARGET_PATH]: EMPTY_STRING,
+        [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: EMPTY_STRING,
+        [AggregationMappingFormService.FIELD_MAPPING_TARGET_PATH]: EMPTY_STRING,
       });
     });
   });
 
   describe('remove mapping', () => {
     it('should remove mapping control', () => {
-      (<FormArray>formService.form.controls[StatistikFieldsFormService.FIELD_MAPPINGS]).push(
+      (<FormArray>formService.form.controls[AggregationMappingFormService.FIELD_MAPPINGS]).push(
         new FormGroup({
-          [StatistikFieldsFormService.FIELD_MAPPING_SOURCE_PATH]: new FormControl('controlToRemove'),
-          [StatistikFieldsFormService.FIELD_MAPPING_TARGET_PATH]: new FormControl('controlToRemove'),
+          [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: new FormControl('controlToRemove'),
+          [AggregationMappingFormService.FIELD_MAPPING_TARGET_PATH]: new FormControl('controlToRemove'),
         }),
       );
 
       formService.removeMapping(1);
 
-      const mappingFormArray: FormArray = <FormArray>formService.form.controls[StatistikFieldsFormService.FIELD_MAPPINGS];
+      const mappingFormArray: FormArray = <FormArray>formService.form.controls[AggregationMappingFormService.FIELD_MAPPINGS];
       expect(mappingFormArray).toHaveLength(1);
       expect(mappingFormArray.controls[0].value).toEqual({
-        [StatistikFieldsFormService.FIELD_MAPPING_SOURCE_PATH]: EMPTY_STRING,
-        [StatistikFieldsFormService.FIELD_MAPPING_TARGET_PATH]: EMPTY_STRING,
+        [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: EMPTY_STRING,
+        [AggregationMappingFormService.FIELD_MAPPING_TARGET_PATH]: EMPTY_STRING,
       });
     });
   });
@@ -118,8 +118,8 @@ describe('StatistikFieldsFormService', () => {
 
       expect(mappings).toHaveLength(1);
       expect(mappings.controls[0].value).toEqual({
-        [StatistikFieldsFormService.FIELD_MAPPING_SOURCE_PATH]: EMPTY_STRING,
-        [StatistikFieldsFormService.FIELD_MAPPING_TARGET_PATH]: EMPTY_STRING,
+        [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: EMPTY_STRING,
+        [AggregationMappingFormService.FIELD_MAPPING_TARGET_PATH]: EMPTY_STRING,
       });
     });
   });
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component.html
similarity index 93%
rename from alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component.html
index 434802447a..a95bf3f3a4 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component.html
@@ -23,7 +23,7 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<h1 class="heading-1" data-test-id="statistik-header-text">Statistik</h1>
+<h1 class="heading-1" data-test-id="aggregation-mapping-header-text">Statistik</h1>
 <ods-routing-button
   class="my-4 w-fit"
   [linkPath]="ROUTES.AGGREGATION_MAPPING_NEU"
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component.spec.ts
similarity index 87%
rename from alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.spec.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component.spec.ts
index 7407e0c895..f9fe5b7e4a 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.spec.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component.spec.ts
@@ -31,12 +31,12 @@ import { singleCold } from 'libs/tech-shared/test/marbles';
 import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
 import { createAggregationMappingListResource } from '../../../../reporting-shared/test/aggregation-mapping';
-import { AggregationMappingListComponent } from '../aggregation-mapping-list/aggregation-mapping-list.component';
-import { StatistikContainerComponent } from './statistik-container.component';
+import { AggregationMappingListContainerComponent } from './aggregation-mapping-list-container.component';
+import { AggregationMappingListComponent } from './aggregation-mapping-list/aggregation-mapping-list.component';
 
-describe('StatistikContainerComponent', () => {
-  let component: StatistikContainerComponent;
-  let fixture: ComponentFixture<StatistikContainerComponent>;
+describe('AggregationMappingListContainerComponent', () => {
+  let component: AggregationMappingListContainerComponent;
+  let fixture: ComponentFixture<AggregationMappingListContainerComponent>;
 
   let aggregationMappingService: Mock<AggregationMappingService>;
 
@@ -45,7 +45,7 @@ describe('StatistikContainerComponent', () => {
 
     await TestBed.configureTestingModule({
       imports: [
-        StatistikContainerComponent,
+        AggregationMappingListContainerComponent,
         MockComponent(RoutingButtonComponent),
         MockComponent(AggregationMappingListComponent),
       ],
@@ -57,7 +57,7 @@ describe('StatistikContainerComponent', () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(StatistikContainerComponent);
+    fixture = TestBed.createComponent(AggregationMappingListContainerComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component.ts
similarity index 84%
rename from alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component.ts
index 6465487752..622a61d5ef 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list-container.component.ts
@@ -28,15 +28,15 @@ import { CommonModule } from '@angular/common';
 import { Component, inject, OnDestroy, OnInit } from '@angular/core';
 import { RoutingButtonComponent } from '@ods/component';
 import { Observable } from 'rxjs';
-import { AggregationMappingListComponent } from '../aggregation-mapping-list/aggregation-mapping-list.component';
+import { AggregationMappingListComponent } from './aggregation-mapping-list/aggregation-mapping-list.component';
 
 @Component({
-  selector: 'admin-statistik-container',
-  templateUrl: './statistik-container.component.html',
+  selector: 'admin-aggregation-mapping-list-container',
+  templateUrl: './aggregation-mapping-list-container.component.html',
   standalone: true,
   imports: [CommonModule, RoutingButtonComponent, AggregationMappingListComponent],
 })
-export class StatistikContainerComponent implements OnInit, OnDestroy {
+export class AggregationMappingListContainerComponent implements OnInit, OnDestroy {
   private service = inject(AggregationMappingService);
 
   public listStateResource$: Observable<StateResource<AggregationMappingListResource>>;
diff --git a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html
similarity index 100%
rename from alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html
diff --git a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.spec.ts
similarity index 93%
rename from alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.spec.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.spec.ts
index 18d620f575..9a6061356d 100644
--- a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.spec.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.spec.ts
@@ -4,8 +4,8 @@ import { getElementFromFixtureByType } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { expect } from '@jest/globals';
 import { ListItemComponent } from '@ods/system';
+import { createAggregationMappingResource } from 'libs/admin/reporting-shared/test/aggregation-mapping';
 import { MockComponent } from 'ng-mocks';
-import { createAggregationMappingResource } from '../../../../../reporting-shared/test/aggregation-mapping';
 import { AggregationMappingListItemComponent } from './aggregation-mapping-list-item.component';
 
 describe('AggregationMappingListItemComponent', () => {
diff --git a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.ts
similarity index 100%
rename from alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.ts
diff --git a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list.component.html
similarity index 100%
rename from alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list.component.html
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list.component.html
diff --git a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list.component.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list.component.spec.ts
similarity index 96%
rename from alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list.component.spec.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list.component.spec.ts
index dd1647f73a..c632c4a20b 100644
--- a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list.component.spec.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list.component.spec.ts
@@ -12,8 +12,8 @@ import { expect } from '@jest/globals';
 import { SpinnerComponent } from '@ods/component';
 import { ListComponent } from '@ods/system';
 import { MockComponent } from 'ng-mocks';
-import { AggregationMappingListLinkRel } from '../../../../reporting-shared/src/lib/aggregation-mapping.linkrel';
-import { createAggregationMappingListResource } from '../../../../reporting-shared/test/aggregation-mapping';
+import { AggregationMappingListLinkRel } from '../../../../../reporting-shared/src/lib/aggregation-mapping.linkrel';
+import { createAggregationMappingListResource } from '../../../../../reporting-shared/test/aggregation-mapping';
 import { AggregationMappingListItemComponent } from './aggregation-mapping-list-item/aggregation-mapping-list-item.component';
 import { AggregationMappingListComponent } from './aggregation-mapping-list.component';
 
diff --git a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list.component.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list.component.ts
similarity index 92%
rename from alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list.component.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list.component.ts
index c427bc7903..4adecffe51 100644
--- a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-list/aggregation-mapping-list.component.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list.component.ts
@@ -3,7 +3,7 @@ import { createEmptyStateResource, getEmbeddedResources, isLoaded, isNotNil, Sta
 import { Component, Input } from '@angular/core';
 import { SpinnerComponent } from '@ods/component';
 import { ListComponent } from '@ods/system';
-import { AggregationMappingListLinkRel } from '../../../../reporting-shared/src/lib/aggregation-mapping.linkrel';
+import { AggregationMappingListLinkRel } from 'libs/admin/reporting-shared/src/lib/aggregation-mapping.linkrel';
 import { AggregationMappingListItemComponent } from './aggregation-mapping-list-item/aggregation-mapping-list-item.component';
 
 @Component({
diff --git a/alfa-client/libs/admin/statistik/src/test-setup.ts b/alfa-client/libs/admin/aggregation-mapping/src/test-setup.ts
similarity index 100%
rename from alfa-client/libs/admin/statistik/src/test-setup.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/test-setup.ts
diff --git a/alfa-client/libs/admin/statistik/tsconfig.json b/alfa-client/libs/admin/aggregation-mapping/tsconfig.json
similarity index 100%
rename from alfa-client/libs/admin/statistik/tsconfig.json
rename to alfa-client/libs/admin/aggregation-mapping/tsconfig.json
diff --git a/alfa-client/libs/admin/statistik/tsconfig.lib.json b/alfa-client/libs/admin/aggregation-mapping/tsconfig.lib.json
similarity index 100%
rename from alfa-client/libs/admin/statistik/tsconfig.lib.json
rename to alfa-client/libs/admin/aggregation-mapping/tsconfig.lib.json
diff --git a/alfa-client/libs/admin/statistik/tsconfig.spec.json b/alfa-client/libs/admin/aggregation-mapping/tsconfig.spec.json
similarity index 100%
rename from alfa-client/libs/admin/statistik/tsconfig.spec.json
rename to alfa-client/libs/admin/aggregation-mapping/tsconfig.spec.json
diff --git a/alfa-client/libs/admin/statistik/README.md b/alfa-client/libs/admin/statistik/README.md
deleted file mode 100644
index ad651ba5c6..0000000000
--- a/alfa-client/libs/admin/statistik/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# statistik
-
-This library was generated with [Nx](https://nx.dev).
-
-## Running unit tests
-
-Run `nx test statistik` to execute the unit tests.
diff --git a/alfa-client/libs/admin/statistik/src/index.ts b/alfa-client/libs/admin/statistik/src/index.ts
deleted file mode 100644
index c2e36a7669..0000000000
--- a/alfa-client/libs/admin/statistik/src/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component';
-export * from './lib/statistik-container/statistik-container.component';
-export * from './lib/statistik-fields-form/statistik-fields-form.component';
diff --git a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.html b/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.html
deleted file mode 100644
index e6db36aca8..0000000000
--- a/alfa-client/libs/admin/statistik/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<ods-spinner [stateResource]="listStateResource$ | async">
-  <admin-statistik-fields-form data-test-id="evaluate-fields-form"></admin-statistik-fields-form>
-</ods-spinner>
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-fields-mappings-form.component.html b/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-fields-mappings-form.component.html
deleted file mode 100644
index 7e2804257f..0000000000
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-fields-mappings-form.component.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<form [formGroup]="formService.form">
-  <div class="flex flex-col" [formArrayName]="StatistikFieldsFormService.FIELD_MAPPINGS">
-    <div *ngFor="let ignore of mappingsFormArray; let i = index">
-      <admin-statistik-field-mapping-form
-        [index]="i"
-        [attr.data-test-id]="'statistik-field-mapping-form-' + i"
-      ></admin-statistik-field-mapping-form>
-    </div>
-  </div>
-</form>
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-fields-mappings-form.component.ts b/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-fields-mappings-form.component.ts
deleted file mode 100644
index ff8b9135d1..0000000000
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-mappings-form/statistik-fields-mappings-form.component.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { ADMIN_FORMSERVICE } from '@admin-client/shared';
-import { CommonModule } from '@angular/common';
-import { Component, inject } from '@angular/core';
-import { AbstractControl, ReactiveFormsModule } from '@angular/forms';
-import { StatistikFieldsFormService } from '../statistik-fields.formservice';
-import { StatistikFieldMappingFormComponent } from './statistik-field-mapping-form/statistik-field-mapping-form.component';
-
-@Component({
-  selector: 'admin-statistik-fields-form-mapping',
-  templateUrl: './statistik-fields-mappings-form.component.html',
-  standalone: true,
-  imports: [CommonModule, ReactiveFormsModule, StatistikFieldMappingFormComponent],
-})
-export class StatistikFieldsMappingsFormComponent {
-  public readonly formService = <StatistikFieldsFormService>inject(ADMIN_FORMSERVICE);
-
-  public readonly mappingsFormArray: AbstractControl[] = this.formService.mappings.controls;
-
-  public readonly StatistikFieldsFormService = StatistikFieldsFormService;
-}
diff --git a/alfa-client/tsconfig.base.json b/alfa-client/tsconfig.base.json
index 615131502b..210fd016c7 100644
--- a/alfa-client/tsconfig.base.json
+++ b/alfa-client/tsconfig.base.json
@@ -25,7 +25,7 @@
       "@admin-client/reporting-shared": ["libs/admin/reporting-shared/src/index.ts"],
       "@admin-client/settings-shared": ["libs/admin/settings-shared/src/index.ts"],
       "@admin-client/shared": ["libs/admin/shared/src/index.ts"],
-      "@admin-client/statistik": ["libs/admin/statistik/src/index.ts"],
+      "@admin-client/aggregation-mapping": ["libs/admin/aggregation-mapping/src/index.ts"],
       "@admin-client/user": ["libs/admin/user/src/index.ts"],
       "@admin-client/user-shared": ["libs/admin/user-shared/src/index.ts"],
       "@admin/keycloak-shared": ["libs/admin/keycloak-shared/src/index.ts"],
-- 
GitLab