diff --git a/alfa-client/apps/admin/src/app/app.routes.ts b/alfa-client/apps/admin/src/app/app.routes.ts
index a6321aee888738c2237430bb27804eb17e4713c6..44b769893cae372a19c2add6e06604171447dbb6 100644
--- a/alfa-client/apps/admin/src/app/app.routes.ts
+++ b/alfa-client/apps/admin/src/app/app.routes.ts
@@ -28,7 +28,7 @@ import { Route } from '@angular/router';
 import { OrganisationsEinheitFormPageComponent } from '../pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component';
 import { OrganisationsEinheitPageComponent } from '../pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component';
 import { PostfachPageComponent } from '../pages/postfach/postfach-page/postfach-page.component';
-import { AppStatistikFieldsFormPageComponent } from '../pages/statistik/statistik-fields-form-page/app-statistik-fields-form-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 { UserAddPageComponent } from '../pages/users-roles/user-add-page/user-add-page.component';
@@ -90,7 +90,7 @@ export const appRoutes: Route[] = [
   },
   {
     path: ROUTES.STATISTIK_NEU,
-    component: AppStatistikFieldsFormPageComponent,
+    component: StatistikFieldsFormPageComponent,
     title: 'Admin | Statistik weitere Felder auswerten',
     canActivate: [configurationGuard],
     data: <GuardData>{ linkRelName: ConfigurationLinkRel.AGGREGATION_MAPPINGS },
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/app-statistik-fields-form-page.component.html b/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.html
similarity index 100%
rename from alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/app-statistik-fields-form-page.component.html
rename to alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.html
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/app-statistik-fields-form-page.component.spec.ts b/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.spec.ts
similarity index 72%
rename from alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/app-statistik-fields-form-page.component.spec.ts
rename to alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.spec.ts
index 3d9bf5fd13dc9304362538612020420a84fcba1d..4ed8a8f65450d7d617769e4fc69d4ecb9ec87c82 100644
--- a/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/app-statistik-fields-form-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.spec.ts
@@ -3,20 +3,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MockComponent } from 'ng-mocks';
 import { AdminStatistikFieldsFormComponent } from '../../../../../../libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component';
 import { getDataTestIdOf } from '../../../../../../libs/tech-shared/test/data-test';
-import { AppStatistikFieldsFormPageComponent } from './app-statistik-fields-form-page.component';
+import { StatistikFieldsFormPageComponent } from './statistik-fields-form-page.component';
 
 describe('AppStatistikFieldsFormPageComponent', () => {
-  let component: AppStatistikFieldsFormPageComponent;
-  let fixture: ComponentFixture<AppStatistikFieldsFormPageComponent>;
+  let component: StatistikFieldsFormPageComponent;
+  let fixture: ComponentFixture<StatistikFieldsFormPageComponent>;
 
   const evaluateFieldsForm: string = getDataTestIdOf('evaluate-fields-form');
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [AppStatistikFieldsFormPageComponent, MockComponent(AdminStatistikFieldsFormComponent)],
+      imports: [StatistikFieldsFormPageComponent, MockComponent(AdminStatistikFieldsFormComponent)],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(AppStatistikFieldsFormPageComponent);
+    fixture = TestBed.createComponent(StatistikFieldsFormPageComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/app-statistik-fields-form-page.component.ts b/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.ts
similarity index 67%
rename from alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/app-statistik-fields-form-page.component.ts
rename to alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.ts
index 5fb1e1884625ba9de587f3f8709e2a47f4b949fb..e249c034417fc7133d8cc2c5db690ddcb94ea50f 100644
--- a/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/app-statistik-fields-form-page.component.ts
+++ b/alfa-client/apps/admin/src/pages/statistik/statistik-fields-form-page/statistik-fields-form-page.component.ts
@@ -3,9 +3,9 @@ import { Component } from '@angular/core';
 import { AdminStatistikFieldsFormComponent } from '../../../../../../libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component';
 
 @Component({
-  selector: 'app-app-statistik-fields-form-page',
+  selector: 'statistik-fields-form-page',
   standalone: true,
   imports: [CommonModule, AdminStatistikFieldsFormComponent],
-  templateUrl: './app-statistik-fields-form-page.component.html',
+  templateUrl: './statistik-fields-form-page.component.html',
 })
-export class AppStatistikFieldsFormPageComponent {}
+export class StatistikFieldsFormPageComponent {}
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.ts b/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.ts
index 1e74b105df36af783a691e857f71f8697c4c95b2..53fd00fc7c8677f8b78216c013f6f191bd24cd76 100644
--- a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.ts
+++ b/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.ts
@@ -25,7 +25,7 @@ import { StatistikContainerComponent } from '@admin-client/statistik';
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'app-statistik-page',
+  selector: 'statistik-page',
   standalone: true,
   imports: [StatistikContainerComponent],
   templateUrl: './statistik-page.component.html',