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-form/aggregation-mapping-field-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
index a1f28ea1c6aa638e0312669ff6e0ee67fff45aca..d5f466dd455aa9a62f69769e5e51c6fa4a22a7a5 100644
--- a/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
+++ 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
@@ -8,7 +8,7 @@ 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 { AggregationMappingFormService } from '../../aggregation-mapping-form.service';
+import { AggregationMappingFormservice } from '../../aggregation-mapping.formservice';
 import { AggregationMappingFieldFormComponent } from './aggregation-mapping-field-form.component';
 
 describe('AggregationMappingFieldFormComponent', () => {
@@ -21,20 +21,20 @@ describe('AggregationMappingFieldFormComponent', () => {
   const targetPathEditorTestId: string = getDataTestIdOf('target-mapping-field-0');
   const removeMappingButtonTestId: string = getDataTestIdOf('remove-mapping-0');
 
-  let formService: Mock<AggregationMappingFormService>;
+  let formService: Mock<AggregationMappingFormservice>;
 
   beforeEach(async () => {
     const form: FormGroup = formBuilder.group({
-      [AggregationMappingFormService.FIELD_MAPPINGS]: formBuilder.array([
+      [AggregationMappingFormservice.FIELD_MAPPINGS]: formBuilder.array([
         new FormGroup({
-          [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: new FormControl(EMPTY_STRING),
-          [AggregationMappingFormService.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(AggregationMappingFormService),
+      ...mock(AggregationMappingFormservice),
       form,
       addMapping: jest.fn(),
       removeMapping: jest.fn(),
@@ -42,8 +42,8 @@ describe('AggregationMappingFieldFormComponent', () => {
 
     mockGetValue(
       formService,
-      AggregationMappingFormService.FIELD_MAPPINGS,
-      form.controls[AggregationMappingFormService.FIELD_MAPPINGS],
+      AggregationMappingFormservice.FIELD_MAPPINGS,
+      form.controls[AggregationMappingFormservice.FIELD_MAPPINGS],
     );
 
     await TestBed.configureTestingModule({
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-form/aggregation-mapping-field-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
index d7e2e1f162b8f43a989c28a9656be72527720a24..346d5f27049b36d31cdb49547ffc49607f94496a 100644
--- a/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
+++ 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,7 +3,7 @@ import { Component, inject, Input } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { TextEditorComponent } from '@ods/component';
 import { ButtonComponent, DeleteIconComponent } from '@ods/system';
-import { AggregationMappingFormService } from '../../aggregation-mapping-form.service';
+import { AggregationMappingFormservice } from '../../aggregation-mapping.formservice';
 
 @Component({
   selector: 'admin-aggregation-mapping-field-form',
@@ -14,7 +14,7 @@ import { AggregationMappingFormService } from '../../aggregation-mapping-form.se
 export class AggregationMappingFieldFormComponent {
   @Input({ required: true }) index: number;
 
-  public readonly formService = <AggregationMappingFormService>inject(ADMIN_FORMSERVICE);
+  public readonly formService = <AggregationMappingFormservice>inject(ADMIN_FORMSERVICE);
 
-  public readonly AggregationMappingFormService = AggregationMappingFormService;
+  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.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
index 345f9cbf24e2ee287832c1c180a3de4de9f4fa16..724a1e08cc31da67b155908df64530bda5b3cc4d 100644
--- 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.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,7 +6,7 @@ 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 { AggregationMappingFormService } from '../aggregation-mapping-form.service';
+import { AggregationMappingFormservice } from '../aggregation-mapping.formservice';
 import { AggregationMappingFieldFormComponent } from './aggregation-mapping-field-form/aggregation-mapping-field-form.component';
 import { AggregationMappingFieldListFormComponent } from './aggregation-mapping-field-list-form.component';
 
@@ -18,20 +18,20 @@ describe('AggregationMappingFieldListFormComponent', () => {
 
   const formBuilder: FormBuilder = new FormBuilder();
 
-  let formService: Mock<AggregationMappingFormService>;
+  let formService: Mock<AggregationMappingFormservice>;
 
   beforeEach(async () => {
     const form: FormGroup = formBuilder.group({
-      [AggregationMappingFormService.FIELD_MAPPINGS]: formBuilder.array([
+      [AggregationMappingFormservice.FIELD_MAPPINGS]: formBuilder.array([
         new FormGroup({
-          [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: new FormControl(EMPTY_STRING),
-          [AggregationMappingFormService.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(AggregationMappingFormService),
+      ...mock(AggregationMappingFormservice),
       form,
       addMapping: jest.fn(),
       removeMapping: jest.fn(),
@@ -39,8 +39,8 @@ describe('AggregationMappingFieldListFormComponent', () => {
 
     mockGetValue(
       formService,
-      AggregationMappingFormService.FIELD_MAPPINGS,
-      form.controls[AggregationMappingFormService.FIELD_MAPPINGS],
+      AggregationMappingFormservice.FIELD_MAPPINGS,
+      form.controls[AggregationMappingFormservice.FIELD_MAPPINGS],
     );
 
     await TestBed.configureTestingModule({
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
index 2adaffcbef94ded1a9146583fc63545f478b5bc5..7b751ad91466cdf1b42f2f275bcaa9416882ddb1 100644
--- 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
@@ -2,7 +2,7 @@ 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 { AggregationMappingFormservice } from '../aggregation-mapping.formservice';
 import { AggregationMappingFieldFormComponent } from './aggregation-mapping-field-form/aggregation-mapping-field-form.component';
 
 @Component({
@@ -12,9 +12,9 @@ import { AggregationMappingFieldFormComponent } from './aggregation-mapping-fiel
   imports: [CommonModule, ReactiveFormsModule, AggregationMappingFieldFormComponent],
 })
 export class AggregationMappingFieldListFormComponent {
-  public readonly formService = <AggregationMappingFormService>inject(ADMIN_FORMSERVICE);
+  public readonly formService = <AggregationMappingFormservice>inject(ADMIN_FORMSERVICE);
 
   public readonly mappingsFormArray: AbstractControl[] = this.formService.mappings.controls;
 
-  public readonly AggregationMappingFormService = AggregationMappingFormService;
+  public readonly AggregationMappingFormService = AggregationMappingFormservice;
 }
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-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
index 30708be6ae1eeab28db947183c49573b09325adc..2abba71105c82b854633725a837836ec7f278f0a 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-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
@@ -21,7 +21,7 @@ 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';
+import { AggregationMappingFormservice } from './aggregation-mapping.formservice';
 
 describe('AggregationMappingFormComponent', () => {
   let component: AggregationMappingFormComponent;
@@ -37,18 +37,18 @@ describe('AggregationMappingFormComponent', () => {
 
   const formBuilder: FormBuilder = new FormBuilder();
 
-  let formService: Mock<AggregationMappingFormService>;
+  let formService: Mock<AggregationMappingFormservice>;
 
   beforeEach(async () => {
     const form: FormGroup = formBuilder.group({
-      [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),
+      [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(AggregationMappingFormService), form };
+    formService = <any>{ ...mock(AggregationMappingFormservice), form };
     formService.get = jest.fn().mockReturnValue(of(aggregationMappingStateResource));
 
     await TestBed.configureTestingModule({
@@ -67,7 +67,7 @@ describe('AggregationMappingFormComponent', () => {
         set: {
           providers: [
             {
-              provide: AggregationMappingFormService,
+              provide: AggregationMappingFormservice,
               useValue: formService,
             },
             {
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts
index d113a410a35fccfdd6fdb7bdafe6747c5f6f913c..4865e5521255cca5a9d421d8fc7a42e4764d433a 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.component.ts
@@ -8,7 +8,7 @@ import { SpinnerComponent, TextEditorComponent } from '@ods/component';
 import { ButtonComponent, PlusIconComponent } from '@ods/system';
 import { Observable } from 'rxjs';
 import { AggregationMappingFieldListFormComponent } from './aggregation-mapping-field-list-form/aggregation-mapping-field-list-form.component';
-import { AggregationMappingFormService } from './aggregation-mapping-form.service';
+import { AggregationMappingFormservice } from './aggregation-mapping.formservice';
 
 @Component({
   selector: 'admin-aggregation-mapping-form',
@@ -25,14 +25,14 @@ import { AggregationMappingFormService } from './aggregation-mapping-form.servic
     AsyncPipe,
     TextEditorComponent,
   ],
-  providers: [{ provide: ADMIN_FORMSERVICE, useClass: AggregationMappingFormService }],
+  providers: [{ provide: ADMIN_FORMSERVICE, useClass: AggregationMappingFormservice }],
 })
 export class AggregationMappingFormComponent {
-  public readonly formService = <AggregationMappingFormService>inject(ADMIN_FORMSERVICE);
+  public readonly formService = <AggregationMappingFormservice>inject(ADMIN_FORMSERVICE);
 
   public readonly aggregationMappingStateResource$: Observable<StateResource<AggregationMappingResource>> =
     this.formService.get();
 
-  public readonly AggregationMappingFormService = AggregationMappingFormService;
+  public readonly AggregationMappingFormService = AggregationMappingFormservice;
   public readonly Routes = ROUTES;
 }
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.spec.ts
index fab98f538a5914296066c2ee5034839f890580a6..72ad99b1ccbd64af919d0d67a83fa3c78551e988 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.spec.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.spec.ts
@@ -31,10 +31,10 @@ import { createAggregationMapping, createAggregationMappingResource } from 'libs
 import { omit } from 'lodash-es';
 import { of } from 'rxjs';
 import { singleColdCompleted } from '../../../../../../tech-shared/test/marbles';
-import { AggregationMappingFormService } from './aggregation-mapping-form.service';
+import { AggregationMappingFormservice } from './aggregation-mapping.formservice';
 
 describe('AggregationMappingFormService', () => {
-  let formService: AggregationMappingFormService;
+  let formService: AggregationMappingFormservice;
 
   let service: Mock<AggregationMappingService>;
 
@@ -42,10 +42,10 @@ describe('AggregationMappingFormService', () => {
     service = mock(AggregationMappingService);
 
     TestBed.configureTestingModule({
-      providers: [AggregationMappingFormService, { provide: AggregationMappingService, useValue: service }],
+      providers: [AggregationMappingFormservice, { provide: AggregationMappingService, useValue: service }],
     });
 
-    formService = TestBed.inject(AggregationMappingFormService);
+    formService = TestBed.inject(AggregationMappingFormservice);
   });
 
   it('should create', () => {
@@ -83,31 +83,31 @@ describe('AggregationMappingFormService', () => {
     it('should add mapping control', () => {
       formService.addMapping();
 
-      const mappingFormArray: FormArray = <FormArray>formService.form.controls[AggregationMappingFormService.FIELD_MAPPINGS];
+      const mappingFormArray: FormArray = <FormArray>formService.form.controls[AggregationMappingFormservice.FIELD_MAPPINGS];
       expect(mappingFormArray).toHaveLength(2);
       expect(mappingFormArray.controls[0].value).toEqual({
-        [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: EMPTY_STRING,
-        [AggregationMappingFormService.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[AggregationMappingFormService.FIELD_MAPPINGS]).push(
+      (<FormArray>formService.form.controls[AggregationMappingFormservice.FIELD_MAPPINGS]).push(
         new FormGroup({
-          [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: new FormControl('controlToRemove'),
-          [AggregationMappingFormService.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[AggregationMappingFormService.FIELD_MAPPINGS];
+      const mappingFormArray: FormArray = <FormArray>formService.form.controls[AggregationMappingFormservice.FIELD_MAPPINGS];
       expect(mappingFormArray).toHaveLength(1);
       expect(mappingFormArray.controls[0].value).toEqual({
-        [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: EMPTY_STRING,
-        [AggregationMappingFormService.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('AggregationMappingFormService', () => {
 
       expect(mappings).toHaveLength(1);
       expect(mappings.controls[0].value).toEqual({
-        [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: EMPTY_STRING,
-        [AggregationMappingFormService.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/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.service.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.ts
similarity index 78%
rename from alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.service.ts
rename to alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.ts
index 664ed436223eda558e60cef2d6242a2482be53ff..3096bf7854aeb7afb1efb242f3473f9e11e9bcf4 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-form.service.ts
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.ts
@@ -5,7 +5,7 @@ import { FormArray, FormControl, FormGroup, UntypedFormGroup } from '@angular/fo
 import { filter, Observable, tap } from 'rxjs';
 
 @Injectable()
-export class AggregationMappingFormService 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 AggregationMappingFormService extends AbstractFormService<Aggregati
 
   protected initForm(): UntypedFormGroup {
     return this.formBuilder.group({
-      [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),
+      [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),
       }),
-      [AggregationMappingFormService.FIELD_MAPPINGS]: new FormArray([this.createArrayControl()]),
+      [AggregationMappingFormservice.FIELD_MAPPINGS]: new FormArray([this.createArrayControl()]),
     });
   }
 
@@ -44,8 +44,8 @@ export class AggregationMappingFormService extends AbstractFormService<Aggregati
 
   private createArrayControl(sourcePath: string = EMPTY_STRING, targetPath: string = EMPTY_STRING): FormGroup {
     return new FormGroup({
-      [AggregationMappingFormService.FIELD_MAPPING_SOURCE_PATH]: new FormControl(sourcePath),
-      [AggregationMappingFormService.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 AggregationMappingFormService extends AbstractFormService<Aggregati
   }
 
   public get mappings(): FormArray {
-    return this.form.controls[AggregationMappingFormService.FIELD_MAPPINGS] as FormArray;
+    return this.form.controls[AggregationMappingFormservice.FIELD_MAPPINGS] as FormArray;
   }
 
   public get(): Observable<StateResource<AggregationMappingResource>> {
@@ -66,7 +66,7 @@ export class AggregationMappingFormService extends AbstractFormService<Aggregati
 
   _patchForm(value: AggregationMappingResource): void {
     this.patch(value);
-    const mappingsFormArray: FormArray = this.form.controls[AggregationMappingFormService.FIELD_MAPPINGS] as FormArray;
+    const mappingsFormArray: FormArray = this.mappings;
     mappingsFormArray.clear();
     value.mappings.forEach((mapping: FieldMapping) =>
       mappingsFormArray.push(this.createArrayControl(mapping.sourcePath, mapping.targetPath)),