diff --git a/dmp-frontend/sonar-project.properties b/dmp-frontend/sonar-project.properties
index cc4b499f4..acd4540a7 100644
--- a/dmp-frontend/sonar-project.properties
+++ b/dmp-frontend/sonar-project.properties
@@ -1,6 +1,6 @@
 sonar.host.url=${ORACLE_URL}
 sonar.login=${ORACLE_TOKEN}
-sonar.projectKey=OpenDMP:frontend-api
+sonar.projectKey=OpenCDMP:frontend-api
 sonar.projectVersion=${BUILD_VERSION}
 sonar.sources=src
 sonar.exclusions=**/node_modules/**
diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts
index 8912dd361..cb457dfe0 100644
--- a/dmp-frontend/src/app/app.module.ts
+++ b/dmp-frontend/src/app/app.module.ts
@@ -42,7 +42,7 @@ import { MatomoService } from './core/services/matomo/matomo-service';
 import { TenantHandlingService } from './core/services/tenant/tenant-handling.service';
 import { GuidedTourModule } from './library/guided-tour/guided-tour.module';
 import { DepositOauth2DialogModule } from './ui/misc/deposit-oauth2-dialog/deposit-oauth2-dialog.module';
-import { OpenDMPCustomTranslationCompiler } from './utilities/translate/opendmp-custom-translation-compiler';
+import { OpenCDMPCustomTranslationCompiler } from './utilities/translate/opencdmp-custom-translation-compiler';
 
 // AoT requires an exported function for factories
 export function HttpLoaderFactory(languageHttpService: LanguageHttpService) {
@@ -128,7 +128,7 @@ export function InstallationConfigurationFactory(appConfig: ConfigurationService
 		AppRoutingModule,
 		CommonUiModule,
 		TranslateModule.forRoot({
-			compiler: { provide: TranslateCompiler, useClass: OpenDMPCustomTranslationCompiler },
+			compiler: { provide: TranslateCompiler, useClass: OpenCDMPCustomTranslationCompiler },
 			loader: {
 				provide: TranslateLoader,
 				useFactory: HttpLoaderFactory,
diff --git a/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts b/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts
index cbcea59c8..2da269382 100644
--- a/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts
+++ b/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts
@@ -75,8 +75,8 @@ export class EnumUtils {
 
 	toDatasetProfileFieldValidationTypeString(status: ValidationType): string {
 		switch (status) {
-			case ValidationType.None: return this.language.instant('TYPES.DATASET-PROFILE-FIELD-VALIDATION-TYPE.NONE');
-			case ValidationType.Required: return this.language.instant('TYPES.DATASET-PROFILE-FIELD-VALIDATION-TYPE.REQUIRED');
+			case ValidationType.None: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE.NONE');
+			case ValidationType.Required: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE.REQUIRED');
 		}
 	}
 
@@ -146,7 +146,7 @@ export class EnumUtils {
 			case DescriptionTemplateFieldType.BOOLEAN_DECISION: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.BOOLEAN-DECISION');
 			case DescriptionTemplateFieldType.RADIO_BOX: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.RADIO-BOX');
 			case DescriptionTemplateFieldType.INTERNAL_ENTRIES_DMPS: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.INTERNAL-DMP-ENTITIES-DMPS');
-			case DescriptionTemplateFieldType.INTERNAL_ENTRIES_DESCRIPTIONS: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.INTERNAL-DMP-ENTITIES-DATASETS');
+			case DescriptionTemplateFieldType.INTERNAL_ENTRIES_DESCRIPTIONS: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.INTERNAL-DMP-ENTITIES-DESCRIPTIONS');
 			case DescriptionTemplateFieldType.CHECK_BOX: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.CHECKBOX');
 			case DescriptionTemplateFieldType.FREE_TEXT: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.FREE-TEXT');
 			case DescriptionTemplateFieldType.TEXT_AREA: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.TEXT-AREA');
diff --git a/dmp-frontend/src/app/ui/admin/description-template/description-template.module.ts b/dmp-frontend/src/app/ui/admin/description-template/description-template.module.ts
index c88cb1070..5e0bf4231 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/description-template.module.ts
+++ b/dmp-frontend/src/app/ui/admin/description-template/description-template.module.ts
@@ -11,7 +11,7 @@ import { UserSettingsModule } from "@common/modules/user-settings/user-settings.
 import { CommonUiModule } from '@common/ui/common-ui.module';
 import { NgxDropzoneModule } from "ngx-dropzone";
 import { DescriptionTemplateRoutingModule } from './description-template.routing';
-import { DescriptionTemplateEditorCompositeFieldComponent } from './editor/components/composite-field/description-template-editor-composite-field.component';
+import { DescriptionTemplateEditorFieldSetComponent } from './editor/components/field-set/description-template-editor-field-set.component';
 import { DescriptionTemplateEditorDefaultValueComponent } from './editor/components/default-value/description-template-editor-default-value.component';
 import { DescriptionTemplateEditorExternalDatasetsFieldComponent } from './editor/components/field-type/external-datasets/description-template-editor-external-datasets-field.component';
 import { DescriptionTemplateEditorLabelAndMultiplicityFieldComponent } from './editor/components/field-type/label-and-multiplicity-field/description-template-editor-label-and-multiplicity-field.component';
@@ -63,7 +63,7 @@ import { TransitionGroupModule } from '@app/ui/transition-group/transition-group
 		DescriptionTemplateTableOfContentsInternalSection,
 		DescriptionTemplateEditorSectionFieldSetComponent,
 		DescriptionTemplateEditorSectionComponent,
-		DescriptionTemplateEditorCompositeFieldComponent,
+		DescriptionTemplateEditorFieldSetComponent,
 		DescriptionTemplateEditorFieldComponent,
 		DescriptionTemplateEditorDefaultValueComponent,
 		DescriptionTemplateEditorRuleComponent,
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/composite-field/description-template-editor-composite-field.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.html
similarity index 92%
rename from dmp-frontend/src/app/ui/admin/description-template/editor/components/composite-field/description-template-editor-composite-field.component.html
rename to dmp-frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.html
index 3eba84502..abec71bb4 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/composite-field/description-template-editor-composite-field.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.html
@@ -30,33 +30,33 @@
 	<ng-container *ngIf="!reorderingMode">
 		<div style="position: relative;" class="col-12" *ngIf="hasFocus" [@fade-in]>
 			<div *ngIf="showDescription" class="mb-4">
-				<h5 style="font-weight: bold" class="row">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.DESCRIPTION' | translate}}</h5>
-				<rich-text-editor-component [form]="form.get('description')" [placeholder]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.DESCRIPTION'" [wrapperClasses]="'row'" [editable]="!viewOnly">
+				<h5 style="font-weight: bold" class="row">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.DESCRIPTION' | translate}}</h5>
+				<rich-text-editor-component [form]="form.get('description')" [placeholder]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.DESCRIPTION'" [wrapperClasses]="'row'" [editable]="!viewOnly">
 				</rich-text-editor-component>
 				<mat-error *ngIf="this.form.get('description').hasError('backendError')">{{form.get('description').getError('backendError').message}}</mat-error>
 			</div>
 			<div *ngIf="showExtendedDescription" class="mb-4">
-				<h5 style="font-weight: bold" class="row">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.EXTENDED-DESCRIPTION' | translate}}</h5>
-				<rich-text-editor-component [form]="form.get('extendedDescription')" [placeholder]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.EXTENDED-DESCRIPTION'" [wrapperClasses]="'row'" [editable]="!viewOnly">
+				<h5 style="font-weight: bold" class="row">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.EXTENDED-DESCRIPTION' | translate}}</h5>
+				<rich-text-editor-component [form]="form.get('extendedDescription')" [placeholder]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.EXTENDED-DESCRIPTION'" [wrapperClasses]="'row'" [editable]="!viewOnly">
 				</rich-text-editor-component>
 				<mat-error *ngIf="this.form.get('extendedDescription').hasError('backendError')">{{form.get('extendedDescription').getError('backendError').message}}</mat-error>
 			</div>
 			<div class="row" *ngIf="showAdditionalInfo">
 				<mat-form-field class="col p-0 underline-line-field">
-					<input matInput type="text" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.ADDITIONAL-INFORMATION' | translate}}" [formControl]="this.form.get('additionalInformation')" />
+					<input matInput type="text" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.ADDITIONAL-INFORMATION' | translate}}" [formControl]="this.form.get('additionalInformation')" />
 					<mat-error *ngIf="this.form.get('additionalInformation').hasError('backendError')">{{form.get('additionalInformation').getError('backendError').message}}</mat-error>
 				</mat-form-field>
 			</div>
 
 			<div class="row">
 				<mat-form-field *ngIf="this.form.get('hasMultiplicity')?.value" class="col pl-0 underline-line-field">
-					<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-MIN' | translate}}</mat-label>
+					<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.MULTIPLICITY-MIN' | translate}}</mat-label>
 					<input matInput min="0" [max]="this.form.get('multiplicity').get('max').value" type="number" [formControl]="form.get('multiplicity').get('min')">
 					<mat-error *ngIf="form.get('multiplicity').get('min').hasError('backendError')">{{form.get('multiplicity').get('min').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="form.get('multiplicity').get('min').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 				</mat-form-field>
 				<mat-form-field *ngIf="this.form.get('hasMultiplicity')?.value" class="col pr-0 underline-line-field">
-					<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-MAX' | translate}}</mat-label>
+					<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.MULTIPLICITY-MAX' | translate}}</mat-label>
 					<input matInput [min]="this.form.get('multiplicity').get('min').value != null && this.form.get('multiplicity').get('min').value != 0? this.form.get('multiplicity').get('min').value != null : 1" type="number" [formControl]="this.form.get('multiplicity').get('max')">
 					<mat-error *ngIf="form.get('multiplicity').get('max').hasError('backendError')">{{form.get('multiplicity').get('max').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="form.get('multiplicity').get('max').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
@@ -64,14 +64,14 @@
 			</div>
 			<div class="row">
 				<mat-form-field *ngIf="this.form.get('hasMultiplicity')?.value" class="col pl-0 underline-line-field">
-					<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-PLACEHOLDER' | translate}}</mat-label>
+					<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.MULTIPLICITY-PLACEHOLDER' | translate}}</mat-label>
 					<input matInput type="text" [formControl]="form.get('multiplicity').get('placeholder')">
 					<mat-error *ngIf="form.get('multiplicity').get('placeholder').hasError('backendError')">{{form.get('placeholder').get('multiplicity').getError('backendError').message}}</mat-error>
 				</mat-form-field>
 			</div>
 			<div class="row">
 				<mat-checkbox *ngIf="this.form.get('hasMultiplicity')?.value" class="col pl-0 underline-line-field fieldset-checkbox-action-description-template-editor" [formControl]="form.get('multiplicity').get('tableView')">
-					{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-TABLEVIEW' | translate}}
+					{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.MULTIPLICITY-TABLEVIEW' | translate}}
 					<mat-error *ngIf="form.get('multiplicity').get('tableView').hasError('backendError')">{{form.get('multiplicity').get('tableView').getError('backendError').message}}</mat-error>
 				</mat-checkbox>
 			</div>
@@ -221,7 +221,7 @@
 									<mat-divider></mat-divider>
 									<button mat-list-item (click)="$event.stopPropagation();" style="font-style: italic;">
 										<img src="/assets/images/editor/icons/internal_entities.svg" class="input_icon" alt="Internal Entities icon">
-										Argos Entities
+										{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD.FIELDS.INTERNAL-ENTITIES' | translate}}
 									</button>
 									<mat-action-list class="ml-4">
 										<button mat-list-item (click)="addNewInput(descriptionTemplateFieldTypeEnum.INTERNAL_ENTRIES_DMPS)">
@@ -263,9 +263,9 @@
 							<mat-icon [matMenuTriggerFor]="menu" [matTooltip]="'DESCRIPTION-TEMPLATE-EDITOR.ACTIONS.FIELDSET.MORE' | translate" style="transform: translateY(-1px);">more_vert</mat-icon>
 							<mat-menu #menu="matMenu">
 								<!-- TODO to check -->
-								<mat-checkbox class="mat-menu-item" [disabled]="viewOnly" (click)="$event.stopPropagation()" [(ngModel)]="showDescription">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.DESCRIPTION' | translate}}</mat-checkbox>
-								<mat-checkbox class="mat-menu-item" [disabled]="viewOnly" (click)="$event.stopPropagation()" [(ngModel)]="showExtendedDescription">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.EXTENDED-DESCRIPTION' | translate}}</mat-checkbox>
-								<mat-checkbox class="mat-menu-item" [disabled]="viewOnly" (click)="$event.stopPropagation()" [(ngModel)]="showAdditionalInfo">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.ADDITIONAL-INFORMATION' | translate}}</mat-checkbox>
+								<mat-checkbox class="mat-menu-item" [disabled]="viewOnly" (click)="$event.stopPropagation()" [(ngModel)]="showDescription">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.DESCRIPTION' | translate}}</mat-checkbox>
+								<mat-checkbox class="mat-menu-item" [disabled]="viewOnly" (click)="$event.stopPropagation()" [(ngModel)]="showExtendedDescription">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.EXTENDED-DESCRIPTION' | translate}}</mat-checkbox>
+								<mat-checkbox class="mat-menu-item" [disabled]="viewOnly" (click)="$event.stopPropagation()" [(ngModel)]="showAdditionalInfo">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.ADDITIONAL-INFORMATION' | translate}}</mat-checkbox>
 							</mat-menu>
 						</li>
 					</ul>
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/composite-field/description-template-editor-composite-field.component.scss b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.scss
similarity index 100%
rename from dmp-frontend/src/app/ui/admin/description-template/editor/components/composite-field/description-template-editor-composite-field.component.scss
rename to dmp-frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.scss
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/composite-field/description-template-editor-composite-field.component.ts b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.ts
similarity index 94%
rename from dmp-frontend/src/app/ui/admin/description-template/editor/components/composite-field/description-template-editor-composite-field.component.ts
rename to dmp-frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.ts
index 8fe192267..a80e37a23 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/composite-field/description-template-editor-composite-field.component.ts
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.ts
@@ -26,12 +26,12 @@ import { ReferenceTypeService } from '@app/core/services/reference-type/referenc
 import { ReferenceType } from '@app/core/model/reference-type/reference-type';
 
 @Component({
-	selector: 'app-description-template-editor-composite-field-component',
-	templateUrl: './description-template-editor-composite-field.component.html',
-	styleUrls: ['./description-template-editor-composite-field.component.scss'],
+	selector: 'app-description-template-editor-field-set-component',
+	templateUrl: './description-template-editor-field-set.component.html',
+	styleUrls: ['./description-template-editor-field-set.component.scss'],
 	animations: [GENERAL_ANIMATIONS]
 })
-export class DescriptionTemplateEditorCompositeFieldComponent extends BaseComponent implements OnInit {
+export class DescriptionTemplateEditorFieldSetComponent extends BaseComponent implements OnInit {
 
 	@Input() form: UntypedFormGroup;
 	@Input() viewOnly: boolean;
@@ -202,19 +202,6 @@ export class DescriptionTemplateEditorCompositeFieldComponent extends BaseCompon
 		this.visibilityRulesService.setContext(mockDescription.descriptionTemplate.definition, this.previewPropertiesFormGroup);
 	}
 
-	onIsCompositeChange(isComposite: boolean) {
-		if (!isComposite && (<UntypedFormArray>this.form.get('fields')).length > 1) {
-			for (let i = 0; i < (<UntypedFormArray>this.form.get('fields')).length - 1; i++) {
-				(<UntypedFormArray>this.form.get('fields')).removeAt(1);
-			}
-			(this.form.get('fields') as UntypedFormArray).controls.splice(1);
-		}
-		if ((<UntypedFormArray>this.form.get('fields')).length === 0) {
-			const field: DescriptionTemplateFieldEditorModel = new DescriptionTemplateFieldEditorModel();
-			(<UntypedFormArray>this.form.get('fields')).push(field.buildForm());
-		}
-	}
-
 	onIsMultiplicityEnabledChange(isMultiplicityEnabled: MatCheckboxChange) {
 		const multiplicity = this.form.get('multiplicity') as UntypedFormGroup;
 
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-type/external-datasets/description-template-editor-external-datasets-field.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-type/external-datasets/description-template-editor-external-datasets-field.component.html
index a92f6aea1..be786c25c 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-type/external-datasets/description-template-editor-external-datasets-field.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-type/external-datasets/description-template-editor-external-datasets-field.component.html
@@ -1,5 +1,5 @@
 <div class="row" *ngIf="form.get('data')">
-	<h5 style="font-weight: bold" class="col-12">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-EXTERNAL-DATASETS-TITLE'
+	<h5 style="font-weight: bold" class="col-12">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-EXTERNAL-DESCRIPTIONS-TITLE'
 		| translate}}</h5>
 	<mat-checkbox class="col-auto" [formControl]="this.form.get('data').get('multipleSelect')">
 		{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-MULTIPLE-AUTOCOMPLETE' | translate}}
@@ -7,7 +7,7 @@
 
 	<div class="col-6">
 		<mat-form-field class="w-100">
-			<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-EXTERNAL-DATASETS-PLACEHOLDER' | translate}}</mat-label>
+			<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-EXTERNAL-DESCRIPTIONS-PLACEHOLDER' | translate}}</mat-label>
 			<input matInput type="string" [formControl]="form.get('data').get('label')">
 			<mat-error *ngIf="form.get('data').get('label').hasError('backendError')">{{form.get('data').get('label').getError('backendError').message}}</mat-error>
 		</mat-form-field>
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html
index c34093aa0..e58189a3a 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html
@@ -91,7 +91,7 @@
 					</mat-optgroup>
 					<!-- TODO -->
 					<mat-divider></mat-divider>
-					<mat-optgroup label="Argos Entities">
+					<mat-optgroup label="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD.FIELDS.INTERNAL-ENTITIES' | translate}}">
 						<mat-option [value]="descriptionTemplateFieldTypeEnum.INTERNAL_ENTRIES_DMPS">
 							<img src="/assets/images/editor/icons/api_entity.svg" class="input_icon" alt="InternalDmpEntities icon">
 							{{enumUtils.toDescriptionTemplateFieldTypeString(descriptionTemplateFieldTypeEnum.INTERNAL_ENTRIES_DMPS)}}
@@ -136,14 +136,14 @@
 		</ng-container>
 		
 		<div class="col-auto">
-			<mat-checkbox [formControl]="this.form.get('includeInExport')" [disabled]="viewOnly">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.EXPORT' | translate}}</mat-checkbox>
+			<mat-checkbox [formControl]="this.form.get('includeInExport')" [disabled]="viewOnly">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.EXPORT' | translate}}</mat-checkbox>
 			<mat-error *ngIf="form.get('includeInExport').hasError('backendError')">{{form.get('includeInExport').getError('backendError').message}}</mat-error>
 		</div>
 		
 		<div class="col-12">
 			<mat-form-field class="w-100">
-				<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.SEMANTICS' | translate}}</mat-label>
-				<app-multiple-auto-complete placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.SEMANTICS' | translate}}" [required]="false" [separatorKeysCodes]="separatorKeysCodes" [formControl]="this.form.get('semantics')" [configuration]="semanticsService.multipleAutocompleteConfiguration">
+				<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.SEMANTICS' | translate}}</mat-label>
+				<app-multiple-auto-complete placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD-SET.FIELDS.SEMANTICS' | translate}}" [required]="false" [separatorKeysCodes]="separatorKeysCodes" [formControl]="this.form.get('semantics')" [configuration]="semanticsService.multipleAutocompleteConfiguration">
 				</app-multiple-auto-complete>
 				<mat-error *ngIf="form.get('semantics').hasError('backendError')">{{form.get('semantics').getError('backendError').message}}</mat-error>
 			</mat-form-field>
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.html
index fedcacbd4..fb4a75012 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.html
@@ -63,7 +63,7 @@
 								<mat-icon class="handle dragpan">drag_indicator</mat-icon>
 							</button>
 						</mat-card-header>
-						<app-description-template-editor-composite-field-component [reorderingMode]="reorderingMode" [form]="fieldset"
+						<app-description-template-editor-field-set-component [reorderingMode]="reorderingMode" [form]="fieldset"
 							[availableReferenceTypes]="availableReferenceTypes"
 							[viewOnly]="viewOnly" [numbering]="numbering + '.'+ (i+1)"
 							[hasFocus]="fieldset.get('id').value === selectedFieldSetId"
@@ -71,7 +71,7 @@
 							[validationErrorModel]="validationErrorModel"
 							[validationRootPath]="validationRootPath + '.fieldSets[' + i + ']'"
 							>
-						</app-description-template-editor-composite-field-component>
+						</app-description-template-editor-field-set-component>
 					</mat-card-content>
 				</mat-card>
 			</div>
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
index c840ec341..ccaad1d7b 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
@@ -49,20 +49,20 @@
 			<div class="col-9">
 				<div class="col">
 					<div class="col-12">
-						<div class="heading">1.1 {{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-NAME'| translate}} *</div>
-						<div class="hint">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-NAME-HINT'| translate}}</div>
+						<div class="heading">1.1 {{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-NAME'| translate}} *</div>
+						<div class="hint">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-NAME-HINT'| translate}}</div>
 						<mat-form-field class="full-width basic-info-input">
-							<input matInput [formControl]="formGroup.get('label')" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.FIELDS.DATASET-TITLE' | translate}}">
+							<input matInput [formControl]="formGroup.get('label')" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.FIELDS.TITLE' | translate}}">
 							<mat-error *ngIf="formGroup.get('label').hasError('backendError')">{{formGroup.get('label').getError('backendError').message}}</mat-error>
 							<mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 						</mat-form-field>
 					</div>
 					<div class="col-12">
-						<div class="heading">1.2 {{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-DESCRIPTION'| translate}} *</div>
+						<div class="heading">1.2 {{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-DESCRIPTION'| translate}} *</div>
 						<!-- <div class="hint">{{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}</div> -->
-						<div class="hint">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-DESCRIPTION-HINT'| translate}}</div>
+						<div class="hint">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-DESCRIPTION-HINT'| translate}}</div>
 						<div class="full-width basic-info-input">
-							<rich-text-editor-component [form]="formGroup.get('description')" [placeholder]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER'" [wrapperClasses]="(formGroup.get('description').touched && formGroup.get('description').hasError('required')) ? 'required' : ''" [editable]="formGroup.controls['description'].status !== 'DISABLED'">
+							<rich-text-editor-component [form]="formGroup.get('description')" [placeholder]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-DESCRIPTION-PLACEHOLDER'" [wrapperClasses]="(formGroup.get('description').touched && formGroup.get('description').hasError('required')) ? 'required' : ''" [editable]="formGroup.controls['description'].status !== 'DISABLED'">
 							</rich-text-editor-component>
 							<div [class]="(formGroup.get('description').touched && formGroup.get('description').hasError('required')) ? 'visible' : 'invisible'" class="mat-form-field formGroup-field-subscript-wrapper">
 								<mat-error>{{'GENERAL.VALIDATION.REQUIRED'| translate}}</mat-error>
@@ -73,7 +73,7 @@
 
 					<div class="col-12">
 						<div class="heading">1.3 {{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-TYPE'| translate}} *</div>
-						<div class="hint">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-TYPE-HINT'| translate}}</div>
+						<div class="hint">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-TYPE-HINT'| translate}}</div>
 						<mat-form-field class="full-width basic-info-input">
 							<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-SELECT-TYPE' | translate}}</mat-label>
 							<app-single-auto-complete [required]="false" [formControl]="formGroup.get('type')" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-SELECT-TYPE' | translate}}" [configuration]="singleAutocompleteDescriptionTemplateTypeConfiguration">
@@ -84,11 +84,11 @@
 					</div>
 					<div class="col-12">
 						<!-- <div class="heading">1.4 {{'DMP-EDITOR.FIELDS.LANGUAGE' | translate}}</div> -->
-						<div class="heading">1.4 {{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-LANGUAGE'| translate}} *</div>
-						<div class="hint">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-LANGUAGE-HINT'| translate}}</div>
+						<div class="heading">1.4 {{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-LANGUAGE'| translate}} *</div>
+						<div class="hint">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-LANGUAGE-HINT'| translate}}</div>
 						<mat-form-field class="full-width basic-info-input">
-							<!-- <input matInput formControlName="description" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.FIELDS.DATASET-DESCRIPTION' | translate}}" required> -->
-							<mat-select [formControl]="formGroup.get('language')" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-SELECT-LANGUAGE'| translate}}">
+							<!-- <input matInput formControlName="description" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.FIELDS.DESCRIPTION' | translate}}" required> -->
+							<mat-select [formControl]="formGroup.get('language')" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-SELECT-LANGUAGE'| translate}}">
 								<mat-option *ngFor="let lang of availableLanguages" [value]="lang.code">
 									{{ lang.name }}
 								</mat-option>
@@ -98,8 +98,8 @@
 						</mat-form-field>
 					</div>
 					<div class="col-12">
-						<div class="heading">1.5 {{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS'| translate}}</div>
-						<div class="hint">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS-HINT'| translate}}</div>
+						<div class="heading">1.5 {{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-USERS'| translate}}</div>
+						<div class="hint">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-USERS-HINT'| translate}}</div>
 						<div class="full-width basic-info-input">
 							<table class="col-12 user-table">
 								<thead class="user-table-header">
@@ -114,12 +114,12 @@
 										<td>{{usersMap.get(user?.get('userId')?.value)?.name}}</td>
 										<td>{{enumUtils.toUserDescriptionTemplateRoleString(user?.get('role')?.value)}}</td>
 										<td>
-											<button [disabled]="formGroup.disabled" mat-button class="delete-btn" (click)="verifyAndRemoveUser(i)" [matTooltip]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-REMOVE-USER'| translate"><mat-icon>person_remove</mat-icon></button>
+											<button [disabled]="formGroup.disabled" mat-button class="delete-btn" (click)="verifyAndRemoveUser(i)" [matTooltip]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-REMOVE-USER'| translate"><mat-icon>person_remove</mat-icon></button>
 										</td>
 									</tr>
 									<tr *ngIf="formGroup.get('users')?.controls?.length === 0">
 										<td style="text-align: end; line-height: 3em;" colspan="2">
-											{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-NO-USERS-YET' | translate}}
+											{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-NO-USERS-YET' | translate}}
 										</td>
 									</tr>
 								</tbody>
@@ -131,18 +131,18 @@
 						<div class="row justify-content-end">
 							<div class="col-12 col-lg-4 d-flex justify-content-end" style="overflow: hidden;">
 								<!-- <mat-form-field>
-										<input matInput #email placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS'| translate}}" (focus)="onUserFieldFocus()" (blur)="onUserFieldBlur()" (keyup.enter)="addUser(email)">
+										<input matInput #email placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-USERS'| translate}}" (focus)="onUserFieldFocus()" (blur)="onUserFieldBlur()" (keyup.enter)="addUser(email)">
 									</mat-form-field> -->
 								<mat-form-field class="full-width basic-info-input" *ngIf="!formGroup.disabled">
-									<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS' | translate}}</mat-label>
-									<app-single-auto-complete [required]="false" [formControl]="userFormControl" (optionSelected)="addUser($event)" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS' | translate}}" [configuration]="userService.singleAutocompleteConfiguration">
+									<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-USERS' | translate}}</mat-label>
+									<app-single-auto-complete [required]="false" [formControl]="userFormControl" (optionSelected)="addUser($event)" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-USERS' | translate}}" [configuration]="userService.singleAutocompleteConfiguration">
 									</app-single-auto-complete>
 									<mat-error *ngIf="formGroup.get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 								</mat-form-field>
 							</div>
 
 							<!-- <div class="col-auto">
-									<button mat-mini-fab color="primary" (click)="addUser(email)" (focus)="onUserButtonFocus()" (blur)="onUserButtonBlur()" [matTooltip]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-VALIDATE-AND-ADD-USER'| translate" [disabled]="userFormDisabled">
+									<button mat-mini-fab color="primary" (click)="addUser(email)" (focus)="onUserButtonFocus()" (blur)="onUserButtonBlur()" [matTooltip]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-VALIDATE-AND-ADD-USER'| translate" [disabled]="userFormDisabled">
 										<ng-container *ngIf="inputUserState === 'untriggered' else triggericon">
 											<mat-icon>add</mat-icon>
 										</ng-container>
diff --git a/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html b/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html
index 6481467ec..d426f0628 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html
@@ -112,7 +112,6 @@
 					<mat-icon>delete</mat-icon>
 					{{'DESCRIPTION-TEMPLATE-LISTING.ACTIONS.DELETE' | translate}}
 				</button>
-				<!--<button *ngIf="row.status==1" mat-menu-item (click)="makeItPublic(row.id)"><mat-icon>people_outline</mat-icon>{{'DATASET-LISTING.ACTIONS.MAKE-IT-PUBLIC' | translate}}</button> -->
 			</mat-menu>
 		</div>
 	</div>
diff --git a/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html b/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html
index 6a5393ab0..b33c3e2bc 100644
--- a/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html
@@ -100,7 +100,6 @@
 					<mat-icon>delete</mat-icon>
 					{{'DESCRIPTION-TEMPLATE-TYPE-LISTING.ACTIONS.DELETE' | translate}}
 				</button>
-				<!--<button *ngIf="row.status==1" mat-menu-item (click)="makeItPublic(row.id)"><mat-icon>people_outline</mat-icon>{{'DATASET-LISTING.ACTIONS.MAKE-IT-PUBLIC' | translate}}</button> -->
 			</mat-menu>
 		</div>
 	</div>
diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html
index 3b1c16722..bb7918bdd 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html
+++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html
@@ -108,7 +108,6 @@
 					<mat-icon>delete</mat-icon>
 					{{'DMP-BLUEPRINT-LISTING.ACTIONS.DELETE' | translate}}
 				</button>
-				<!--<button *ngIf="row.status==1" mat-menu-item (click)="makeItPublic(row.id)"><mat-icon>people_outline</mat-icon>{{'DATASET-LISTING.ACTIONS.MAKE-IT-PUBLIC' | translate}}</button> -->
 			</mat-menu>
 		</div>
 	</div>
diff --git a/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html b/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html
index 5c26c2235..977928ba2 100644
--- a/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html
+++ b/dmp-frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html
@@ -103,7 +103,6 @@
 					<mat-icon>delete</mat-icon>
 					{{'REFERENCE-TYPE-LISTING.ACTIONS.DELETE' | translate}}
 				</button>
-				<!--<button *ngIf="row.status==1" mat-menu-item (click)="makeItPublic(row.id)"><mat-icon>people_outline</mat-icon>{{'DATASET-LISTING.ACTIONS.MAKE-IT-PUBLIC' | translate}}</button> -->
 			</mat-menu>
 		</div>
 	</div>
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
index 97927ef87..53053eeed 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
@@ -34,7 +34,7 @@
 									{{'DASHBOARD.NEW-QUESTION' | translate}} <a href="https://www.openaire.eu/how-to-create-a-data-management-plan" target="_blank"><u>{{'DASHBOARD.OPEN-AIR-GUIDE' | translate}}</u></a> {{'DASHBOARD.LEARN-MORE' | translate}}
 								</p>
 								<p *ngIf="this.hasDmps()" class="card-content mb-0 pt-0">{{'DASHBOARD.DMP-ABOUT-BEG' | translate}}
-									<b>{{'DASHBOARD.DATASET-DESCRIPTIONS-DASHBOARD-TEXT' | translate}}</b>
+									<b>{{'DASHBOARD.DESCRIPTIONS-DASHBOARD-TEXT' | translate}}</b>
 									{{'DASHBOARD.DMP-ABOUT-END' | translate}}
 								</p>
 
diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.component.html b/dmp-frontend/src/app/ui/description/editor/description-editor.component.html
index 9718789c7..5ab7b3225 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-editor.component.html
+++ b/dmp-frontend/src/app/ui/description/editor/description-editor.component.html
@@ -29,7 +29,7 @@
 								<div class="row h-100">
 
 									<div class="col-auto d-flex align-items-center">
-										<button *ngIf="formGroup.get('id').value" [disabled]="isDirty()" [matTooltipDisabled]="!isDirty()" mat-raised-button class="description-export-btn" type="button" [matMenuTriggerFor]="exportMenu" (click)="$event.stopPropagation();" [matTooltip]="'DATASET-EDITOR.ACTIONS.DISABLED-EXPORT' | translate">
+										<button *ngIf="formGroup.get('id').value" [disabled]="isDirty()" [matTooltipDisabled]="!isDirty()" mat-raised-button class="description-export-btn" type="button" [matMenuTriggerFor]="exportMenu" (click)="$event.stopPropagation();" [matTooltip]="'DESCRIPTION-EDITOR.ACTIONS.DISABLED-EXPORT' | translate">
 											{{ 'DESCRIPTION-EDITOR.ACTIONS.EXPORT' | translate }}
 											<mat-icon [disabled]="isDirty()" style="width: 14px;">expand_more</mat-icon>
 										</button>
diff --git a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html
index 98f25325c..5ac1c3677 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html
+++ b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html
@@ -13,7 +13,7 @@
 		<div class="col-12 mb-2">
 			<app-description-form-field-set-title [fieldSet]="fieldSet" [path]="path" [hideTitle]="true"></app-description-form-field-set-title>
 		</div>
-		<div *ngFor="let field of fieldSet.fields; let i = index;" class="col-12 compositeField">
+		<div *ngFor="let field of fieldSet.fields; let i = index;" class="col-12 fieldSet">
 			<div class="row">
 				<h5 *ngIf="placeholderTitle" class="col-auto font-weight-bold">{{field.label}}</h5>
 			</div>
diff --git a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html
index 4ff5511ed..0a2acde22 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html
+++ b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html
@@ -1,5 +1,5 @@
 <div class="container p-0">
-	<div *ngIf="fieldSet" class="dynamic-form-composite-field row">
+	<div *ngIf="fieldSet" class="row">
 		<div *ngIf="showTitle" class="col-12">
 			<div class="row align-items-center">
 				<div class="col">
@@ -7,7 +7,7 @@
 				</div>
 				<div *ngIf="!hideAnnotations" class="col-auto">
 					<button mat-icon-button class="col-auto annotation-icon" (click)="showAnnotations(fieldSet.id)" [disabled]="!canReview">
-						<mat-icon matTooltip="{{'DATASET-EDITOR.QUESTION.EXTENDED-DESCRIPTION.ANNOTATIONS' | translate}}" [matBadge]="annotationsCount" [matBadgeHidden]="annotationsCount <= 0" matBadgeColor="warn">comment</mat-icon>
+						<mat-icon matTooltip="{{'DESCRIPTION-EDITOR.QUESTION.EXTENDED-DESCRIPTION.ANNOTATIONS' | translate}}" [matBadge]="annotationsCount" [matBadgeHidden]="annotationsCount <= 0" matBadgeColor="warn">comment</mat-icon>
 					</button>
 				</div>
 			</div>
diff --git a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.scss b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.scss
index 80556e66c..ffd9da7cd 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.scss
+++ b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.scss
@@ -1,4 +1,4 @@
-.compositeField {
+.fieldSet {
   padding-left: 0em !important;
 }
 
diff --git a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html
index 7f65e8662..7bcce43b0 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html
+++ b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html
@@ -21,10 +21,10 @@
 
 	<div *ngSwitchCase="descriptionTemplateFieldTypeEnum.REFERENCE_TYPES" class="col-12">
 		<ng-container *ngIf="field.data.multipleSelect">
-			<app-reference-field-component [form]="propertiesFormGroup?.get(field.id).get('references')" [label]="field.data.label" [placeholder]="field.data.label" [referenceType]="field.data.referenceType" [multiple]="true" hint="{{ 'TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT' | translate }}"></app-reference-field-component>
+			<app-reference-field-component [form]="propertiesFormGroup?.get(field.id).get('references')" [label]="field.data.label" [placeholder]="field.data.label" [referenceType]="field.data.referenceType" [multiple]="true" hint="{{ 'TYPES.DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT' | translate }}"></app-reference-field-component>
 		</ng-container>
 		<ng-container *ngIf="!(field.data.multipleSelect)">
-			<app-reference-field-component [form]="propertiesFormGroup?.get(field.id).get('reference')" [label]="field.data.label" [placeholder]="field.data.label" [referenceType]="field.data.referenceType" [multiple]="false" hint="{{ 'TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT' | translate }}"></app-reference-field-component>
+			<app-reference-field-component [form]="propertiesFormGroup?.get(field.id).get('reference')" [label]="field.data.label" [placeholder]="field.data.label" [referenceType]="field.data.referenceType" [multiple]="false" hint="{{ 'TYPES.DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT' | translate }}"></app-reference-field-component>
 		</ng-container>
 	</div>
 	<div *ngSwitchCase="descriptionTemplateFieldTypeEnum.SELECT" class="col-12">
@@ -61,7 +61,7 @@
 					</app-multiple-auto-complete>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textListValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-					<mat-hint>{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}</mat-hint>
+					<mat-hint>{{ "TYPES.DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}</mat-hint>
 				</mat-form-field>
 			</ng-container>
 			<ng-container *ngIf="!(field.data.multipleSelect)">
@@ -71,7 +71,7 @@
 					</app-single-auto-complete>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-					<mat-hint>{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}</mat-hint>
+					<mat-hint>{{ "TYPES.DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}</mat-hint>
 				</mat-form-field>
 			</ng-container>
 		</div>
@@ -85,7 +85,7 @@
 					</app-multiple-auto-complete>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textListValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-					<mat-hint>{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}</mat-hint>
+					<mat-hint>{{ "TYPES.DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}</mat-hint>
 				</mat-form-field>
 			</ng-container>
 			<ng-container *ngIf="!(field.data.multipleSelect)">
@@ -95,7 +95,7 @@
 					</app-single-auto-complete>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-					<mat-hint>{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}</mat-hint>
+					<mat-hint>{{ "TYPES.DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}</mat-hint>
 				</mat-form-field>
 			</ng-container>
 		</div>
@@ -147,14 +147,14 @@
 
 			<button *ngIf="propertiesFormGroup?.get(field.id).get('textValue').value && !filesToUpload" mat-button (click)="download()" type="button" class="attach-file-btn">
 				<mat-icon class="mr-2">download</mat-icon>
-				<mat-label>{{ "TYPES.DATASET-PROFILE-UPLOAD-TYPE.DOWNLOAD" | translate }}</mat-label>
+				<mat-label>{{ "TYPES.DESCRIPTION-TEMPLATE-UPLOAD-TYPE.DOWNLOAD" | translate }}</mat-label>
 			</button>
 		</div>
 	</ng-container>
 	<div *ngSwitchCase="descriptionTemplateFieldTypeEnum.BOOLEAN_DECISION" class="col-12">
 		<mat-radio-group [formControl]="propertiesFormGroup?.get(field.id).get('booleanValue')">
-			<mat-radio-button class="radio-button-item" [value]="true">{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.ACTIONS.YES" | translate }}</mat-radio-button>
-			<mat-radio-button class="radio-button-item" [value]="false">{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.ACTIONS.NO" | translate }}</mat-radio-button>
+			<mat-radio-button class="radio-button-item" [value]="true">{{ "TYPES.DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE.ACTIONS.YES" | translate }}</mat-radio-button>
+			<mat-radio-button class="radio-button-item" [value]="false">{{ "TYPES.DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE.ACTIONS.NO" | translate }}</mat-radio-button>
 			<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('booleanValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('booleanValue').getError('backendError').message}}</mat-error>
 		</mat-radio-group>
 		<small class="text-danger d-block" *ngIf="propertiesFormGroup?.get(field.id).get('booleanValue').hasError('required') && propertiesFormGroup?.get(field.id).get('booleanValue').touched">{{'GENERAL.VALIDATION.REQUIRED' | translate}}
@@ -216,7 +216,7 @@
 			</mat-form-field>
 			<mat-form-field class="col-md-4">
 				<mat-label>{{ field.data.label }}</mat-label>
-				<mat-select class="col-md-12" [formControl]="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('type')" [placeholder]="'TYPES.DATASET-PROFILE-VALIDATOR.REPOSITORIES-PLACEHOLDER' | translate">
+				<mat-select class="col-md-12" [formControl]="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('type')" [placeholder]="'TYPES.DESCRIPTION-TEMPLATE-VALIDATOR.REPOSITORIES-PLACEHOLDER' | translate">
 					<mat-option *ngFor="let type of validationTypes" [value]="type.value">
 						{{ type.name }}
 					</mat-option>
@@ -225,7 +225,7 @@
 				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 			</mat-form-field>
 			<div class="col-md-2">
-				<button type="button" mat-button class="lightblue-btn" (click)="validateId()" [disabled]="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('identifier').disabled">{{ "TYPES.DATASET-PROFILE-VALIDATOR.ACTION" | translate }}</button>
+				<button type="button" mat-button class="lightblue-btn" (click)="validateId()" [disabled]="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('identifier').disabled">{{ "TYPES.DESCRIPTION-TEMPLATE-VALIDATOR.ACTION" | translate }}</button>
 				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('identifier').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('identifier').getError('backendError').message}}</mat-error>
 				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('identifier').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 			</div>
diff --git a/dmp-frontend/src/app/ui/description/editor/form-progress-indication/form-progress-indication.component.ts b/dmp-frontend/src/app/ui/description/editor/form-progress-indication/form-progress-indication.component.ts
index 41d2807c7..328b8f691 100644
--- a/dmp-frontend/src/app/ui/description/editor/form-progress-indication/form-progress-indication.component.ts
+++ b/dmp-frontend/src/app/ui/description/editor/form-progress-indication/form-progress-indication.component.ts
@@ -113,7 +113,7 @@ export class FormProgressIndicationComponent extends BaseComponent implements On
 					valueCurent++;
 			}
 			if (this.chechFieldIfIsFieldSetAndVisible((formControl as UntypedFormGroup)) && this.checkIfIsRequired((formControl as UntypedFormGroup))) {
-				valueCurent = valueCurent + this.compositeFieldsGetChildsForProgress(formControl);
+				valueCurent = valueCurent + this.fieldSetsGetChildsForProgress(formControl);
 			} else {
 				Object.keys(formControl.controls).forEach(item => {
 					const control = formControl.get(item);
@@ -131,7 +131,7 @@ export class FormProgressIndicationComponent extends BaseComponent implements On
 		return formGroup.get('value').valid && formGroup.get('value').value != null && formGroup.get('value').value !== '' && (this.visibilityRulesService.isVisibleMap[formGroup.get('id').value] ?? true);
 	}
 
-	private compositeFieldsGetChildsForProgress(formGroup: UntypedFormGroup): number {
+	private fieldSetsGetChildsForProgress(formGroup: UntypedFormGroup): number {
 		let valueCurent = 0;
 		if (this.visibilityRulesService.isVisibleMap[formGroup.get('id').value] ?? true) {
 			(formGroup.get('fields') as UntypedFormArray).controls.forEach((element: UntypedFormGroup) => {
@@ -173,7 +173,7 @@ export class FormProgressIndicationComponent extends BaseComponent implements On
 			if ((formControl as UntypedFormGroup).contains('id') && (formControl as UntypedFormGroup).contains('value') && (this.visibilityRulesService.isVisibleMap[(formControl as UntypedFormGroup).get('id').value] ?? true) && this.checkIfIsRequired((formControl as UntypedFormGroup))) {
 				valueCurent++;
 			} else if ((formControl as UntypedFormGroup).contains('id') && (formControl as UntypedFormGroup).contains('fields')) {
-				valueCurent = valueCurent + this.compositeFieldsGetChildsForTotal(formControl);
+				valueCurent = valueCurent + this.fieldSetsGetChildsForTotal(formControl);
 			} else {
 				Object.keys(formControl.controls).forEach(item => {
 					const control = formControl.get(item);
@@ -185,7 +185,7 @@ export class FormProgressIndicationComponent extends BaseComponent implements On
 		return valueCurent;
 	}
 
-	private compositeFieldsGetChildsForTotal(formGroup: UntypedFormGroup): number {
+	private fieldSetsGetChildsForTotal(formGroup: UntypedFormGroup): number {
 		let valueCurent = 0;
 		if (this.visibilityRulesService.isVisibleMap[formGroup.get('id').value] ?? true) {
 			(formGroup.get('fields') as UntypedFormArray).controls.forEach((element: UntypedFormGroup) => {
diff --git a/dmp-frontend/src/app/ui/description/listing/description-listing.component.html b/dmp-frontend/src/app/ui/description/listing/description-listing.component.html
index 4cdf524e4..7aeae1213 100644
--- a/dmp-frontend/src/app/ui/description/listing/description-listing.component.html
+++ b/dmp-frontend/src/app/ui/description/listing/description-listing.component.html
@@ -5,7 +5,7 @@
 				<!-- <div class="card mt-0" [style.display]="isVisible ? 'block' : 'none'"> -->
 				<!-- <a class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto pt-3 material-icons clear-icon">clear</span></a> -->
 				<div class="card-content info-text mb-0">
-					<p>{{'DESCRIPTION-LISTING.TEXT-INFO' | translate}} <u class="pointer" [routerLink]="routerUtils.generateUrl(['/explore-descriptions'])">{{'DESCRIPTION-LISTING.LINK-PUBLIC-DATASETS' | translate}}</u> {{'DESCRIPTION-LISTING.TEXT-INFO-REST' | translate}}</p>
+					<p>{{'DESCRIPTION-LISTING.TEXT-INFO' | translate}} <u class="pointer" [routerLink]="routerUtils.generateUrl(['/explore-descriptions'])">{{'DESCRIPTION-LISTING.LINK-PUBLIC-DESCRIPTIONS' | translate}}</u> {{'DESCRIPTION-LISTING.TEXT-INFO-REST' | translate}}</p>
 					<p class="mt-4 pt-2">{{'DESCRIPTION-LISTING.TEXT-INFO-PAR' | translate}}
 					<div class="d-flex">
 						<button mat-raised-button class="add-description align-self-center yellow-btn" (click)="addNewDescription()">
@@ -47,10 +47,8 @@
 							<mat-form-field class="sort-form w-100">
 								<mat-select placeholder="{{'GENERAL.CRITERIA.LIKE'| translate}}" [formControl]="formGroup.get('order')" (selectionChange)="orderByChanged()">
 									<mat-option *ngIf="!isPublic" [value]="order.UpdatedAt">{{enumUtils.toRecentActivityOrderString(order.UpdatedAt)}}</mat-option>
-									<!-- <mat-option *ngIf="isPublic" [value]="order.DATASETPUBLISHED">{{enumUtils.toRecentActivityOrderString(order.DATASETPUBLISHED)}}</mat-option> -->
 									<mat-option [value]="order.Label">{{enumUtils.toRecentActivityOrderString(order.Label)}}</mat-option>
 									<mat-option *ngIf="!isPublic" [value]="order.Status">{{enumUtils.toRecentActivityOrderString(order.Status)}}</mat-option>
-									<!-- <mat-option [value]="order.CREATED">{{enumUtils.toRecentActivityOrderString(order.CREATED)}}</mat-option> -->
 								</mat-select>
 							</mat-form-field>
 						</div>
diff --git a/dmp-frontend/src/app/ui/description/overview/description-overview.routing.ts b/dmp-frontend/src/app/ui/description/overview/description-overview.routing.ts
index 535883cc9..78d4b9421 100644
--- a/dmp-frontend/src/app/ui/description/overview/description-overview.routing.ts
+++ b/dmp-frontend/src/app/ui/description/overview/description-overview.routing.ts
@@ -9,7 +9,7 @@ const routes: Routes = [
 		component: DescriptionOverviewComponent,
 		data: {
 			breadcrumb: true,
-			title: 'GENERAL.TITLES.DATASET-OVERVIEW'
+			title: 'GENERAL.TITLES.DESCRIPTION-OVERVIEW'
 		},
 	},
 	{
@@ -17,7 +17,7 @@ const routes: Routes = [
 		component: DescriptionOverviewComponent,
 		data: {
 			breadcrumb: true,
-			title: 'GENERAL.TITLES.DATASET-OVERVIEW'
+			title: 'GENERAL.TITLES.DESCRIPTION-OVERVIEW'
 		},
 	}
 ];
diff --git a/dmp-frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html b/dmp-frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html
index aa54cbf4f..148f72a48 100644
--- a/dmp-frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html
+++ b/dmp-frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html
@@ -16,7 +16,7 @@
 	</div>
 	<div class="row mt-2">
 		<div class="col-auto pb-4">
-			<span>{{'DASHBOARD.ADD-NEW-DATASET.OPTIONS-NOT-ENOUGH' | translate}}</span>&nbsp;<span class="new-dmp" (click)="startNewDmp()">{{'DASHBOARD.ADD-NEW-DATASET.START-NEW-DMP' | translate}}</span>
+			<span>{{'DASHBOARD.ADD-NEW-DESCRIPTION.OPTIONS-NOT-ENOUGH' | translate}}</span>&nbsp;<span class="new-dmp" (click)="startNewDmp()">{{'DASHBOARD.ADD-NEW-DESCRIPTION.START-NEW-DMP' | translate}}</span>
 		</div>
 	</div>
 	<div class="row">
diff --git a/dmp-frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.ts b/dmp-frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.ts
index c5b80b917..023bfe3fa 100644
--- a/dmp-frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.ts
+++ b/dmp-frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.ts
@@ -33,7 +33,7 @@ export class StartNewDescriptionDialogComponent extends BaseComponent {
 		filterFn: (searchQuery: string, data?: any) => this.dmpService.query(this.buildAutocompleteLookup(searchQuery)).pipe(map(x => x.items)),
 		getSelectedItem: (selectedItem: any) => this.dmpService.query(this.buildAutocompleteLookup(null, null, [selectedItem])).pipe(map(x => x.items[0])),
 		displayFn: (item: Dmp) => item.label,
-		subtitleFn: (item: Dmp) => `${this.language.instant('DASHBOARD.ADD-NEW-DATASET.OPTIONS.CREATED-AT')} ${this.dateTimeFormatPipe.transform(item.createdAt, 'dd/MM/yyyy')}`,
+		subtitleFn: (item: Dmp) => `${this.language.instant('DASHBOARD.ADD-NEW-DESCRIPTION.OPTIONS.CREATED-AT')} ${this.dateTimeFormatPipe.transform(item.createdAt, 'dd/MM/yyyy')}`,
 		titleFn: (item: Dmp) => item.label,
 		valueAssign: (item: Dmp) => item.id,
 	};
@@ -93,10 +93,6 @@ export class StartNewDescriptionDialogComponent extends BaseComponent {
 	}
 
 	getDatasetDisplay(item: any): string {
-		// if (!this.isPublic) {
-		// 	return (item['status'] ? this.language.instant('TYPES.DATASET-STATUS.FINALISED').toUpperCase() : this.language.instant('TYPES.DATASET-STATUS.DRAFT').toUpperCase()) + ': ' + item['label'];
-		// }
-		// else { return item['label']; }
 		return item['label'] ? item['label'] : null;
 	}
 }
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html
index 891d80f76..ffbcb8f35 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html
+++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html
@@ -12,7 +12,7 @@
 							<div class="ml-auto d-flex flex-row">
 								
 								<div *ngIf="formGroup.get('id').value" class="col-auto d-flex align-items-center">
-									<button [disabled]="isDirty()" [matTooltipDisabled]="!isDirty()" mat-raised-button class="dmp-export-btn" type="button" [matMenuTriggerFor]="exportMenu" (click)="$event.stopPropagation();" [matTooltip]="'DATASET-EDITOR.ACTIONS.DISABLED-EXPORT' | translate">
+									<button [disabled]="isDirty()" [matTooltipDisabled]="!isDirty()" mat-raised-button class="dmp-export-btn" type="button" [matMenuTriggerFor]="exportMenu" (click)="$event.stopPropagation();" [matTooltip]="'DMP-EDITOR.ACTIONS.DISABLED-EXPORT' | translate">
 										{{ 'DMP-EDITOR.ACTIONS.EXPORT' | translate }}
 										<mat-icon [disabled]="isDirty()" style="width: 14px;">expand_more</mat-icon>
 									</button>
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.html b/dmp-frontend/src/app/ui/dmp/dmp-to-description/dmp-to-description-dialog.component.html
similarity index 54%
rename from dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.html
rename to dmp-frontend/src/app/ui/dmp/dmp-to-description/dmp-to-description-dialog.component.html
index 264029888..90ac9cce5 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.html
+++ b/dmp-frontend/src/app/ui/dmp/dmp-to-description/dmp-to-description-dialog.component.html
@@ -6,16 +6,16 @@
 		<div class="col">
 			<div mat-dialog-content class="row">
 				<div  class="col-auto">
-					<span>{{'GENERAL.DMP-TO-DATASET-DIALOG.FROM-DMP' | translate}} </span>
-					<span class="color-green">{{'GENERAL.DMP-TO-DATASET-DIALOG.DMP' | translate}}</span>.
-					<span> {{'GENERAL.DMP-TO-DATASET-DIALOG.TO-DATASET' | translate}} </span>
-					<span class="color-yellow">{{'GENERAL.DMP-TO-DATASET-DIALOG.DATASET' | translate}} </span>
-					<span>{{'GENERAL.DMP-TO-DATASET-DIALOG.EDITOR' | translate}}.</span>
+					<span>{{'GENERAL.DMP-TO-DESCRIPTION-DIALOG.FROM-DMP' | translate}} </span>
+					<span class="color-green">{{'GENERAL.DMP-TO-DESCRIPTION-DIALOG.DMP' | translate}}</span>.
+					<span> {{'GENERAL.DMP-TO-DESCRIPTION-DIALOG.TO-DESCRIPTION' | translate}} </span>
+					<span class="color-yellow">{{'GENERAL.DMP-TO-DESCRIPTION-DIALOG.DESCRIPTION' | translate}} </span>
+					<span>{{'GENERAL.DMP-TO-DESCRIPTION-DIALOG.EDITOR' | translate}}.</span>
 				</div>
 			</div>
 			<div mat-mat-dialog-actions class="row mt-4 pl-3">
 				<div class="col-auto">
-					<button mat-raised-button type="button" class="start-btn" (click)="start()">{{'GENERAL.DMP-TO-DATASET-DIALOG.START' | translate}}</button>
+					<button mat-raised-button type="button" class="start-btn" (click)="start()">{{'GENERAL.DMP-TO-DESCRIPTION-DIALOG.START' | translate}}</button>
 				</div>
 			</div>
 		</div>
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/dmp-to-description/dmp-to-description-dialog.component.scss
similarity index 100%
rename from dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.scss
rename to dmp-frontend/src/app/ui/dmp/dmp-to-description/dmp-to-description-dialog.component.scss
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.ts b/dmp-frontend/src/app/ui/dmp/dmp-to-description/dmp-to-description-dialog.component.ts
similarity index 61%
rename from dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.ts
rename to dmp-frontend/src/app/ui/dmp/dmp-to-description/dmp-to-description-dialog.component.ts
index d23a6295e..466ce1fcc 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp-to-description/dmp-to-description-dialog.component.ts
@@ -3,13 +3,13 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 
 @Component({
 	selector: 'app-to-dataset-dialog-component',
-	templateUrl: 'dmp-to-dataset-dialog.component.html',
-	styleUrls: ['./dmp-to-dataset-dialog.component.scss'],
+	templateUrl: 'dmp-to-description-dialog.component.html',
+	styleUrls: ['./dmp-to-description-dialog.component.scss'],
 })
-export class DmpToDatasetDialogComponent implements OnInit {
+export class DmpToDescriptionDialogComponent implements OnInit {
 
 	constructor(
-		public dialogRef: MatDialogRef<DmpToDatasetDialogComponent>,
+		public dialogRef: MatDialogRef<DmpToDescriptionDialogComponent>,
 		@Inject(MAT_DIALOG_DATA) public data: any
 	) {	}
 
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index 492662efe..eecee696f 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -368,7 +368,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 	}
 
 	onUpdateCallbackError(error) {
-		this.uiNotificationService.snackBarNotification(error.error.error ? error.error.error : this.language.instant('DATASET-UPLOAD.SNACK-BAR.UNSUCCESSFUL'), SnackBarNotificationLevel.Error);
+		this.uiNotificationService.snackBarNotification(error.error.error ? error.error.error : this.language.instant('GENERAL.SNACK-BAR.UNSUCCESSFUL'), SnackBarNotificationLevel.Error);
 	}
 
 	isUserDmpRelated(): boolean {
diff --git a/dmp-frontend/src/app/ui/misc/external-sources/external-sources.module.ts b/dmp-frontend/src/app/ui/misc/external-sources/external-sources.module.ts
deleted file mode 100644
index 8bac048d8..000000000
--- a/dmp-frontend/src/app/ui/misc/external-sources/external-sources.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
-import { ExternalItemListingComponent } from '@app/ui/misc/external-sources/listing/external-item-listing.component';
-import { CommonFormsModule } from '@common/forms/common-forms.module';
-import { CommonUiModule } from '@common/ui/common-ui.module';
-
-@NgModule({
-	imports: [
-		CommonUiModule,
-		CommonFormsModule,
-		AutoCompleteModule
-	],
-	declarations: [
-		ExternalItemListingComponent,
-	],
-	exports: [
-		ExternalItemListingComponent
-	]
-})
-export class ExternalSourcesModule { }
diff --git a/dmp-frontend/src/app/ui/misc/external-sources/listing/external-item-listing.component.html b/dmp-frontend/src/app/ui/misc/external-sources/listing/external-item-listing.component.html
deleted file mode 100644
index d75537b30..000000000
--- a/dmp-frontend/src/app/ui/misc/external-sources/listing/external-item-listing.component.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="row">
-	<div class="external-item col">
-		<mat-form-field appearance="outline">
-			<mat-select placeholder="{{'TYPES.EXTERNAL-DATASET-TYPE.SELECT' | translate}} {{placeholder}}" [(ngModel)]="choice" (selectionChange)="selectionChange($event)" [disabled]="formArray.disabled">
-				<mat-option *ngFor="let option of options" [value]="option.key">
-					{{ option.label }}
-				</mat-option>
-			</mat-select>
-		</mat-form-field>
-	</div>
-	<div class="external-item col" *ngIf="formControl.enabled">
-		<mat-form-field appearance="outline">
-			<app-single-auto-complete [placeholder]="placeholder" [formControl]="formControl" [configuration]="autoCompleteConfiguration">
-			</app-single-auto-complete>
-			<mat-hint>{{ 'DATASET-WIZARD.SECOND-STEP.EXTERNAL-HINT' | translate }}</mat-hint>
-		</mat-form-field>
-	</div>
-	<div class="col-12" *ngIf="formArray">
-		<div class="row" *ngFor="let suggestion of formArray['controls']; let i = index">
-			<ng-container *ngTemplateOutlet="parentTemplate; context: { $implicit: suggestion, index: i,function: this.deleteItem.bind(this) }">
-			</ng-container>
-		</div>
-	</div>
-</div>
diff --git a/dmp-frontend/src/app/ui/misc/external-sources/listing/external-item-listing.component.scss b/dmp-frontend/src/app/ui/misc/external-sources/listing/external-item-listing.component.scss
deleted file mode 100644
index 0d7199fdc..000000000
--- a/dmp-frontend/src/app/ui/misc/external-sources/listing/external-item-listing.component.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-::ng-deep .external-item .mat-form-field-appearance-outline .mat-form-field-outline {
-  background: #fafafa !important;
-}
-
-::ng-deep .external-item .mat-form-field-appearance-outline .mat-form-field-infix {
-  font-size: 1rem;
-  padding: 0.6em 0 1em 0 !important;
-}
diff --git a/dmp-frontend/src/app/ui/misc/external-sources/listing/external-item-listing.component.ts b/dmp-frontend/src/app/ui/misc/external-sources/listing/external-item-listing.component.ts
deleted file mode 100644
index 97ec738bd..000000000
--- a/dmp-frontend/src/app/ui/misc/external-sources/listing/external-item-listing.component.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { UntypedFormArray, UntypedFormControl } from '@angular/forms';
-import { ExternalSourceUrlModel } from '@app/core/model/external-sources/external-source-url';
-import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration';
-import { BaseComponent } from '@common/base/base.component';
-import { takeUntil } from 'rxjs/operators';
-
-@Component({
-	selector: 'app-external-item-listing',
-	templateUrl: './external-item-listing.component.html',
-	styleUrls: ['./external-item-listing.component.scss']
-})
-export class ExternalItemListingComponent extends BaseComponent implements OnInit {
-
-	@Input() public placeholder: string;
-	@Input() public autoCompleteConfiguration: SingleAutoCompleteConfiguration;
-	@Input() formArray: UntypedFormArray;
-	@Input() parentTemplate;
-	@Input() public options: Array<ExternalSourceUrlModel>;
-	@Output() public onItemChange = new EventEmitter<any>();
-
-	public choice: string;
-	public formControl = new UntypedFormControl();
-
-	constructor() { super(); }
-	ngOnInit() {
-		this.formControl.disable();
-		this.formControl.updateValueAndValidity();
-
-		this.formControl.valueChanges
-			.pipe(takeUntil(this._destroyed))
-			.subscribe(x => {
-				if (x) {
-					this.onItemChange.emit(x);
-					this.formControl.reset();
-				}
-			});
-	}
-
-	selectionChange(event) {
-		if (this.formControl.disabled) { this.formControl.enable(); this.formControl.updateValueAndValidity(); }
-		this.autoCompleteConfiguration.extraData = event.value;
-	}
-
-	deleteItem(name: number) {
-		this.formArray.removeAt(name);
-	}
-}
-
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
index 8f1c6d829..0fccba9f0 100644
--- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
@@ -85,7 +85,7 @@ export class SidebarComponent implements OnInit {
 		this.groupMenuItems.push(this.dmpItems);
 
 		this.datasetItems = {
-			title: 'SIDE-BAR.DATASETS',
+			title: 'SIDE-BAR.DESCRIPTIONS',
 			routes: [],
 		}
 
diff --git a/dmp-frontend/src/app/utilities/translate/opendmp-custom-translation-compiler.ts b/dmp-frontend/src/app/utilities/translate/opencdmp-custom-translation-compiler.ts
similarity index 96%
rename from dmp-frontend/src/app/utilities/translate/opendmp-custom-translation-compiler.ts
rename to dmp-frontend/src/app/utilities/translate/opencdmp-custom-translation-compiler.ts
index c0926824b..4e6c48f69 100644
--- a/dmp-frontend/src/app/utilities/translate/opendmp-custom-translation-compiler.ts
+++ b/dmp-frontend/src/app/utilities/translate/opencdmp-custom-translation-compiler.ts
@@ -1,6 +1,6 @@
 import { TranslateCompiler } from '@ngx-translate/core';
 
-export class OpenDMPCustomTranslationCompiler implements TranslateCompiler {
+export class OpenCDMPCustomTranslationCompiler implements TranslateCompiler {
 	/*
 		* Needed by ngx-translate
 		*/
diff --git a/dmp-frontend/src/assets/i18n/baq.json b/dmp-frontend/src/assets/i18n/baq.json
index b9e4f58e9..219eb63e4 100644
--- a/dmp-frontend/src/assets/i18n/baq.json
+++ b/dmp-frontend/src/assets/i18n/baq.json
@@ -1,6 +1,6 @@
 {
-	"APP_NAME": "Argos",
-	"APP_NAME_CAPS": "ARGOS",
+	"APP_NAME": "OpenCDMP",
+	"APP_NAME_CAPS": "OpenCDMP",
 	"GENERAL": {
 		"VALIDATION": {
 			"REQUIRED": "Derrigorrezkoa",
@@ -112,10 +112,10 @@
 				"CLOSE": "Itxi"
 			}
 		},
-		"DMP-TO-DATASET-DIALOG": {
+		"DMP-TO-DESCRIPTION-DIALOG": {
 			"FROM-DMP": "Modu egokian sortu da zure",
 			"DMP": "DKPa",
-			"TO-DATASET": "Hona transferituko zaizu",
+			"TO-DESCRIPTION": "Hona transferituko zaizu",
 			"DATASET": "Datu-multzoa",
 			"EDITOR": "editorea",
 			"START": "Has gaitezen"
@@ -157,7 +157,7 @@
 			"PROFILE": "Nire profila",
 			"LOGIN": "Hasi saioa",
 			"PLAN-OVERVIEW": "Plan Overview",
-			"DATASET-OVERVIEW": "Description Overview",
+			"DESCRIPTION-OVERVIEW": "Description Overview",
 			"MAINTENANCE-TASKS": "Maintenance",
 			"HOME": "Home"
 		},
@@ -281,7 +281,7 @@
 		"DASHBOARD": "Aginte-panela",
 		"DMP": "DATUAK KUDEATZEKO PLANAK",
 		"MY-DMPS": "Nire DPKak",
-		"DATASETS": "DATU-MULTZOAK",
+		"DESCRIPTIONS": "DATU-MULTZOAK",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "ARGITARATUTA",
 		"PUBLIC-DMPS": "DKP Publikoak",
@@ -419,28 +419,28 @@
 		},
 		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
-			"DATASET-TITLE": "Datu-multzoaren Txantiloiaren Izena",
-			"DATASET-DESCRIPTION": "Deskribapena"
+			"TITLE": "Datu-multzoaren Txantiloiaren Izena",
+			"DESCRIPTION": "Deskribapena"
 		},
 		"STEPS": {
 			"GENERAL-INFO": {
 				"TITLE": "Informazio Orokorra",
-				"DATASET-TEMPLATE-NAME": "Datu-multzoaren txantiloiaren izena",
-				"DATASET-TEMPLATE-NAME-HINT": "Datu-multzoaren txantiloia zehazten duen izenburua.",
-				"DATASET-TEMPLATE-DESCRIPTION": "Deskribapena",
-				"DATASET-TEMPLATE-DESCRIPTION-HINT": "Datu-multzoaren deskribapen laburra, aplikazio-eremua eta helburuak.",
+				"DESCRIPTION-TEMPLATE-NAME": "Datu-multzoaren txantiloiaren izena",
+				"DESCRIPTION-TEMPLATE-NAME-HINT": "Datu-multzoaren txantiloia zehazten duen izenburua.",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION": "Deskribapena",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-HINT": "Datu-multzoaren deskribapen laburra, aplikazio-eremua eta helburuak.",
 				"DESCRIPTION-TEMPLATE-TYPE": "Description template type",
 				"DESCRIPTION-TEMPLATE-SELECT-TYPE": "Select a type",
-				"DATASET-TEMPLATE-LANGUAGE-HINT": "",
-				"DATASET-TEMPLATE-TYPE-HINT": "",
-				"DATASET-TEMPLATE-LANGUAGE": "Datu-multzoaren txantiloiaren hizkuntza",
-				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Aukeratu hizkuntza",
-				"DATASET-TEMPLATE-USERS": "Editoreak",
-				"DATASET-TEMPLATE-USERS-HINT": "Gehitu editoreak eta gorde aldaketak, hauei jakinarazteko.",
-				"DATASET-TEMPLATE-REMOVE-USER": "Kendu Editorea",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... Ez dago editorerik oraindik",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Baliozkotu eta Gehitu Editorea",
-				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Datu-multzoaren txantiloiaren deskribapena",
+				"DESCRIPTION-TEMPLATE-LANGUAGE-HINT": "",
+				"DESCRIPTION-TEMPLATE-TYPE-HINT": "",
+				"DESCRIPTION-TEMPLATE-LANGUAGE": "Datu-multzoaren txantiloiaren hizkuntza",
+				"DESCRIPTION-TEMPLATE-SELECT-LANGUAGE": "Aukeratu hizkuntza",
+				"DESCRIPTION-TEMPLATE-USERS": "Editoreak",
+				"DESCRIPTION-TEMPLATE-USERS-HINT": "Gehitu editoreak eta gorde aldaketak, hauei jakinarazteko.",
+				"DESCRIPTION-TEMPLATE-REMOVE-USER": "Kendu Editorea",
+				"DESCRIPTION-TEMPLATE-NO-USERS-YET": "... Ez dago editorerik oraindik",
+				"DESCRIPTION-TEMPLATE-VALIDATE-AND-ADD-USER": "Baliozkotu eta Gehitu Editorea",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Datu-multzoaren txantiloiaren deskribapena",
 				"UNTITLED": "Izenbururik gabea",
 				"QUESTION": "Galdera",
 				"TEMPLATE-OUTLINE": "Txantiloiaren eskema",
@@ -477,7 +477,7 @@
 						"DESCRIPTION": "Deskribapena"
 					}
 				},
-				"COMPOSITE-FIELD": {
+				"FIELD-SET": {
 					"FIELDS": {
 						"DESCRIPTION": "Deskribapena",
 						"EXTENDED-DESCRIPTION": "Deskribapen Zabalagoa",
@@ -530,10 +530,11 @@
 						"FIELD-AUTOCOMPLETE-AUTH-TYPE": "Authentication Type",
 						"FIELD-MULTIPLE-AUTOCOMPLETE": "Autoosatze anitza",
 						"FIELD-MULTIPLE-WORDLIST": "Aukeraketa anitza",
-						"FIELD-EXTERNAL-DATASETS-TITLE": "Kanpo Datu-multzoen Datuak",
-						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Sarrera Markagailuaren Testua",
+						"FIELD-EXTERNAL-DESCRIPTIONS-TITLE": "Kanpo Datu-multzoen Datuak",
+						"FIELD-EXTERNAL-DESCRIPTIONS-PLACEHOLDER": "Sarrera Markagailuaren Testua",
 						"FIELD-LICENSES-TITLE": "Lizentzien Datuak",
-						"EXTERNAL-DATASET-TYPE-NAME": "Mota"
+						"EXTERNAL-DATASET-TYPE-NAME": "Mota",
+						"INTERNAL-ENTITIES": "{{ APP_NAME_CAPS }} Entities"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "Gutxienez iturri bat eman behar da.",
@@ -822,7 +823,7 @@
 	"DESCRIPTION-LISTING": {
 		"TEXT-INFO": "Datu-multzoak aldez aurretik definitutako txantiloiak jarraituta dokumentatzen dira, txantiloi horiek datu-multzoen deskribapenen edukia ezartzen dute. Hemen {{ APP_NAME }}, DKP batek dokumentatutako datu-multzoen deskribapen adina izan ditzake. Nabigatu ",
 		"TEXT-INFO-REST": " {{ APP_NAME }} DKPetan deskribatutako datu-multzoei begiratu bat emateko",
-		"LINK-PUBLIC-DATASETS": "Datu-multzo Publikoak",
+		"LINK-PUBLIC-DESCRIPTIONS": "Datu-multzo Publikoak",
 		"TEXT-INFO-PAR": "Datu-multzo berriak existitzen diren DKPetara gehitu daitezke edozein momentutan eta txantiloi bat baino gehiagorekin deskribatu daitezke. Datu-multzoak klonatu ere egin daitezke eta beste DKP batzuetan berrerabili, baita ezabatu ere DKPanari bere osotasunean kalte egin gabe.",
 		"TEXT-INFO-QUESTION": "New descriptions can be added to existing DMPs at any time and be described with more than one template. ",
 		"GET-IDEA": " Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.",
@@ -1789,7 +1790,7 @@
 		"DMP-VISIBILITY": {
 			"PUBLIC": "Argitaratuta"
 		},
-		"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
+		"DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE": {
 			"NONE": "Bat ere ez",
 			"REQUIRED": "Derrigorrezkoa"
 		},
@@ -1798,7 +1799,7 @@
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
 			"INTERNAL-DMP-ENTITIES-DMPS": "Internal Plans",
-			"INTERNAL-DMP-ENTITIES-DATASETS": "Internal Descriptions",
+			"INTERNAL-DMP-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
 			"TEXT-AREA": "Text Area",
@@ -1814,17 +1815,17 @@
 			"OWNER": "Owner",
 			"MEMBER": "Member"
 		},
-		"DATASET-PROFILE-UPLOAD-TYPE": {
+		"DESCRIPTION-TEMPLATE-UPLOAD-TYPE": {
 			"DOWNLOAD": "Fitxategia deskargatu"
 		},
-		"DATASET-PROFILE-COMBO-BOX-TYPE": {
+		"DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE": {
 			"EXTERNAL-SOURCE-HINT": "Kanpo iturrietatik hornitutako balioen zerrenda",
 			"ACTIONS": {
 				"YES": "Bai",
 				"NO": "Ez"
 			}
 		},
-		"DATASET-PROFILE-VALIDATOR": {
+		"DESCRIPTION-TEMPLATE-VALIDATOR": {
 			"ACTION": "Baliozkotu",
 			"REPOSITORIES-PLACEHOLDER": "Biltegiak"
 		},
@@ -2037,7 +2038,7 @@
 		"PERSONAL-USAGE": "Erabilera pertsonala",
 		"PUBLIC-USAGE": "Erabilera publikoa",
 		"DESCRIPTIONS": "Descriptions",
-		"DATASET-DESCRIPTIONS-DASHBOARD-TEXT": "Datu-multzoak",
+		"DESCRIPTIONS-DASHBOARD-TEXT": "Datu-multzoak",
 		"PUBLIC-DMPS": "DKP Publikoak",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Erlazionatutako Erakundeak",
@@ -2061,7 +2062,7 @@
 			"GOT-IT": "Ulertuta!",
 			"LEAVE-TOUR": "Tourra utzi"
 		},
-		"ADD-NEW-DATASET": {
+		"ADD-NEW-DESCRIPTION": {
 			"OPTIONS-NOT-ENOUGH": "Aukera hauek ez dira nahikoa?",
 			"START-NEW-DMP": "Hasi DKP berria",
 			"OPTIONS": {
diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json
index f2ef633c9..51cb7df54 100644
--- a/dmp-frontend/src/assets/i18n/de.json
+++ b/dmp-frontend/src/assets/i18n/de.json
@@ -1,6 +1,6 @@
 {
-	"APP_NAME": "Argos",
-	"APP_NAME_CAPS": "ARGOS",
+	"APP_NAME": "OpenCDMP",
+	"APP_NAME_CAPS": "OpenCDMP",
 	"GENERAL": {
 		"VALIDATION": {
 			"REQUIRED": "Pflichtfeld",
@@ -112,10 +112,10 @@
 				"CLOSE": "Schließen"
 			}
 		},
-		"DMP-TO-DATASET-DIALOG": {
+		"DMP-TO-DESCRIPTION-DIALOG": {
 			"FROM-DMP": "You have successfully created your",
 			"DMP": "DMP",
-			"TO-DATASET": "You will be transferred to the",
+			"TO-DESCRIPTION": "You will be transferred to the",
 			"DATASET": "Dataset",
 			"EDITOR": "editor",
 			"START": "let's start"
@@ -157,7 +157,7 @@
 			"PROFILE": "Mein Profil",
 			"LOGIN": "Anmeldung",
 			"PLAN-OVERVIEW": "Plan Overview",
-			"DATASET-OVERVIEW": "Description Overview",
+			"DESCRIPTION-OVERVIEW": "Description Overview",
 			"MAINTENANCE-TASKS": "Maintenance",
 			"HOME": "Home"
 		},
@@ -281,7 +281,7 @@
 		"DASHBOARD": "Startseite",
 		"DMP": "DATENMANAGEMENTPLÄNE",
 		"MY-DMPS": "Meine DMPs",
-		"DATASETS": "DATENSATZBESCHREIBUNG",
+		"DESCRIPTIONS": "DATENSATZBESCHREIBUNG",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "VERÖFFENTLICHT",
 		"PUBLIC-DMPS": "Veröffentlichte DMPs",
@@ -419,28 +419,28 @@
 		},
 		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
-			"DATASET-TITLE": "Description Template Name",
-			"DATASET-DESCRIPTION": "Description"
+			"TITLE": "Description Template Name",
+			"DESCRIPTION": "Description"
 		},
 		"STEPS": {
 			"GENERAL-INFO": {
 				"TITLE": "General Info",
-				"DATASET-TEMPLATE-NAME": "Description template name",
-				"DATASET-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
-				"DATASET-TEMPLATE-DESCRIPTION": "Description",
-				"DATASET-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Description is about, it's scope and objectives.",
+				"DESCRIPTION-TEMPLATE-NAME": "Description template name",
+				"DESCRIPTION-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION": "Description",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Description is about, it's scope and objectives.",
 				"DESCRIPTION-TEMPLATE-TYPE": "Description template type",
 				"DESCRIPTION-TEMPLATE-SELECT-TYPE": "Select a type",
-				"DATASET-TEMPLATE-LANGUAGE-HINT": "",
-				"DATASET-TEMPLATE-TYPE-HINT": "",
-				"DATASET-TEMPLATE-LANGUAGE": "Description template language",
-				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
-				"DATASET-TEMPLATE-USERS": "Editors",
-				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
-				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
+				"DESCRIPTION-TEMPLATE-LANGUAGE-HINT": "",
+				"DESCRIPTION-TEMPLATE-TYPE-HINT": "",
+				"DESCRIPTION-TEMPLATE-LANGUAGE": "Description template language",
+				"DESCRIPTION-TEMPLATE-SELECT-LANGUAGE": "Select a language",
+				"DESCRIPTION-TEMPLATE-USERS": "Editors",
+				"DESCRIPTION-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DESCRIPTION-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DESCRIPTION-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DESCRIPTION-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
 				"TEMPLATE-OUTLINE": "Template outline",
@@ -477,7 +477,7 @@
 						"DESCRIPTION": "Description"
 					}
 				},
-				"COMPOSITE-FIELD": {
+				"FIELD-SET": {
 					"FIELDS": {
 						"DESCRIPTION": "Description",
 						"EXTENDED-DESCRIPTION": "Extended Description",
@@ -530,10 +530,11 @@
 						"FIELD-AUTOCOMPLETE-AUTH-TYPE": "Authentication Type",
 						"FIELD-MULTIPLE-AUTOCOMPLETE": "Multiple Autocomplete",
 						"FIELD-MULTIPLE-WORDLIST": "Multiple Selection",
-						"FIELD-EXTERNAL-DATASETS-TITLE": "External Datasets Data",
-						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Input placeholder",
+						"FIELD-EXTERNAL-DESCRIPTIONS-TITLE": "External Datasets Data",
+						"FIELD-EXTERNAL-DESCRIPTIONS-PLACEHOLDER": "Input placeholder",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type"
+						"EXTERNAL-DATASET-TYPE-NAME": "Type",
+						"INTERNAL-ENTITIES": "{{ APP_NAME_CAPS }} Entities"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "At least one source must be provided.",
@@ -822,7 +823,7 @@
 	"DESCRIPTION-LISTING": {
 		"TEXT-INFO": "Descriptions are documented following pre-defined templates which set the content of the descriptions. In {{ APP_NAME }}, a DMP can contain as many descriptions as the entities it documents. Browse ",
 		"TEXT-INFO-REST": " for a look at entities described in {{ APP_NAME }} DMPs",
-		"LINK-PUBLIC-DATASETS": "Public Descriptions",
+		"LINK-PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"TEXT-INFO-PAR": "New descriptions can be added to existing DMPs at any time and be described with more than one template. Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.",
 		"TEXT-INFO-QUESTION": "New descriptions can be added to existing DMPs at any time and be described with more than one template. ",
 		"GET-IDEA": " Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.",
@@ -1789,7 +1790,7 @@
 		"DMP-VISIBILITY": {
 			"PUBLIC": "Veröffentlicht"
 		},
-		"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
+		"DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE": {
 			"NONE": "Keine",
 			"REQUIRED": "Pflichtfeld"
 		},
@@ -1798,7 +1799,7 @@
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
 			"INTERNAL-DMP-ENTITIES-DMPS": "Internal Plans",
-			"INTERNAL-DMP-ENTITIES-DATASETS": "Internal Descriptions",
+			"INTERNAL-DMP-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
 			"TEXT-AREA": "Text Area",
@@ -1814,17 +1815,17 @@
 			"OWNER": "Owner",
 			"MEMBER": "Member"
 		},
-		"DATASET-PROFILE-UPLOAD-TYPE": {
+		"DESCRIPTION-TEMPLATE-UPLOAD-TYPE": {
 			"DOWNLOAD": "Download file"
 		},
-		"DATASET-PROFILE-COMBO-BOX-TYPE": {
+		"DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE": {
 			"EXTERNAL-SOURCE-HINT": "List of values provided by external source(s)",
 			"ACTIONS": {
 				"YES": "Ja",
 				"NO": "Nein"
 			}
 		},
-		"DATASET-PROFILE-VALIDATOR": {
+		"DESCRIPTION-TEMPLATE-VALIDATOR": {
 			"ACTION": "Validate",
 			"REPOSITORIES-PLACEHOLDER": "Repositories"
 		},
@@ -2037,7 +2038,7 @@
 		"PERSONAL-USAGE": "Personal Usage",
 		"PUBLIC-USAGE": "Public Usage",
 		"DESCRIPTIONS": "Descriptions",
-		"DATASET-DESCRIPTIONS-DASHBOARD-TEXT": "Datasets",
+		"DESCRIPTIONS-DASHBOARD-TEXT": "Datasets",
 		"PUBLIC-DMPS": "Public DMPs",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Related Organisations",
@@ -2061,7 +2062,7 @@
 			"GOT-IT": "Got it!",
 			"LEAVE-TOUR": "Leave Tour"
 		},
-		"ADD-NEW-DATASET": {
+		"ADD-NEW-DESCRIPTION": {
 			"OPTIONS-NOT-ENOUGH": "Are those options not enough?",
 			"START-NEW-DMP": "Start new DMP",
 			"OPTIONS": {
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index d37842863..50282abf7 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -112,11 +112,11 @@
 				"CLOSE": "Close"
 			}
 		},
-		"DMP-TO-DATASET-DIALOG": {
+		"DMP-TO-DESCRIPTION-DIALOG": {
 			"FROM-DMP": "You have successfully created your",
 			"DMP": "Plan",
-			"TO-DATASET": "You will be transferred to the",
-			"DATASET": "Description",
+			"TO-DESCRIPTION": "You will be transferred to the",
+			"DESCRIPTION": "Description",
 			"EDITOR": "editor",
 			"START": "let's start"
 		},
@@ -157,7 +157,7 @@
 			"PROFILE": "My Profile",
 			"LOGIN": "Login",
 			"PLAN-OVERVIEW": "Plan Overview",
-			"DATASET-OVERVIEW": "Description Overview",
+			"DESCRIPTION-OVERVIEW": "Description Overview",
 			"MAINTENANCE-TASKS": "Maintenance",
 			"HOME": "Home"
 		},
@@ -281,7 +281,7 @@
 		"DASHBOARD": "Home",
 		"DMP": "PLANS",
 		"MY-DMPS": "My Plans",
-		"DATASETS": "DATASETS",
+		"DESCRIPTIONS": "DESCRIPTIONS",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "PUBLISHED",
 		"PUBLIC-DMPS": "Public Plans",
@@ -419,28 +419,28 @@
 		},
 		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
-			"DATASET-TITLE": "Description Template Name",
-			"DATASET-DESCRIPTION": "Description"
+			"TITLE": "Description Template Name",
+			"DESCRIPTION": "Description"
 		},
 		"STEPS": {
 			"GENERAL-INFO": {
 				"TITLE": "General Info",
-				"DATASET-TEMPLATE-NAME": "Description template name",
-				"DATASET-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
-				"DATASET-TEMPLATE-DESCRIPTION": "Description",
-				"DATASET-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Description is about, it's scope and objectives.",
+				"DESCRIPTION-TEMPLATE-NAME": "Description template name",
+				"DESCRIPTION-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION": "Description",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Description is about, it's scope and objectives.",
 				"DESCRIPTION-TEMPLATE-TYPE": "Description template type",
 				"DESCRIPTION-TEMPLATE-SELECT-TYPE": "Select a type",
-				"DATASET-TEMPLATE-LANGUAGE-HINT": "",
-				"DATASET-TEMPLATE-TYPE-HINT": "",
-				"DATASET-TEMPLATE-LANGUAGE": "Description template language",
-				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
-				"DATASET-TEMPLATE-USERS": "Editors",
-				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
-				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
+				"DESCRIPTION-TEMPLATE-LANGUAGE-HINT": "",
+				"DESCRIPTION-TEMPLATE-TYPE-HINT": "",
+				"DESCRIPTION-TEMPLATE-LANGUAGE": "Description template language",
+				"DESCRIPTION-TEMPLATE-SELECT-LANGUAGE": "Select a language",
+				"DESCRIPTION-TEMPLATE-USERS": "Editors",
+				"DESCRIPTION-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DESCRIPTION-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DESCRIPTION-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DESCRIPTION-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
 				"TEMPLATE-OUTLINE": "Template outline",
@@ -477,7 +477,7 @@
 						"DESCRIPTION": "Description"
 					}
 				},
-				"COMPOSITE-FIELD": {
+				"FIELD-SET": {
 					"FIELDS": {
 						"DESCRIPTION": "Description",
 						"EXTENDED-DESCRIPTION": "Extended Description",
@@ -530,10 +530,11 @@
 						"FIELD-AUTOCOMPLETE-AUTH-TYPE": "Authentication Type",
 						"FIELD-MULTIPLE-AUTOCOMPLETE": "Multiple Autocomplete",
 						"FIELD-MULTIPLE-WORDLIST": "Multiple Selection",
-						"FIELD-EXTERNAL-DATASETS-TITLE": "External Datasets Data",
-						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Input placeholder Text",
+						"FIELD-EXTERNAL-DESCRIPTIONS-TITLE": "External Datasets Data",
+						"FIELD-EXTERNAL-DESCRIPTIONS-PLACEHOLDER": "Input placeholder Text",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type"
+						"EXTERNAL-DATASET-TYPE-NAME": "Type",
+						"INTERNAL-ENTITIES": "{{ APP_NAME_CAPS }} Entities"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "At least one source must be provided.",
@@ -822,7 +823,7 @@
 	"DESCRIPTION-LISTING": {
 		"TEXT-INFO": "Descriptions are documented following pre-defined templates which set the content of Plans. In {{ APP_NAME }}, a Plan can contain as many Descriptions as the items it documents. Browse ",
 		"TEXT-INFO-REST": " for a look at Descriptions in {{ APP_NAME }} Plans",
-		"LINK-PUBLIC-DATASETS": "Public Descriptions",
+		"LINK-PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"TEXT-INFO-PAR": "New Descriptions can be added to existing Plans at any time and be described with more than one template. Descriptions can also be cloned and re-used in other Plans as well as be deleted without negatively affecting the Plan as a whole.",
 		"TEXT-INFO-QUESTION": "New descriptions can be added to existing DMPs at any time and be described with more than one template. ",
 		"GET-IDEA": " Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.",
@@ -1789,7 +1790,7 @@
 		"DMP-VISIBILITY": {
 			"PUBLIC": "Published"
 		},
-		"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
+		"DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE": {
 			"NONE": "None",
 			"REQUIRED": "Required"
 		},
@@ -1798,7 +1799,7 @@
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
 			"INTERNAL-DMP-ENTITIES-DMPS": "Internal Plans",
-			"INTERNAL-DMP-ENTITIES-DATASETS": "Internal Descriptions",
+			"INTERNAL-DMP-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
 			"TEXT-AREA": "Text Area",
@@ -1814,17 +1815,17 @@
 			"OWNER": "Owner",
 			"MEMBER": "Member"
 		},
-		"DATASET-PROFILE-UPLOAD-TYPE": {
+		"DESCRIPTION-TEMPLATE-UPLOAD-TYPE": {
 			"DOWNLOAD": "Download file"
 		},
-		"DATASET-PROFILE-COMBO-BOX-TYPE": {
+		"DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE": {
 			"EXTERNAL-SOURCE-HINT": "List of values provided by external source(s)",
 			"ACTIONS": {
 				"YES": "Yes",
 				"NO": "No"
 			}
 		},
-		"DATASET-PROFILE-VALIDATOR": {
+		"DESCRIPTION-TEMPLATE-VALIDATOR": {
 			"ACTION": "Validate",
 			"REPOSITORIES-PLACEHOLDER": "Repositories"
 		},
@@ -2037,7 +2038,7 @@
 		"PERSONAL-USAGE": "Personal Usage",
 		"PUBLIC-USAGE": "Public Usage",
 		"DESCRIPTIONS": "Descriptions",
-		"DATASET-DESCRIPTIONS-DASHBOARD-TEXT": "Descriptions",
+		"DESCRIPTIONS-DASHBOARD-TEXT": "Descriptions",
 		"PUBLIC-DMPS": "Public Plans",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Related Organizations",
@@ -2061,7 +2062,7 @@
 			"GOT-IT": "Got it!",
 			"LEAVE-TOUR": "Leave Tour"
 		},
-		"ADD-NEW-DATASET": {
+		"ADD-NEW-DESCRIPTION": {
 			"OPTIONS-NOT-ENOUGH": "Are those options not enough?",
 			"START-NEW-DMP": "Start new Plan",
 			"OPTIONS": {
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index b51780016..cb7519cde 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -1,6 +1,6 @@
 {
-	"APP_NAME": "Argos",
-	"APP_NAME_CAPS": "ARGOS",
+	"APP_NAME": "OpenCDMP",
+	"APP_NAME_CAPS": "OpenCDMP",
 	"GENERAL": {
 		"VALIDATION": {
 			"REQUIRED": "Obligatorio",
@@ -112,10 +112,10 @@
 				"CLOSE": "Cerrar"
 			}
 		},
-		"DMP-TO-DATASET-DIALOG": {
+		"DMP-TO-DESCRIPTION-DIALOG": {
 			"FROM-DMP": "Ha creado correctamente su",
 			"DMP": "PGD",
-			"TO-DATASET": "Será transferido al",
+			"TO-DESCRIPTION": "Será transferido al",
 			"DATASET": "Dataset",
 			"EDITOR": "editor",
 			"START": "comencemos"
@@ -157,7 +157,7 @@
 			"PROFILE": "Mi perfil",
 			"LOGIN": "Iniciar sesión",
 			"PLAN-OVERVIEW": "Plan Overview",
-			"DATASET-OVERVIEW": "Description Overview",
+			"DESCRIPTION-OVERVIEW": "Description Overview",
 			"MAINTENANCE-TASKS": "Maintenance",
 			"HOME": "Home"
 		},
@@ -281,7 +281,7 @@
 		"DASHBOARD": "Inicio",
 		"DMP": "PLAN DE GESTIÓN DE DATOS",
 		"MY-DMPS": "Mis PGDs",
-		"DATASETS": "DESCRIPCIONES DEL DATASET",
+		"DESCRIPTIONS": "DESCRIPCIONES DEL DATASET",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "PUBLICADO",
 		"PUBLIC-DMPS": "PGDs publicado",
@@ -419,28 +419,28 @@
 		},
 		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
-			"DATASET-TITLE": "Description Template Name",
-			"DATASET-DESCRIPTION": "Descripción"
+			"TITLE": "Description Template Name",
+			"DESCRIPTION": "Descripción"
 		},
 		"STEPS": {
 			"GENERAL-INFO": {
 				"TITLE": "Información General",
-				"DATASET-TEMPLATE-NAME": "Description template name",
-				"DATASET-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
-				"DATASET-TEMPLATE-DESCRIPTION": "Descripción",
-				"DATASET-TEMPLATE-DESCRIPTION-HINT": "Una breve descripción acerca del Dataset, su alcance y objetivos.",
+				"DESCRIPTION-TEMPLATE-NAME": "Description template name",
+				"DESCRIPTION-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION": "Descripción",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-HINT": "Una breve descripción acerca del Dataset, su alcance y objetivos.",
 				"DESCRIPTION-TEMPLATE-TYPE": "Description template type",
 				"DESCRIPTION-TEMPLATE-SELECT-TYPE": "Select a type",
-				"DATASET-TEMPLATE-LANGUAGE-HINT": "",
-				"DATASET-TEMPLATE-TYPE-HINT": "",
-				"DATASET-TEMPLATE-LANGUAGE": "Description template language",
-				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Seleccione un idioma",
-				"DATASET-TEMPLATE-USERS": "Editors",
-				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
-				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Descripción de la plantilla del Dataset",
+				"DESCRIPTION-TEMPLATE-LANGUAGE-HINT": "",
+				"DESCRIPTION-TEMPLATE-TYPE-HINT": "",
+				"DESCRIPTION-TEMPLATE-LANGUAGE": "Description template language",
+				"DESCRIPTION-TEMPLATE-SELECT-LANGUAGE": "Seleccione un idioma",
+				"DESCRIPTION-TEMPLATE-USERS": "Editors",
+				"DESCRIPTION-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DESCRIPTION-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DESCRIPTION-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DESCRIPTION-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Descripción de la plantilla del Dataset",
 				"UNTITLED": "Sin título",
 				"QUESTION": "Pregunta",
 				"TEMPLATE-OUTLINE": "Modelo de plantilla",
@@ -477,7 +477,7 @@
 						"DESCRIPTION": "Descripción"
 					}
 				},
-				"COMPOSITE-FIELD": {
+				"FIELD-SET": {
 					"FIELDS": {
 						"DESCRIPTION": "Descripción",
 						"EXTENDED-DESCRIPTION": "Descripción extendida",
@@ -530,10 +530,11 @@
 						"FIELD-AUTOCOMPLETE-AUTH-TYPE": "Authentication Type",
 						"FIELD-MULTIPLE-AUTOCOMPLETE": "Autocompeltado múltiple",
 						"FIELD-MULTIPLE-WORDLIST": "Selección múltiple",
-						"FIELD-EXTERNAL-DATASETS-TITLE": "Datos de Datasets externos",
-						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Introduzca marcador del texto",
+						"FIELD-EXTERNAL-DESCRIPTIONS-TITLE": "Datos de Datasets externos",
+						"FIELD-EXTERNAL-DESCRIPTIONS-PLACEHOLDER": "Introduzca marcador del texto",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Tipo"
+						"EXTERNAL-DATASET-TYPE-NAME": "Tipo",
+						"INTERNAL-ENTITIES": "{{ APP_NAME_CAPS }} Entities"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "Debe proporcionar al menos una fuente.",
@@ -822,7 +823,7 @@
 	"DESCRIPTION-LISTING": {
 		"TEXT-INFO": "Los datasets se documentan siguiendo plantillas predefinidas con el contenido de las descripciones de los datasets. En {{ APP_NAME }} un PGD puede contener tantas descripciones de datasets como datasets documentados. Navegar ",
 		"TEXT-INFO-REST": " para una mirada a los datasets descritos en los PGDs de {{ APP_NAME }}",
-		"LINK-PUBLIC-DATASETS": "Descripciones de datasets publicados",
+		"LINK-PUBLIC-DESCRIPTIONS": "Descripciones de datasets publicados",
 		"TEXT-INFO-PAR": "Los nuevos datasets puedes añadirse a PGDs existentes en cualquier momento y ser descritos por más de una plantilla. Las descripciones de los datasets también pueden clonarse y reutilizarse en otros PGDs, sin que los otros PGDs se van afectados cuando son borrados.",
 		"TEXT-INFO-QUESTION": "New descriptions can be added to existing DMPs at any time and be described with more than one template. ",
 		"GET-IDEA": " Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.",
@@ -1789,7 +1790,7 @@
 		"DMP-VISIBILITY": {
 			"PUBLIC": "Publicado"
 		},
-		"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
+		"DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE": {
 			"NONE": "Ninguno",
 			"REQUIRED": "Obligatorio"
 		},
@@ -1798,7 +1799,7 @@
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
 			"INTERNAL-DMP-ENTITIES-DMPS": "Internal Plans",
-			"INTERNAL-DMP-ENTITIES-DATASETS": "Internal Descriptions",
+			"INTERNAL-DMP-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
 			"TEXT-AREA": "Text Area",
@@ -1814,17 +1815,17 @@
 			"OWNER": "Owner",
 			"MEMBER": "Member"
 		},
-		"DATASET-PROFILE-UPLOAD-TYPE": {
+		"DESCRIPTION-TEMPLATE-UPLOAD-TYPE": {
 			"DOWNLOAD": "Download file"
 		},
-		"DATASET-PROFILE-COMBO-BOX-TYPE": {
+		"DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE": {
 			"EXTERNAL-SOURCE-HINT": "Lista de valores para seleccionar la(s) fuente(s) externa(s)",
 			"ACTIONS": {
 				"YES": "Sí",
 				"NO": "No"
 			}
 		},
-		"DATASET-PROFILE-VALIDATOR": {
+		"DESCRIPTION-TEMPLATE-VALIDATOR": {
 			"ACTION": "Validate",
 			"REPOSITORIES-PLACEHOLDER": "Repositories"
 		},
@@ -2037,7 +2038,7 @@
 		"PERSONAL-USAGE": "Uso personal",
 		"PUBLIC-USAGE": "Public Usage",
 		"DESCRIPTIONS": "Descriptions",
-		"DATASET-DESCRIPTIONS-DASHBOARD-TEXT": "Descripciones de los datasets",
+		"DESCRIPTIONS-DASHBOARD-TEXT": "Descripciones de los datasets",
 		"PUBLIC-DMPS": "PGDs públicos",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Organizaciones relacionadas",
@@ -2061,7 +2062,7 @@
 			"GOT-IT": "¡Lo tengo!",
 			"LEAVE-TOUR": "Abandonar la visita virtual"
 		},
-		"ADD-NEW-DATASET": {
+		"ADD-NEW-DESCRIPTION": {
 			"OPTIONS-NOT-ENOUGH": "¿No son estas opciones suficientes?",
 			"START-NEW-DMP": "Iniciar un nuevo PGD",
 			"OPTIONS": {
diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json
index fbea3ae27..7b60ac92a 100644
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@@ -1,6 +1,6 @@
 {
-	"APP_NAME": "Argos",
-	"APP_NAME_CAPS": "ARGOS",
+	"APP_NAME": "OpenCDMP",
+	"APP_NAME_CAPS": "OpenCDMP",
 	"GENERAL": {
 		"VALIDATION": {
 			"REQUIRED": "Προαπαιτούμενο",
@@ -112,10 +112,10 @@
 				"CLOSE": "Κλείσιμο"
 			}
 		},
-		"DMP-TO-DATASET-DIALOG": {
+		"DMP-TO-DESCRIPTION-DIALOG": {
 			"FROM-DMP": "Δημιουργήσατε με επιτυχία το Σχέδιο Διαχείρισης Δεδομένων σας",
 			"DMP": "Σχέδιο Διαχείρισης Δεδομένων",
-			"TO-DATASET": "Θα μεταφερθείτε στο",
+			"TO-DESCRIPTION": "Θα μεταφερθείτε στο",
 			"DATASET": "Σύνολο Δεδομένων",
 			"EDITOR": "Συντάκτης",
 			"START": "Ας ξεκινήσουμε"
@@ -157,7 +157,7 @@
 			"PROFILE": "Το προφίλ μου",
 			"LOGIN": "Σύνδεση",
 			"PLAN-OVERVIEW": "Plan Overview",
-			"DATASET-OVERVIEW": "Description Overview",
+			"DESCRIPTION-OVERVIEW": "Description Overview",
 			"MAINTENANCE-TASKS": "Maintenance",
 			"HOME": "Home"
 		},
@@ -281,7 +281,7 @@
 		"DASHBOARD": "Αρχική",
 		"DMP": "ΣΧΕΔΙΑ ΔΙΑΧΕΙΡΙΣΗΣ ΔΕΔΟΜΕΝΩΝ",
 		"MY-DMPS": "Τα δικά μου Σχέδια Διαχείρισης Δεδομένων",
-		"DATASETS": "ΠΕΡΙΓΡΑΦΕΣ ΣΥΝΟΛΟΥ ΔΕΔΟΜΕΝΩΝ",
+		"DESCRIPTIONS": "ΠΕΡΙΓΡΑΦΕΣ ΣΥΝΟΛΟΥ ΔΕΔΟΜΕΝΩΝ",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "ΔΗΜΟΣΙΕΥΜΕΝΑ",
 		"PUBLIC-DMPS": "Δημοσιευμένα Σχέδια Διαχείρισης Δεδομένων",
@@ -419,28 +419,28 @@
 		},
 		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
-			"DATASET-TITLE": "Description Template Name",
-			"DATASET-DESCRIPTION": "Περιγραφή"
+			"TITLE": "Description Template Name",
+			"DESCRIPTION": "Περιγραφή"
 		},
 		"STEPS": {
 			"GENERAL-INFO": {
 				"TITLE": "General Info",
-				"DATASET-TEMPLATE-NAME": "Description template name",
-				"DATASET-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
-				"DATASET-TEMPLATE-DESCRIPTION": "Description",
-				"DATASET-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Description is about, it's scope and objectives.",
+				"DESCRIPTION-TEMPLATE-NAME": "Description template name",
+				"DESCRIPTION-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION": "Description",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Description is about, it's scope and objectives.",
 				"DESCRIPTION-TEMPLATE-TYPE": "Description template type",
 				"DESCRIPTION-TEMPLATE-SELECT-TYPE": "Select a type",
-				"DATASET-TEMPLATE-LANGUAGE-HINT": "",
-				"DATASET-TEMPLATE-TYPE-HINT": "",
-				"DATASET-TEMPLATE-LANGUAGE": "Description template language",
-				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
-				"DATASET-TEMPLATE-USERS": "Editors",
-				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
-				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
+				"DESCRIPTION-TEMPLATE-LANGUAGE-HINT": "",
+				"DESCRIPTION-TEMPLATE-TYPE-HINT": "",
+				"DESCRIPTION-TEMPLATE-LANGUAGE": "Description template language",
+				"DESCRIPTION-TEMPLATE-SELECT-LANGUAGE": "Select a language",
+				"DESCRIPTION-TEMPLATE-USERS": "Editors",
+				"DESCRIPTION-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DESCRIPTION-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DESCRIPTION-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DESCRIPTION-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
 				"TEMPLATE-OUTLINE": "Template outline",
@@ -477,7 +477,7 @@
 						"DESCRIPTION": "Περιγραφή"
 					}
 				},
-				"COMPOSITE-FIELD": {
+				"FIELD-SET": {
 					"FIELDS": {
 						"DESCRIPTION": "Περιγραφή",
 						"EXTENDED-DESCRIPTION": "Εκτενής Περιγραφή",
@@ -530,10 +530,11 @@
 						"FIELD-AUTOCOMPLETE-AUTH-TYPE": "Authentication Type",
 						"FIELD-MULTIPLE-AUTOCOMPLETE": "Πολλαπλή Αυτόματη Συμπλήρωση",
 						"FIELD-MULTIPLE-WORDLIST": "Πολλαπλή Επιλογή",
-						"FIELD-EXTERNAL-DATASETS-TITLE": "External Datasets Data",
-						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Input placeholder Text",
+						"FIELD-EXTERNAL-DESCRIPTIONS-TITLE": "External Datasets Data",
+						"FIELD-EXTERNAL-DESCRIPTIONS-PLACEHOLDER": "Input placeholder Text",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type"
+						"EXTERNAL-DATASET-TYPE-NAME": "Type",
+						"INTERNAL-ENTITIES": "{{ APP_NAME_CAPS }} Entities"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "At least one source must be provided.",
@@ -822,7 +823,7 @@
 	"DESCRIPTION-LISTING": {
 		"TEXT-INFO": "Τα σύνολα δεδομένων τεκμηριώνονται ακολουθώντας προκαθορισμένα templates τα οποία θέτουν το περιεχόμενο των περιγραφών συνόλων δεδομένων. Στο {{ APP_NAME }}, ένα Σχέδιο Διαχείρισης Δεδομένων μπορεί να περιλαμβάνει τόσες περιγραφές συνόλου δεδομένων όσα και τα σύνολα δεδομένων που τεκμηριώνει. Περιηγηθείτε ",
 		"TEXT-INFO-REST": " για μια ματιά στα σύνολα δεδομένων που περιγράφονται στα Σχέδια Διαχείρισης Δεδομένων του {{ APP_NAME }}",
-		"LINK-PUBLIC-DATASETS": "Δημόσιες Περιγραφές Συνόλων Δεδομένων",
+		"LINK-PUBLIC-DESCRIPTIONS": "Δημόσιες Περιγραφές Συνόλων Δεδομένων",
 		"TEXT-INFO-PAR": "Νέα σύνολα δεδομένων μπορούν να προστεθούν σε ήδη υπάρχοντα Σχέδια Διαχείρισης Δεδομένων οποιαδήποτε στιγμή και να περιγραφούν με περισσότερα από ένα template. Οι περιγραφές συνόλων δεδομένων μπορούν επίσης να κλωνοποιηθούν και να επαναχρησιμοποιηθούν σε άλλα Σχέδια Διαχείρισης Δεδομένων αλλά και να διαγραφούν χωρίς να επηρεάσουν το σύνολο του Σχεδίου Διαχείρισης Δεδομένων.",
 		"TEXT-INFO-QUESTION": "New descriptions can be added to existing DMPs at any time and be described with more than one template. ",
 		"GET-IDEA": " Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.",
@@ -1789,7 +1790,7 @@
 		"DMP-VISIBILITY": {
 			"PUBLIC": "Δημοσιευμένο"
 		},
-		"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
+		"DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE": {
 			"NONE": "Κανένα",
 			"REQUIRED": "Υποχρεωτικό"
 		},
@@ -1798,7 +1799,7 @@
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
 			"INTERNAL-DMP-ENTITIES-DMPS": "Internal Plans",
-			"INTERNAL-DMP-ENTITIES-DATASETS": "Internal Descriptions",
+			"INTERNAL-DMP-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
 			"TEXT-AREA": "Text Area",
@@ -1814,17 +1815,17 @@
 			"OWNER": "Owner",
 			"MEMBER": "Member"
 		},
-		"DATASET-PROFILE-UPLOAD-TYPE": {
+		"DESCRIPTION-TEMPLATE-UPLOAD-TYPE": {
 			"DOWNLOAD": "Λήψη αρχείου"
 		},
-		"DATASET-PROFILE-COMBO-BOX-TYPE": {
+		"DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE": {
 			"EXTERNAL-SOURCE-HINT": "Κατάλογος τιμών που παρέχονται από εξωτερικές πηγές",
 			"ACTIONS": {
 				"YES": "Ναι",
 				"NO": "Όχι"
 			}
 		},
-		"DATASET-PROFILE-VALIDATOR": {
+		"DESCRIPTION-TEMPLATE-VALIDATOR": {
 			"ACTION": "Validate",
 			"REPOSITORIES-PLACEHOLDER": "Repositories"
 		},
@@ -2037,7 +2038,7 @@
 		"PERSONAL-USAGE": "Προσωπική Χρήση",
 		"PUBLIC-USAGE": "Δημόσια Χρήση",
 		"DESCRIPTIONS": "Descriptions",
-		"DATASET-DESCRIPTIONS-DASHBOARD-TEXT": "Περιγραφές Συνόλου Δεδομένων",
+		"DESCRIPTIONS-DASHBOARD-TEXT": "Περιγραφές Συνόλου Δεδομένων",
 		"PUBLIC-DMPS": "Δημόσια Σχέδια Διαχείρισης Δεδομένων",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Σχετικοί Οργανισμοί",
@@ -2061,7 +2062,7 @@
 			"GOT-IT": "Got it!",
 			"LEAVE-TOUR": "Leave Tour"
 		},
-		"ADD-NEW-DATASET": {
+		"ADD-NEW-DESCRIPTION": {
 			"OPTIONS-NOT-ENOUGH": "Are those options not enough?",
 			"START-NEW-DMP": "Start new DMP",
 			"OPTIONS": {
diff --git a/dmp-frontend/src/assets/i18n/hr.json b/dmp-frontend/src/assets/i18n/hr.json
index 47d44a9e1..518edd1af 100644
--- a/dmp-frontend/src/assets/i18n/hr.json
+++ b/dmp-frontend/src/assets/i18n/hr.json
@@ -1,6 +1,6 @@
 {
-	"APP_NAME": "Argos",
-	"APP_NAME_CAPS": "ARGOS",
+	"APP_NAME": "OpenCDMP",
+	"APP_NAME_CAPS": "OpenCDMP",
 	"GENERAL": {
 		"VALIDATION": {
 			"REQUIRED": "Obavezno",
@@ -112,10 +112,10 @@
 				"CLOSE": "Zatvori"
 			}
 		},
-		"DMP-TO-DATASET-DIALOG": {
+		"DMP-TO-DESCRIPTION-DIALOG": {
 			"FROM-DMP": "Uspješno ste kreirali",
 			"DMP": "DMP",
-			"TO-DATASET": "Preusmjeravanje na",
+			"TO-DESCRIPTION": "Preusmjeravanje na",
 			"DATASET": "uređivanje",
 			"EDITOR": "skupa podataka",
 			"START": "početak"
@@ -157,7 +157,7 @@
 			"PROFILE": "Moj profil",
 			"LOGIN": "Prijava",
 			"PLAN-OVERVIEW": "Plan Overview",
-			"DATASET-OVERVIEW": "Description Overview",
+			"DESCRIPTION-OVERVIEW": "Description Overview",
 			"MAINTENANCE-TASKS": "Maintenance",
 			"HOME": "Home"
 		},
@@ -281,7 +281,7 @@
 		"DASHBOARD": "Početak",
 		"DMP": "PLANOVI UPRAVLJANJA PODACIMA",
 		"MY-DMPS": "Moji Planovi",
-		"DATASETS": "OPISI SKUPOVA PODATAKA",
+		"DESCRIPTIONS": "OPISI SKUPOVA PODATAKA",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "OBJAVLJENO",
 		"PUBLIC-DMPS": "Javno dostupni Planovi",
@@ -419,28 +419,28 @@
 		},
 		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
-			"DATASET-TITLE": "Description Template Name",
-			"DATASET-DESCRIPTION": "Opis"
+			"TITLE": "Description Template Name",
+			"DESCRIPTION": "Opis"
 		},
 		"STEPS": {
 			"GENERAL-INFO": {
 				"TITLE": "Opće informacije",
-				"DATASET-TEMPLATE-NAME": "Description template name",
-				"DATASET-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
-				"DATASET-TEMPLATE-DESCRIPTION": "Opis predloška",
-				"DATASET-TEMPLATE-DESCRIPTION-HINT": "Kratki opis skupa podataka, njegov opseg i ciljevi.",
+				"DESCRIPTION-TEMPLATE-NAME": "Description template name",
+				"DESCRIPTION-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION": "Opis predloška",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-HINT": "Kratki opis skupa podataka, njegov opseg i ciljevi.",
 				"DESCRIPTION-TEMPLATE-TYPE": "Description template type",
 				"DESCRIPTION-TEMPLATE-SELECT-TYPE": "Select a type",
-				"DATASET-TEMPLATE-LANGUAGE-HINT": "",
-				"DATASET-TEMPLATE-TYPE-HINT": "",
-				"DATASET-TEMPLATE-LANGUAGE": "Description template language",
-				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Izaberi jezik predloška",
-				"DATASET-TEMPLATE-USERS": "Korisnici predloška",
-				"DATASET-TEMPLATE-USERS-HINT": "Kako biste obavijestili korisnike, dodajte korisnike i spremite promjene.",
-				"DATASET-TEMPLATE-REMOVE-USER": "Izbriši korisnika",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... Nije unesen niti jedan korisnik",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Potvrdi i dodaj korisnika",
-				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Opis predloška skupa podataka",
+				"DESCRIPTION-TEMPLATE-LANGUAGE-HINT": "",
+				"DESCRIPTION-TEMPLATE-TYPE-HINT": "",
+				"DESCRIPTION-TEMPLATE-LANGUAGE": "Description template language",
+				"DESCRIPTION-TEMPLATE-SELECT-LANGUAGE": "Izaberi jezik predloška",
+				"DESCRIPTION-TEMPLATE-USERS": "Korisnici predloška",
+				"DESCRIPTION-TEMPLATE-USERS-HINT": "Kako biste obavijestili korisnike, dodajte korisnike i spremite promjene.",
+				"DESCRIPTION-TEMPLATE-REMOVE-USER": "Izbriši korisnika",
+				"DESCRIPTION-TEMPLATE-NO-USERS-YET": "... Nije unesen niti jedan korisnik",
+				"DESCRIPTION-TEMPLATE-VALIDATE-AND-ADD-USER": "Potvrdi i dodaj korisnika",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Opis predloška skupa podataka",
 				"UNTITLED": "Neimenovano",
 				"QUESTION": "Upit",
 				"TEMPLATE-OUTLINE": "Skica predloška",
@@ -477,7 +477,7 @@
 						"DESCRIPTION": "Opis"
 					}
 				},
-				"COMPOSITE-FIELD": {
+				"FIELD-SET": {
 					"FIELDS": {
 						"DESCRIPTION": "Opis",
 						"EXTENDED-DESCRIPTION": "Prošireni opis",
@@ -530,10 +530,11 @@
 						"FIELD-AUTOCOMPLETE-AUTH-TYPE": "Authentication Type",
 						"FIELD-MULTIPLE-AUTOCOMPLETE": "Višestruki automatski unos",
 						"FIELD-MULTIPLE-WORDLIST": "Višestruki odabir",
-						"FIELD-EXTERNAL-DATASETS-TITLE": "Podaci o vanjskim podacima (skupovima podataka)",
-						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Primjer unosa",
+						"FIELD-EXTERNAL-DESCRIPTIONS-TITLE": "Podaci o vanjskim podacima (skupovima podataka)",
+						"FIELD-EXTERNAL-DESCRIPTIONS-PLACEHOLDER": "Primjer unosa",
 						"FIELD-LICENSES-TITLE": "Licencirani podaci",
-						"EXTERNAL-DATASET-TYPE-NAME": "Vrsta"
+						"EXTERNAL-DATASET-TYPE-NAME": "Vrsta",
+						"INTERNAL-ENTITIES": "{{ APP_NAME_CAPS }} Entities"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "Mora biti naveden barem jedan izvor.",
@@ -822,7 +823,7 @@
 	"DESCRIPTION-LISTING": {
 		"TEXT-INFO": "Skupovi podataka se opisuju prema unaprijed određenim predlošcima. U {{ APP_NAME }}u, Plan može sadržavati onoliko opisa koliko ima skupova podataka. Pretražite",
 		"TEXT-INFO-REST": "za pregled skupova podataka opisanih u Planovima u {{ APP_NAME }}u",
-		"LINK-PUBLIC-DATASETS": "Pretražite javno dostupne skupove podataka",
+		"LINK-PUBLIC-DESCRIPTIONS": "Pretražite javno dostupne skupove podataka",
 		"TEXT-INFO-PAR": "Novi Opisi skupova podataka mogu se dodati u postojeće Planove upravljanja podacima u bilo kojem trenutku, a za njihovo opisivanje može se koristiti više od jednog predloška. Generirati možete kopije skupova podataka, koje možete koristiti i u drugim planovima. Skupovi podataka mogu se obrisati bez negativnih posljedica po Plan u cjelini.",
 		"TEXT-INFO-QUESTION": "New descriptions can be added to existing DMPs at any time and be described with more than one template. ",
 		"GET-IDEA": " Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.",
@@ -1789,7 +1790,7 @@
 		"DMP-VISIBILITY": {
 			"PUBLIC": "Objavljeno"
 		},
-		"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
+		"DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE": {
 			"NONE": "Nijedan",
 			"REQUIRED": "Obavezno"
 		},
@@ -1798,7 +1799,7 @@
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
 			"INTERNAL-DMP-ENTITIES-DMPS": "Internal Plans",
-			"INTERNAL-DMP-ENTITIES-DATASETS": "Internal Descriptions",
+			"INTERNAL-DMP-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
 			"TEXT-AREA": "Text Area",
@@ -1814,17 +1815,17 @@
 			"OWNER": "Owner",
 			"MEMBER": "Member"
 		},
-		"DATASET-PROFILE-UPLOAD-TYPE": {
+		"DESCRIPTION-TEMPLATE-UPLOAD-TYPE": {
 			"DOWNLOAD": "Preuzmi datoteku"
 		},
-		"DATASET-PROFILE-COMBO-BOX-TYPE": {
+		"DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE": {
 			"EXTERNAL-SOURCE-HINT": "Popis vrijednosti ponuđenih iz vanjskih izvora",
 			"ACTIONS": {
 				"YES": "Da",
 				"NO": "Ne"
 			}
 		},
-		"DATASET-PROFILE-VALIDATOR": {
+		"DESCRIPTION-TEMPLATE-VALIDATOR": {
 			"ACTION": "Potvrdi",
 			"REPOSITORIES-PLACEHOLDER": "Repozitoriji"
 		},
@@ -2037,7 +2038,7 @@
 		"PERSONAL-USAGE": "Osobna upotreba",
 		"PUBLIC-USAGE": "Javna upotreba",
 		"DESCRIPTIONS": "Descriptions",
-		"DATASET-DESCRIPTIONS-DASHBOARD-TEXT": "Opisi skupova podataka",
+		"DESCRIPTIONS-DASHBOARD-TEXT": "Opisi skupova podataka",
 		"PUBLIC-DMPS": "Javno dostupni Planovi",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Povezane ustanove",
@@ -2061,7 +2062,7 @@
 			"GOT-IT": "Razumijem!",
 			"LEAVE-TOUR": "Napusti obilazak"
 		},
-		"ADD-NEW-DATASET": {
+		"ADD-NEW-DESCRIPTION": {
 			"OPTIONS-NOT-ENOUGH": "Ako niste pronašli odgovarajući Plan,",
 			"START-NEW-DMP": "započnite novi.",
 			"OPTIONS": {
diff --git a/dmp-frontend/src/assets/i18n/pl.json b/dmp-frontend/src/assets/i18n/pl.json
index 422e7272d..2c7aa2437 100644
--- a/dmp-frontend/src/assets/i18n/pl.json
+++ b/dmp-frontend/src/assets/i18n/pl.json
@@ -1,6 +1,6 @@
 {
-	"APP_NAME": "Argos",
-	"APP_NAME_CAPS": "ARGOS",
+	"APP_NAME": "OpenCDMP",
+	"APP_NAME_CAPS": "OpenCDMP",
 	"GENERAL": {
 		"VALIDATION": {
 			"REQUIRED": "Wymagane",
@@ -112,10 +112,10 @@
 				"CLOSE": "Zamknij"
 			}
 		},
-		"DMP-TO-DATASET-DIALOG": {
+		"DMP-TO-DESCRIPTION-DIALOG": {
 			"FROM-DMP": "Utworzyłeś swój",
 			"DMP": "DMP",
-			"TO-DATASET": "Zostaniesz przeniesiony do",
+			"TO-DESCRIPTION": "Zostaniesz przeniesiony do",
 			"DATASET": "Zbioru danych",
 			"EDITOR": "edytora",
 			"START": "Zaczynamy"
@@ -157,7 +157,7 @@
 			"PROFILE": "Mój profil",
 			"LOGIN": "Zaloguj",
 			"PLAN-OVERVIEW": "Plan Overview",
-			"DATASET-OVERVIEW": "Description Overview",
+			"DESCRIPTION-OVERVIEW": "Description Overview",
 			"MAINTENANCE-TASKS": "Maintenance",
 			"HOME": "Home"
 		},
@@ -281,7 +281,7 @@
 		"DASHBOARD": "Strona główna",
 		"DMP": "PLANY ZARZĄDZANIA DANYMI",
 		"MY-DMPS": "Moje DMPs",
-		"DATASETS": "ZBIÓR DANYCH",
+		"DESCRIPTIONS": "ZBIÓR DANYCH",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "OPUBLIKOWANE",
 		"PUBLIC-DMPS": "Publiczne DMPs",
@@ -419,28 +419,28 @@
 		},
 		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
-			"DATASET-TITLE": "Description Template Name",
-			"DATASET-DESCRIPTION": "Opis"
+			"TITLE": "Description Template Name",
+			"DESCRIPTION": "Opis"
 		},
 		"STEPS": {
 			"GENERAL-INFO": {
 				"TITLE": "Informacje ogólne",
-				"DATASET-TEMPLATE-NAME": "Description template name",
-				"DATASET-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
-				"DATASET-TEMPLATE-DESCRIPTION": "Opis",
-				"DATASET-TEMPLATE-DESCRIPTION-HINT": "Krótki opis roli, zakresu i celów zbioru danych",
+				"DESCRIPTION-TEMPLATE-NAME": "Description template name",
+				"DESCRIPTION-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION": "Opis",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-HINT": "Krótki opis roli, zakresu i celów zbioru danych",
 				"DESCRIPTION-TEMPLATE-TYPE": "Description template type",
 				"DESCRIPTION-TEMPLATE-SELECT-TYPE": "Select a type",
-				"DATASET-TEMPLATE-LANGUAGE-HINT": "",
-				"DATASET-TEMPLATE-TYPE-HINT": "",
-				"DATASET-TEMPLATE-LANGUAGE": "Description template language",
-				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Wybierz język",
-				"DATASET-TEMPLATE-USERS": "Redaktorzy",
-				"DATASET-TEMPLATE-USERS-HINT": "Dodaj redaktorów i zapisz zmiany, aby ich powiadomić.",
-				"DATASET-TEMPLATE-REMOVE-USER": "Usuń redaktora",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... Nie ma jeszcze redaktorów",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Zweryfikuj i dodaj redaktora",
-				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Opis szablonu zbioru danych",
+				"DESCRIPTION-TEMPLATE-LANGUAGE-HINT": "",
+				"DESCRIPTION-TEMPLATE-TYPE-HINT": "",
+				"DESCRIPTION-TEMPLATE-LANGUAGE": "Description template language",
+				"DESCRIPTION-TEMPLATE-SELECT-LANGUAGE": "Wybierz język",
+				"DESCRIPTION-TEMPLATE-USERS": "Redaktorzy",
+				"DESCRIPTION-TEMPLATE-USERS-HINT": "Dodaj redaktorów i zapisz zmiany, aby ich powiadomić.",
+				"DESCRIPTION-TEMPLATE-REMOVE-USER": "Usuń redaktora",
+				"DESCRIPTION-TEMPLATE-NO-USERS-YET": "... Nie ma jeszcze redaktorów",
+				"DESCRIPTION-TEMPLATE-VALIDATE-AND-ADD-USER": "Zweryfikuj i dodaj redaktora",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Opis szablonu zbioru danych",
 				"UNTITLED": "Bez tytułu",
 				"QUESTION": "Pytanie",
 				"TEMPLATE-OUTLINE": "Zarys szablonu",
@@ -477,7 +477,7 @@
 						"DESCRIPTION": "Opis"
 					}
 				},
-				"COMPOSITE-FIELD": {
+				"FIELD-SET": {
 					"FIELDS": {
 						"DESCRIPTION": "Opis",
 						"EXTENDED-DESCRIPTION": "Rozszerzony opis",
@@ -530,10 +530,11 @@
 						"FIELD-AUTOCOMPLETE-AUTH-TYPE": "Authentication Type",
 						"FIELD-MULTIPLE-AUTOCOMPLETE": "$Powiel autouzupełnianie$",
 						"FIELD-MULTIPLE-WORDLIST": "Pole wielokrotnego wyboru",
-						"FIELD-EXTERNAL-DATASETS-TITLE": "Dane zewnętrznych zbiorów danych",
-						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Wprowadź tekst zastępczy",
+						"FIELD-EXTERNAL-DESCRIPTIONS-TITLE": "Dane zewnętrznych zbiorów danych",
+						"FIELD-EXTERNAL-DESCRIPTIONS-PLACEHOLDER": "Wprowadź tekst zastępczy",
 						"FIELD-LICENSES-TITLE": "Dane licencji",
-						"EXTERNAL-DATASET-TYPE-NAME": "Typ"
+						"EXTERNAL-DATASET-TYPE-NAME": "Typ",
+						"INTERNAL-ENTITIES": "{{ APP_NAME_CAPS }} Entities"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "Należy podać co najmniej jedno źródło.",
@@ -822,7 +823,7 @@
 	"DESCRIPTION-LISTING": {
 		"TEXT-INFO": "Zbiory danych są dokumentowane zgodnie ze wstępnie zdefiniowanymi szablonami, które ustalają zawartość opisów zbiorów danych. W {{ APP_NAME }} DMP może zawierać tyle opisów zbiorów danych, ile zbiorów danych dokumentuje. Przeglądaj",
 		"TEXT-INFO-REST": " w celu zapoznania się z zbiorami danych opisanymi w {{ APP_NAME }} DMPs",
-		"LINK-PUBLIC-DATASETS": "Publiczne zbiory danych",
+		"LINK-PUBLIC-DESCRIPTIONS": "Publiczne zbiory danych",
 		"TEXT-INFO-PAR": "Nowe zbiory danych można dodawać do istniejących DMP w dowolnym momencie i opisywać za pomocą więcej niż jednego szablonu. Zbiory danych można również kopiować i ponownie wykorzystywać w innych DMP, a także usuwać bez negatywnego wpływu na DMP jako całość.",
 		"TEXT-INFO-QUESTION": "New descriptions can be added to existing DMPs at any time and be described with more than one template. ",
 		"GET-IDEA": " Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.",
@@ -1789,7 +1790,7 @@
 		"DMP-VISIBILITY": {
 			"PUBLIC": "Opublikowane"
 		},
-		"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
+		"DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE": {
 			"NONE": "Brak",
 			"REQUIRED": "Wymagane"
 		},
@@ -1798,7 +1799,7 @@
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
 			"INTERNAL-DMP-ENTITIES-DMPS": "Internal Plans",
-			"INTERNAL-DMP-ENTITIES-DATASETS": "Internal Descriptions",
+			"INTERNAL-DMP-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
 			"TEXT-AREA": "Text Area",
@@ -1814,17 +1815,17 @@
 			"OWNER": "Owner",
 			"MEMBER": "Member"
 		},
-		"DATASET-PROFILE-UPLOAD-TYPE": {
+		"DESCRIPTION-TEMPLATE-UPLOAD-TYPE": {
 			"DOWNLOAD": "Pobierz plik"
 		},
-		"DATASET-PROFILE-COMBO-BOX-TYPE": {
+		"DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE": {
 			"EXTERNAL-SOURCE-HINT": "Lista wartości dostarczanych przez zewnętrzne źródła",
 			"ACTIONS": {
 				"YES": "Tak",
 				"NO": "Nie"
 			}
 		},
-		"DATASET-PROFILE-VALIDATOR": {
+		"DESCRIPTION-TEMPLATE-VALIDATOR": {
 			"ACTION": "Zatwierdź",
 			"REPOSITORIES-PLACEHOLDER": "Repozytoria"
 		},
@@ -2037,7 +2038,7 @@
 		"PERSONAL-USAGE": "Użytek osobisty",
 		"PUBLIC-USAGE": "Użytek publiczny",
 		"DESCRIPTIONS": "Descriptions",
-		"DATASET-DESCRIPTIONS-DASHBOARD-TEXT": "Zbiory danych",
+		"DESCRIPTIONS-DASHBOARD-TEXT": "Zbiory danych",
 		"PUBLIC-DMPS": "Publiczne DMP",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Organizacje powiązane",
@@ -2061,7 +2062,7 @@
 			"GOT-IT": "Mam to!",
 			"LEAVE-TOUR": "Opuść przewodnik"
 		},
-		"ADD-NEW-DATASET": {
+		"ADD-NEW-DESCRIPTION": {
 			"OPTIONS-NOT-ENOUGH": "Czy te opcje nie wystarczą?",
 			"START-NEW-DMP": "Rozpocznij nowy DMP",
 			"OPTIONS": {
diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json
index bdcd2eb13..710e57da7 100644
--- a/dmp-frontend/src/assets/i18n/pt.json
+++ b/dmp-frontend/src/assets/i18n/pt.json
@@ -1,6 +1,6 @@
 {
-	"APP_NAME": "Argos",
-	"APP_NAME_CAPS": "ARGOS",
+	"APP_NAME": "OpenCDMP",
+	"APP_NAME_CAPS": "OpenCDMP",
 	"GENERAL": {
 		"VALIDATION": {
 			"REQUIRED": "Obrigatório",
@@ -112,10 +112,10 @@
 				"CLOSE": "Fechar"
 			}
 		},
-		"DMP-TO-DATASET-DIALOG": {
+		"DMP-TO-DESCRIPTION-DIALOG": {
 			"FROM-DMP": "Criou com sucesso o seu",
 			"DMP": "PGD",
-			"TO-DATASET": "Será transferido para o editor de",
+			"TO-DESCRIPTION": "Será transferido para o editor de",
 			"DATASET": "Datasets",
 			"EDITOR": "onde poderá criar ou rever o seu modelo",
 			"START": "Ok"
@@ -157,7 +157,7 @@
 			"PROFILE": "O meu Perfil",
 			"LOGIN": "Iniciar Sessão",
 			"PLAN-OVERVIEW": "Plan Overview",
-			"DATASET-OVERVIEW": "Description Overview",
+			"DESCRIPTION-OVERVIEW": "Description Overview",
 			"MAINTENANCE-TASKS": "Maintenance",
 			"HOME": "Home"
 		},
@@ -281,7 +281,7 @@
 		"DASHBOARD": "Início",
 		"DMP": "PLANOS DE GESTÃO DE DADOS",
 		"MY-DMPS": "Os meus PGDs",
-		"DATASETS": "Datasets",
+		"DESCRIPTIONS": "Datasets",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "PUBLICADOS",
 		"PUBLIC-DMPS": "PGDs públicos",
@@ -419,28 +419,28 @@
 		},
 		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
-			"DATASET-TITLE": "Description Template Name",
-			"DATASET-DESCRIPTION": "Descrição"
+			"TITLE": "Description Template Name",
+			"DESCRIPTION": "Descrição"
 		},
 		"STEPS": {
 			"GENERAL-INFO": {
 				"TITLE": "Informação Geral",
-				"DATASET-TEMPLATE-NAME": "Description template name",
-				"DATASET-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
-				"DATASET-TEMPLATE-DESCRIPTION": "Descrição",
-				"DATASET-TEMPLATE-DESCRIPTION-HINT": "Uma breve descrição do que é o modelo de dados, o seu âmbito e objetivos.",
+				"DESCRIPTION-TEMPLATE-NAME": "Description template name",
+				"DESCRIPTION-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION": "Descrição",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-HINT": "Uma breve descrição do que é o modelo de dados, o seu âmbito e objetivos.",
 				"DESCRIPTION-TEMPLATE-TYPE": "Description template type",
 				"DESCRIPTION-TEMPLATE-SELECT-TYPE": "Select a type",
-				"DATASET-TEMPLATE-LANGUAGE-HINT": "",
-				"DATASET-TEMPLATE-TYPE-HINT": "",
-				"DATASET-TEMPLATE-LANGUAGE": "Description template language",
-				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Selecione o idioma",
-				"DATASET-TEMPLATE-USERS": "Editors",
-				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
-				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Descrição do modelo de dados",
+				"DESCRIPTION-TEMPLATE-LANGUAGE-HINT": "",
+				"DESCRIPTION-TEMPLATE-TYPE-HINT": "",
+				"DESCRIPTION-TEMPLATE-LANGUAGE": "Description template language",
+				"DESCRIPTION-TEMPLATE-SELECT-LANGUAGE": "Selecione o idioma",
+				"DESCRIPTION-TEMPLATE-USERS": "Editors",
+				"DESCRIPTION-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DESCRIPTION-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DESCRIPTION-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DESCRIPTION-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Descrição do modelo de dados",
 				"UNTITLED": "Sem título",
 				"QUESTION": "Questão",
 				"TEMPLATE-OUTLINE": "Esquema do modelo",
@@ -477,7 +477,7 @@
 						"DESCRIPTION": "Descrição"
 					}
 				},
-				"COMPOSITE-FIELD": {
+				"FIELD-SET": {
 					"FIELDS": {
 						"DESCRIPTION": "Descrição",
 						"EXTENDED-DESCRIPTION": "Descrição Alargada",
@@ -530,10 +530,11 @@
 						"FIELD-AUTOCOMPLETE-AUTH-TYPE": "Authentication Type",
 						"FIELD-MULTIPLE-AUTOCOMPLETE": "Autopreenchimento Múltiplo",
 						"FIELD-MULTIPLE-WORDLIST": "Seleção Múltipla",
-						"FIELD-EXTERNAL-DATASETS-TITLE": "Dados dos Datasets Externos",
-						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Texto de Entrada",
+						"FIELD-EXTERNAL-DESCRIPTIONS-TITLE": "Dados dos Datasets Externos",
+						"FIELD-EXTERNAL-DESCRIPTIONS-PLACEHOLDER": "Texto de Entrada",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type"
+						"EXTERNAL-DATASET-TYPE-NAME": "Type",
+						"INTERNAL-ENTITIES": "{{ APP_NAME_CAPS }} Entities"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "Deve ser fornecida pelo menos uma fonte.",
@@ -822,7 +823,7 @@
 	"DESCRIPTION-LISTING": {
 		"TEXT-INFO": "Os Datasets no {{ APP_NAME }} são documentados segundo modelos pré-definidos, onde são registados os conteúdos e características de cada Dataset. Assim, um Plano de Gestão de Dados (PGD) pode conter tantos Datasets quanto os necessários. Pesquise ",
 		"TEXT-INFO-REST": " para ver os Datasets descritos no PGD do {{ APP_NAME }}",
-		"LINK-PUBLIC-DATASETS": "Datasets Públicos",
+		"LINK-PUBLIC-DESCRIPTIONS": "Datasets Públicos",
 		"TEXT-INFO-PAR": "Novos Datasets podem ser adicionados aos PGDs existentes em qualquer altura e ser descritos com mais do que um modelo. Os Datasets podem também ser duplicados e reutilizados em outros PGDs bem como serem removidos sem afetar o PGD como um todo.",
 		"TEXT-INFO-QUESTION": "New descriptions can be added to existing DMPs at any time and be described with more than one template. ",
 		"GET-IDEA": " Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.",
@@ -1789,7 +1790,7 @@
 		"DMP-VISIBILITY": {
 			"PUBLIC": "Publicado"
 		},
-		"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
+		"DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE": {
 			"NONE": "Nenhum",
 			"REQUIRED": "Obrigatório"
 		},
@@ -1798,7 +1799,7 @@
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
 			"INTERNAL-DMP-ENTITIES-DMPS": "Internal Plans",
-			"INTERNAL-DMP-ENTITIES-DATASETS": "Internal Descriptions",
+			"INTERNAL-DMP-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
 			"TEXT-AREA": "Text Area",
@@ -1814,17 +1815,17 @@
 			"OWNER": "Owner",
 			"MEMBER": "Member"
 		},
-		"DATASET-PROFILE-UPLOAD-TYPE": {
+		"DESCRIPTION-TEMPLATE-UPLOAD-TYPE": {
 			"DOWNLOAD": "Download file"
 		},
-		"DATASET-PROFILE-COMBO-BOX-TYPE": {
+		"DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE": {
 			"EXTERNAL-SOURCE-HINT": "Lista de valores fornecidos por fonte(s) externa(s)",
 			"ACTIONS": {
 				"YES": "Sim",
 				"NO": "Não"
 			}
 		},
-		"DATASET-PROFILE-VALIDATOR": {
+		"DESCRIPTION-TEMPLATE-VALIDATOR": {
 			"ACTION": "Validar",
 			"REPOSITORIES-PLACEHOLDER": "Repositórios"
 		},
@@ -2037,7 +2038,7 @@
 		"PERSONAL-USAGE": "Uso Pessoal",
 		"PUBLIC-USAGE": "Uso Público",
 		"DESCRIPTIONS": "Descriptions",
-		"DATASET-DESCRIPTIONS-DASHBOARD-TEXT": "",
+		"DESCRIPTIONS-DASHBOARD-TEXT": "",
 		"PUBLIC-DMPS": "PGDs Públicos",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Organizações Relacionadas",
@@ -2061,7 +2062,7 @@
 			"GOT-IT": "Ok, entendi!",
 			"LEAVE-TOUR": "Fechar"
 		},
-		"ADD-NEW-DATASET": {
+		"ADD-NEW-DESCRIPTION": {
 			"OPTIONS-NOT-ENOUGH": "Não pretende selecionar nenhuma destas opções?",
 			"START-NEW-DMP": "Criar novo PGD",
 			"OPTIONS": {
diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json
index 6c85f2d2e..68d105fa8 100644
--- a/dmp-frontend/src/assets/i18n/sk.json
+++ b/dmp-frontend/src/assets/i18n/sk.json
@@ -1,6 +1,6 @@
 {
-	"APP_NAME": "Argos",
-	"APP_NAME_CAPS": "ARGOS",
+	"APP_NAME": "OpenCDMP",
+	"APP_NAME_CAPS": "OpenCDMP",
 	"GENERAL": {
 		"VALIDATION": {
 			"REQUIRED": "Povinné",
@@ -112,10 +112,10 @@
 				"CLOSE": "Zatvoriť"
 			}
 		},
-		"DMP-TO-DATASET-DIALOG": {
+		"DMP-TO-DESCRIPTION-DIALOG": {
 			"FROM-DMP": "You have successfully created your",
 			"DMP": "DMP",
-			"TO-DATASET": "You will be transferred to the",
+			"TO-DESCRIPTION": "You will be transferred to the",
 			"DATASET": "Dataset",
 			"EDITOR": "editor",
 			"START": "let's start"
@@ -157,7 +157,7 @@
 			"PROFILE": "Môj profil",
 			"LOGIN": "Prihlásenie",
 			"PLAN-OVERVIEW": "Plan Overview",
-			"DATASET-OVERVIEW": "Description Overview",
+			"DESCRIPTION-OVERVIEW": "Description Overview",
 			"MAINTENANCE-TASKS": "Maintenance",
 			"HOME": "Home"
 		},
@@ -281,7 +281,7 @@
 		"DASHBOARD": "Domov",
 		"DMP": "PLÁNY MANAŽMENTU DÁT",
 		"MY-DMPS": "Moje DMP",
-		"DATASETS": "SÚBORY DÁT",
+		"DESCRIPTIONS": "SÚBORY DÁT",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "PUBLIKOVANÉ",
 		"PUBLIC-DMPS": "Verejné DMP",
@@ -419,28 +419,28 @@
 		},
 		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
-			"DATASET-TITLE": "Description Template Name",
-			"DATASET-DESCRIPTION": "Opis"
+			"TITLE": "Description Template Name",
+			"DESCRIPTION": "Opis"
 		},
 		"STEPS": {
 			"GENERAL-INFO": {
 				"TITLE": "General Info",
-				"DATASET-TEMPLATE-NAME": "Description template name",
-				"DATASET-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
-				"DATASET-TEMPLATE-DESCRIPTION": "Description",
-				"DATASET-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Description is about, it's scope and objectives.",
+				"DESCRIPTION-TEMPLATE-NAME": "Description template name",
+				"DESCRIPTION-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION": "Description",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Description is about, it's scope and objectives.",
 				"DESCRIPTION-TEMPLATE-TYPE": "Description template type",
 				"DESCRIPTION-TEMPLATE-SELECT-TYPE": "Select a type",
-				"DATASET-TEMPLATE-LANGUAGE-HINT": "",
-				"DATASET-TEMPLATE-TYPE-HINT": "",
-				"DATASET-TEMPLATE-LANGUAGE": "Description template language",
-				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
-				"DATASET-TEMPLATE-USERS": "Editors",
-				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
-				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
+				"DESCRIPTION-TEMPLATE-LANGUAGE-HINT": "",
+				"DESCRIPTION-TEMPLATE-TYPE-HINT": "",
+				"DESCRIPTION-TEMPLATE-LANGUAGE": "Description template language",
+				"DESCRIPTION-TEMPLATE-SELECT-LANGUAGE": "Select a language",
+				"DESCRIPTION-TEMPLATE-USERS": "Editors",
+				"DESCRIPTION-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DESCRIPTION-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DESCRIPTION-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DESCRIPTION-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
 				"TEMPLATE-OUTLINE": "Template outline",
@@ -477,7 +477,7 @@
 						"DESCRIPTION": "Opis"
 					}
 				},
-				"COMPOSITE-FIELD": {
+				"FIELD-SET": {
 					"FIELDS": {
 						"DESCRIPTION": "Description",
 						"EXTENDED-DESCRIPTION": "Extended Description",
@@ -530,10 +530,11 @@
 						"FIELD-AUTOCOMPLETE-AUTH-TYPE": "Authentication Type",
 						"FIELD-MULTIPLE-AUTOCOMPLETE": "Multiple Autocomplete",
 						"FIELD-MULTIPLE-WORDLIST": "Multiple Selection",
-						"FIELD-EXTERNAL-DATASETS-TITLE": "External Datasets Data",
-						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Input placeholder Text",
+						"FIELD-EXTERNAL-DESCRIPTIONS-TITLE": "External Datasets Data",
+						"FIELD-EXTERNAL-DESCRIPTIONS-PLACEHOLDER": "Input placeholder Text",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type"
+						"EXTERNAL-DATASET-TYPE-NAME": "Type",
+						"INTERNAL-ENTITIES": "{{ APP_NAME_CAPS }} Entities"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "At least one source must be provided.",
@@ -822,7 +823,7 @@
 	"DESCRIPTION-LISTING": {
 		"TEXT-INFO": "Súbory dát sú dokumentované podľa vopred definovaných šablón, ktoré určujú obsah daného typu súboru dát. V {{ APP_NAME }}e môže DMP obsahovať toľko typov súborov dát, koľko súborov dát dané DMP dokumentuje. Prezrieť",
 		"TEXT-INFO-REST": " súbory dát začlené do DMP v {{ APP_NAME }}e",
-		"LINK-PUBLIC-DATASETS": "Verejné súbory dát",
+		"LINK-PUBLIC-DESCRIPTIONS": "Verejné súbory dát",
 		"TEXT-INFO-PAR": "Nové súbory dát je možné kedykoľvek pridať do existujúcich DMP a definovať ich prostredníctvom viacerých šablón. Súbory dát je možné klonovať a opätovne použiť, ako aj vymazať, pričom to nebude mať negatívny dopad na DMP ako celok.",
 		"TEXT-INFO-QUESTION": "New descriptions can be added to existing DMPs at any time and be described with more than one template. ",
 		"GET-IDEA": " Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.",
@@ -1789,7 +1790,7 @@
 		"DMP-VISIBILITY": {
 			"PUBLIC": "Publikované"
 		},
-		"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
+		"DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE": {
 			"NONE": "Žiadne",
 			"REQUIRED": "Povinné"
 		},
@@ -1798,7 +1799,7 @@
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
 			"INTERNAL-DMP-ENTITIES-DMPS": "Internal Plans",
-			"INTERNAL-DMP-ENTITIES-DATASETS": "Internal Descriptions",
+			"INTERNAL-DMP-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
 			"TEXT-AREA": "Text Area",
@@ -1814,17 +1815,17 @@
 			"OWNER": "Owner",
 			"MEMBER": "Member"
 		},
-		"DATASET-PROFILE-UPLOAD-TYPE": {
+		"DESCRIPTION-TEMPLATE-UPLOAD-TYPE": {
 			"DOWNLOAD": "Download file"
 		},
-		"DATASET-PROFILE-COMBO-BOX-TYPE": {
+		"DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE": {
 			"EXTERNAL-SOURCE-HINT": "Zoznam hodnôt dodaných z externých zdrojov.",
 			"ACTIONS": {
 				"YES": "Áno",
 				"NO": "Nie"
 			}
 		},
-		"DATASET-PROFILE-VALIDATOR": {
+		"DESCRIPTION-TEMPLATE-VALIDATOR": {
 			"ACTION": "Validate",
 			"REPOSITORIES-PLACEHOLDER": "Repositories"
 		},
@@ -2037,7 +2038,7 @@
 		"PERSONAL-USAGE": "Osobné použitie",
 		"PUBLIC-USAGE": "Verejné použitie",
 		"DESCRIPTIONS": "Descriptions",
-		"DATASET-DESCRIPTIONS-DASHBOARD-TEXT": "Súbory dát",
+		"DESCRIPTIONS-DASHBOARD-TEXT": "Súbory dát",
 		"PUBLIC-DMPS": "Verejné DMP",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Ďalšie organizácie",
@@ -2061,7 +2062,7 @@
 			"GOT-IT": "Got it!",
 			"LEAVE-TOUR": "Leave Tour"
 		},
-		"ADD-NEW-DATASET": {
+		"ADD-NEW-DESCRIPTION": {
 			"OPTIONS-NOT-ENOUGH": "Are those options not enough?",
 			"START-NEW-DMP": "Start new DMP",
 			"OPTIONS": {
diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json
index 47e33bb91..74f4c136a 100644
--- a/dmp-frontend/src/assets/i18n/sr.json
+++ b/dmp-frontend/src/assets/i18n/sr.json
@@ -1,6 +1,6 @@
 {
-	"APP_NAME": "Argos",
-	"APP_NAME_CAPS": "ARGOS",
+	"APP_NAME": "OpenCDMP",
+	"APP_NAME_CAPS": "OpenCDMP",
 	"GENERAL": {
 		"VALIDATION": {
 			"REQUIRED": "Obavezno",
@@ -112,10 +112,10 @@
 				"CLOSE": "Zatvorite"
 			}
 		},
-		"DMP-TO-DATASET-DIALOG": {
+		"DMP-TO-DESCRIPTION-DIALOG": {
 			"FROM-DMP": "Uspešno ste kreirali",
 			"DMP": "DMP",
-			"TO-DATASET": "Preusmeravanje na",
+			"TO-DESCRIPTION": "Preusmeravanje na",
 			"DATASET": "uređivanje",
 			"EDITOR": "skupa podataka",
 			"START": "početak"
@@ -157,7 +157,7 @@
 			"PROFILE": "Moj profil",
 			"LOGIN": "Prijava",
 			"PLAN-OVERVIEW": "Plan Overview",
-			"DATASET-OVERVIEW": "Description Overview",
+			"DESCRIPTION-OVERVIEW": "Description Overview",
 			"MAINTENANCE-TASKS": "Maintenance",
 			"HOME": "Home"
 		},
@@ -281,7 +281,7 @@
 		"DASHBOARD": "Početak",
 		"DMP": "PLANOVI UPRAVLJANJA PODACIMA",
 		"MY-DMPS": "Moji Planovi",
-		"DATASETS": "SKUPOVI PODATAKA",
+		"DESCRIPTIONS": "SKUPOVI PODATAKA",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "OBJAVLJENO",
 		"PUBLIC-DMPS": "Javno dostupni Planovi",
@@ -419,28 +419,28 @@
 		},
 		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
-			"DATASET-TITLE": "Description Template Name",
-			"DATASET-DESCRIPTION": "Opis"
+			"TITLE": "Description Template Name",
+			"DESCRIPTION": "Opis"
 		},
 		"STEPS": {
 			"GENERAL-INFO": {
 				"TITLE": "General Info",
-				"DATASET-TEMPLATE-NAME": "Description template name",
-				"DATASET-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
-				"DATASET-TEMPLATE-DESCRIPTION": "Description",
-				"DATASET-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Description is about, it's scope and objectives.",
+				"DESCRIPTION-TEMPLATE-NAME": "Description template name",
+				"DESCRIPTION-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION": "Description",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Description is about, it's scope and objectives.",
 				"DESCRIPTION-TEMPLATE-TYPE": "Description template type",
 				"DESCRIPTION-TEMPLATE-SELECT-TYPE": "Select a type",
-				"DATASET-TEMPLATE-LANGUAGE-HINT": "",
-				"DATASET-TEMPLATE-TYPE-HINT": "",
-				"DATASET-TEMPLATE-LANGUAGE": "Description template language",
-				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
-				"DATASET-TEMPLATE-USERS": "Editors",
-				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
-				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
+				"DESCRIPTION-TEMPLATE-LANGUAGE-HINT": "",
+				"DESCRIPTION-TEMPLATE-TYPE-HINT": "",
+				"DESCRIPTION-TEMPLATE-LANGUAGE": "Description template language",
+				"DESCRIPTION-TEMPLATE-SELECT-LANGUAGE": "Select a language",
+				"DESCRIPTION-TEMPLATE-USERS": "Editors",
+				"DESCRIPTION-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DESCRIPTION-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DESCRIPTION-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DESCRIPTION-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
 				"TEMPLATE-OUTLINE": "Template outline",
@@ -477,7 +477,7 @@
 						"DESCRIPTION": "Opis"
 					}
 				},
-				"COMPOSITE-FIELD": {
+				"FIELD-SET": {
 					"FIELDS": {
 						"DESCRIPTION": "Opis",
 						"EXTENDED-DESCRIPTION": "Prošireni opis",
@@ -530,10 +530,11 @@
 						"FIELD-AUTOCOMPLETE-AUTH-TYPE": "Authentication Type",
 						"FIELD-MULTIPLE-AUTOCOMPLETE": "Višestruki automatski unos",
 						"FIELD-MULTIPLE-WORDLIST": "Višestruki odabir",
-						"FIELD-EXTERNAL-DATASETS-TITLE": "External Datasets Data",
-						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Input placeholder Text",
+						"FIELD-EXTERNAL-DESCRIPTIONS-TITLE": "External Datasets Data",
+						"FIELD-EXTERNAL-DESCRIPTIONS-PLACEHOLDER": "Input placeholder Text",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type"
+						"EXTERNAL-DATASET-TYPE-NAME": "Type",
+						"INTERNAL-ENTITIES": "{{ APP_NAME_CAPS }} Entities"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "At least one source must be provided.",
@@ -822,7 +823,7 @@
 	"DESCRIPTION-LISTING": {
 		"TEXT-INFO": "Skupovi podataka se opisuju prema predefinisanim obrascima. U {{ APP_NAME }}u, plan može da sadrži onoliko opisa koliko ima skupova podataka. Pretražite",
 		"TEXT-INFO-REST": "za pregled skupova podataka opisanih u planovima u {{ APP_NAME }}u",
-		"LINK-PUBLIC-DATASETS": "javno dostupne skupove podataka",
+		"LINK-PUBLIC-DESCRIPTIONS": "javno dostupne skupove podataka",
 		"TEXT-INFO-PAR": "Novi skupovi podataka mogu se dodati u postojeće planove upravljanja podacima u bilo kom trenutku, a za njihovo opisivanje može se koristiti više od jednog obrasca. Možete da generišete kopije skupova podataka, koje možete koristiti i u drugim planovima. Skupovi podataka se mogu obrisati bez negativnih posledica po plan u celini.",
 		"TEXT-INFO-QUESTION": "New descriptions can be added to existing DMPs at any time and be described with more than one template. ",
 		"GET-IDEA": " Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.",
@@ -1789,7 +1790,7 @@
 		"DMP-VISIBILITY": {
 			"PUBLIC": "Objavljeno"
 		},
-		"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
+		"DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE": {
 			"NONE": "Nijedan",
 			"REQUIRED": "Obavezan"
 		},
@@ -1798,7 +1799,7 @@
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
 			"INTERNAL-DMP-ENTITIES-DMPS": "Internal Plans",
-			"INTERNAL-DMP-ENTITIES-DATASETS": "Internal Descriptions",
+			"INTERNAL-DMP-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
 			"TEXT-AREA": "Text Area",
@@ -1814,17 +1815,17 @@
 			"OWNER": "Owner",
 			"MEMBER": "Member"
 		},
-		"DATASET-PROFILE-UPLOAD-TYPE": {
+		"DESCRIPTION-TEMPLATE-UPLOAD-TYPE": {
 			"DOWNLOAD": "Download file"
 		},
-		"DATASET-PROFILE-COMBO-BOX-TYPE": {
+		"DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE": {
 			"EXTERNAL-SOURCE-HINT": "Lista vrednosti obezbeđenih od spoljnih izvora",
 			"ACTIONS": {
 				"YES": "Da",
 				"NO": "Ne"
 			}
 		},
-		"DATASET-PROFILE-VALIDATOR": {
+		"DESCRIPTION-TEMPLATE-VALIDATOR": {
 			"ACTION": "Validate",
 			"REPOSITORIES-PLACEHOLDER": "Repositories"
 		},
@@ -2037,7 +2038,7 @@
 		"PERSONAL-USAGE": "Lična upotreba",
 		"PUBLIC-USAGE": "Javna upotreba",
 		"DESCRIPTIONS": "Descriptions",
-		"DATASET-DESCRIPTIONS-DASHBOARD-TEXT": "Skupovi podataka",
+		"DESCRIPTIONS-DASHBOARD-TEXT": "Skupovi podataka",
 		"PUBLIC-DMPS": "Javno dostupni Planovi",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Povezane institucije",
@@ -2061,7 +2062,7 @@
 			"GOT-IT": "Got it!",
 			"LEAVE-TOUR": "Leave Tour"
 		},
-		"ADD-NEW-DATASET": {
+		"ADD-NEW-DESCRIPTION": {
 			"OPTIONS-NOT-ENOUGH": "Are those options not enough?",
 			"START-NEW-DMP": "Start new DMP",
 			"OPTIONS": {
diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json
index 1bc0e693f..da1bd1a79 100644
--- a/dmp-frontend/src/assets/i18n/tr.json
+++ b/dmp-frontend/src/assets/i18n/tr.json
@@ -1,6 +1,6 @@
 {
-	"APP_NAME": "Argos",
-	"APP_NAME_CAPS": "ARGOS",
+	"APP_NAME": "OpenCDMP",
+	"APP_NAME_CAPS": "OpenCDMP",
 	"GENERAL": {
 		"VALIDATION": {
 			"REQUIRED": "Gerekli",
@@ -112,10 +112,10 @@
 				"CLOSE": "Kapat"
 			}
 		},
-		"DMP-TO-DATASET-DIALOG": {
+		"DMP-TO-DESCRIPTION-DIALOG": {
 			"FROM-DMP": "Başarıyla oluşturdunuz",
 			"DMP": "VYP",
-			"TO-DATASET": "Yönlendireleceksiniz",
+			"TO-DESCRIPTION": "Yönlendireleceksiniz",
 			"DATASET": "Veri Seti",
 			"EDITOR": "editor",
 			"START": "Hadi başlayalım"
@@ -157,7 +157,7 @@
 			"PROFILE": "Profilim",
 			"LOGIN": "Giriş",
 			"PLAN-OVERVIEW": "Plan Overview",
-			"DATASET-OVERVIEW": "Description Overview",
+			"DESCRIPTION-OVERVIEW": "Description Overview",
 			"MAINTENANCE-TASKS": "Maintenance",
 			"HOME": "Home"
 		},
@@ -281,7 +281,7 @@
 		"DASHBOARD": "Ev",
 		"DMP": "VERİ YÖNETİM PLANLARI",
 		"MY-DMPS": "VYP'larım",
-		"DATASETS": "Veri Setleri",
+		"DESCRIPTIONS": "Veri Setleri",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "YAYINLANDI",
 		"PUBLIC-DMPS": "Yayınlanmış VYP'ları",
@@ -419,28 +419,28 @@
 		},
 		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
-			"DATASET-TITLE": "Description Template Name",
-			"DATASET-DESCRIPTION": "Tanım"
+			"TITLE": "Description Template Name",
+			"DESCRIPTION": "Tanım"
 		},
 		"STEPS": {
 			"GENERAL-INFO": {
 				"TITLE": "General Info",
-				"DATASET-TEMPLATE-NAME": "Description template name",
-				"DATASET-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
-				"DATASET-TEMPLATE-DESCRIPTION": "Description",
-				"DATASET-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Description is about, it's scope and objectives.",
+				"DESCRIPTION-TEMPLATE-NAME": "Description template name",
+				"DESCRIPTION-TEMPLATE-NAME-HINT": "A title that determines the Description template.",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION": "Description",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Description is about, it's scope and objectives.",
 				"DESCRIPTION-TEMPLATE-TYPE": "Description template type",
 				"DESCRIPTION-TEMPLATE-SELECT-TYPE": "Select a type",
-				"DATASET-TEMPLATE-LANGUAGE-HINT": "",
-				"DATASET-TEMPLATE-TYPE-HINT": "",
-				"DATASET-TEMPLATE-LANGUAGE": "Description template language",
-				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
-				"DATASET-TEMPLATE-USERS": "Editors",
-				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
-				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
+				"DESCRIPTION-TEMPLATE-LANGUAGE-HINT": "",
+				"DESCRIPTION-TEMPLATE-TYPE-HINT": "",
+				"DESCRIPTION-TEMPLATE-LANGUAGE": "Description template language",
+				"DESCRIPTION-TEMPLATE-SELECT-LANGUAGE": "Select a language",
+				"DESCRIPTION-TEMPLATE-USERS": "Editors",
+				"DESCRIPTION-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DESCRIPTION-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DESCRIPTION-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DESCRIPTION-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
+				"DESCRIPTION-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
 				"TEMPLATE-OUTLINE": "Template outline",
@@ -477,7 +477,7 @@
 						"DESCRIPTION": "Tanım"
 					}
 				},
-				"COMPOSITE-FIELD": {
+				"FIELD-SET": {
 					"FIELDS": {
 						"DESCRIPTION": "Tanım",
 						"EXTENDED-DESCRIPTION": "Genişletilmiş Açıklama",
@@ -530,10 +530,11 @@
 						"FIELD-AUTOCOMPLETE-AUTH-TYPE": "Authentication Type",
 						"FIELD-MULTIPLE-AUTOCOMPLETE": "Çoklu Otomatik Tamamlama",
 						"FIELD-MULTIPLE-WORDLIST": "Çoklu Seçim",
-						"FIELD-EXTERNAL-DATASETS-TITLE": "External Datasets Data",
-						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Input placeholder Text",
+						"FIELD-EXTERNAL-DESCRIPTIONS-TITLE": "External Datasets Data",
+						"FIELD-EXTERNAL-DESCRIPTIONS-PLACEHOLDER": "Input placeholder Text",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type"
+						"EXTERNAL-DATASET-TYPE-NAME": "Type",
+						"INTERNAL-ENTITIES": "{{ APP_NAME_CAPS }} Entities"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "At least one source must be provided.",
@@ -822,7 +823,7 @@
 	"DESCRIPTION-LISTING": {
 		"TEXT-INFO": "Veri setleri, veri seti açıklamalarının içeriğini belirleyen önceden tanımlanmış şablonları takiben belgelenir. {{ APP_NAME }}'ta bir VYP, belgelediği veri setleri kadar veri seti açıklaması içerebilir. Gözat ",
 		"TEXT-INFO-REST": " {{ APP_NAME }} VYP'lerde açıklanan veri setlerine gözat",
-		"LINK-PUBLIC-DATASETS": "Açık Erişimli Veri Seti Tanımları",
+		"LINK-PUBLIC-DESCRIPTIONS": "Açık Erişimli Veri Seti Tanımları",
 		"TEXT-INFO-PAR": "Yeni veri setleri her zaman mevcut VYP'lere eklenebilir ve birden fazla şablonla tanımlanabilir. Ayrıca, veri setleri açıklamaları, hem kopyalanabilir ve diğer VYP'lerde yeniden kullanılabilir hem de mevcut VYP'yi bütün olarak olumsuz etkilemeden silinebilir.",
 		"TEXT-INFO-QUESTION": "New descriptions can be added to existing DMPs at any time and be described with more than one template. ",
 		"GET-IDEA": " Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.",
@@ -1789,7 +1790,7 @@
 		"DMP-VISIBILITY": {
 			"PUBLIC": "Yayınlandı"
 		},
-		"DATASET-PROFILE-FIELD-VALIDATION-TYPE": {
+		"DESCRIPTION-TEMPLATE-FIELD-VALIDATION-TYPE": {
 			"NONE": "Hiç",
 			"REQUIRED": "Gerekli"
 		},
@@ -1798,7 +1799,7 @@
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
 			"INTERNAL-DMP-ENTITIES-DMPS": "Internal Plans",
-			"INTERNAL-DMP-ENTITIES-DATASETS": "Internal Descriptions",
+			"INTERNAL-DMP-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
 			"TEXT-AREA": "Text Area",
@@ -1814,17 +1815,17 @@
 			"OWNER": "Owner",
 			"MEMBER": "Member"
 		},
-		"DATASET-PROFILE-UPLOAD-TYPE": {
+		"DESCRIPTION-TEMPLATE-UPLOAD-TYPE": {
 			"DOWNLOAD": "Download file"
 		},
-		"DATASET-PROFILE-COMBO-BOX-TYPE": {
+		"DESCRIPTION-TEMPLATE-COMBO-BOX-TYPE": {
 			"EXTERNAL-SOURCE-HINT": "Dış kaynak(lar) tarafından sağlanan değerlerin listesi",
 			"ACTIONS": {
 				"YES": "Evet",
 				"NO": "Hayır"
 			}
 		},
-		"DATASET-PROFILE-VALIDATOR": {
+		"DESCRIPTION-TEMPLATE-VALIDATOR": {
 			"ACTION": "Doğrula",
 			"REPOSITORIES-PLACEHOLDER": "Depolar"
 		},
@@ -2037,7 +2038,7 @@
 		"PERSONAL-USAGE": "Kişisel Kullanım",
 		"PUBLIC-USAGE": "Genel Kullanım",
 		"DESCRIPTIONS": "Descriptions",
-		"DATASET-DESCRIPTIONS-DASHBOARD-TEXT": "Veri Setleri",
+		"DESCRIPTIONS-DASHBOARD-TEXT": "Veri Setleri",
 		"PUBLIC-DMPS": "Herkese açık VYP'ler",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Bağlantılı Kurumlar",
@@ -2061,7 +2062,7 @@
 			"GOT-IT": "Got it!",
 			"LEAVE-TOUR": "Leave Tour"
 		},
-		"ADD-NEW-DATASET": {
+		"ADD-NEW-DESCRIPTION": {
 			"OPTIONS-NOT-ENOUGH": "Are those options not enough?",
 			"START-NEW-DMP": "Start new DMP",
 			"OPTIONS": {