diff --git a/projects/eav-ui/src/app/app-administration/models/web-api-details.ts b/projects/eav-ui/src/app/app-administration/models/web-api-details.ts
index eb3c281df..a72db3ba2 100644
--- a/projects/eav-ui/src/app/app-administration/models/web-api-details.ts
+++ b/projects/eav-ui/src/app/app-administration/models/web-api-details.ts
@@ -1,35 +1,34 @@
-
 export interface WebApiControllerDetails {
-  Controller: string;
-  Path: string;
-  IgnoreSecurity: boolean;
-  AllowAnonymous: boolean;
-  RequireVerificationToken: boolean;
-  ValidateAntiForgeryToken: boolean;
-  AutoValidateAntiforgeryToken: boolean;
-  IgnoreAntiforgeryToken: boolean;
-  View: boolean;
-  Edit: boolean;
-  Admin: boolean;
-  SuperUser: boolean;
-  RequireContext: boolean;
+  controller: string;
+  path: string;
+  ignoreSecurity: boolean;
+  allowAnonymous: boolean;
+  requireVerificationToken: boolean;
+  validateAntiForgeryToken: boolean;
+  autoValidateAntiforgeryToken: boolean;
+  ignoreAntiforgeryToken: boolean;
+  view: boolean;
+  edit: boolean;
+  admin: boolean;
+  superUser: boolean;
+  requireContext: boolean;
 }
 
 export interface WebApiControllerEndpoint {
-  Name: string;
-  EndpointPath: string;
-  Returns: string;
-  Verbs: string;
-  Parameters?: WebApiControllerParameter[];
-  Security?: WebApiSecurity;
-  IgnoreSecurity: boolean;
-  AllowAnonymous: boolean;
-  RequireVerificationToken: boolean;
-  View: boolean;
-  Edit: boolean;
-  Admin: boolean;
-  SuperUser: boolean;
-  RequireContext: boolean;
+  name: string;
+  endpointPath: string;
+  returns: string;
+  verbs: string;
+  parameters?: WebApiControllerParameter[];
+  security?: WebApiSecurity;
+  ignoreSecurity: boolean;
+  allowAnonymous: boolean;
+  requireVerificationToken: boolean;
+  view: boolean;
+  edit: boolean;
+  admin: boolean;
+  superUser: boolean;
+  requireContext: boolean;
 }
 
 export interface WebApiControllerParameter {
diff --git a/projects/eav-ui/src/app/app-administration/services/dialog-config-global.service.ts b/projects/eav-ui/src/app/app-administration/services/dialog-config-global.service.ts
index df34c08fe..1adb8cc04 100644
--- a/projects/eav-ui/src/app/app-administration/services/dialog-config-global.service.ts
+++ b/projects/eav-ui/src/app/app-administration/services/dialog-config-global.service.ts
@@ -39,7 +39,7 @@ export class DialogConfigGlobalService extends HttpServiceBase {
       params: { appId: appId ?? this.appId },
     }).pipe(
       map(dlgSettings => {
-        dlgSettings.Context.Language.List = dlgSettings.Context.Language.List.filter(language => language.IsEnabled);
+        dlgSettings.Context.Language.List = dlgSettings.Context.Language.List.filter(language => language.isEnabled);
         return dlgSettings;
       }),
       tap(dlgSettings => {
diff --git a/projects/eav-ui/src/app/app-administration/sub-dialogs/language-permissions/language-permissions.ts b/projects/eav-ui/src/app/app-administration/sub-dialogs/language-permissions/language-permissions.ts
index 2baf9949d..c0f681040 100644
--- a/projects/eav-ui/src/app/app-administration/sub-dialogs/language-permissions/language-permissions.ts
+++ b/projects/eav-ui/src/app/app-administration/sub-dialogs/language-permissions/language-permissions.ts
@@ -54,7 +54,7 @@ export class LanguagePermissionsComponent implements OnInit {
   }
 
   openPermissions(language: SiteLanguagePermissions): void {
-    this.#dialogRouting.navRelative([GoToPermissions.getUrlLanguage(language.NameId)]);
+    this.#dialogRouting.navRelative([GoToPermissions.getUrlLanguage(language.nameId)]);
   }
 
 
@@ -68,7 +68,7 @@ export class LanguagePermissionsComponent implements OnInit {
           filter: 'agTextColumnFilter',
           cellRendererParams: (() => {
             const params: IdFieldParams<SiteLanguagePermissions> = {
-              tooltipGetter: (language) => `ID: ${language.Code}`,
+              tooltipGetter: (language) => `ID: ${language.code}`,
             };
             return params;
           })(),
@@ -77,7 +77,7 @@ export class LanguagePermissionsComponent implements OnInit {
           ...ColumnDefinitions.TextWide,
           field: 'Name',
           sort: 'asc',
-          valueGetter: (p: { data: SiteLanguagePermissions }) => p.data.Culture,
+          valueGetter: (p: { data: SiteLanguagePermissions }) => p.data.culture,
         },
         {
           ...ColumnDefinitions.ActionsPinnedRight1,
@@ -93,5 +93,3 @@ export class LanguagePermissionsComponent implements OnInit {
     return gridOptions;
   }
 }
-
-
diff --git a/projects/eav-ui/src/app/app-administration/sub-dialogs/language-permissions/languages-permissions-actions/languages-permissions-actions.ts b/projects/eav-ui/src/app/app-administration/sub-dialogs/language-permissions/languages-permissions-actions/languages-permissions-actions.ts
index 524ae444c..07457ebc4 100644
--- a/projects/eav-ui/src/app/app-administration/sub-dialogs/language-permissions/languages-permissions-actions/languages-permissions-actions.ts
+++ b/projects/eav-ui/src/app/app-administration/sub-dialogs/language-permissions/languages-permissions-actions/languages-permissions-actions.ts
@@ -20,5 +20,5 @@ import { LanguagesPermissionsActionsParams } from './languages-permissions-actio
 export class LanguagesPermissionsActionsComponent
   extends AgGridActionsBaseComponent<SiteLanguagePermissions, 'openPermissions', LanguagesPermissionsActionsParams> {
 
-  get permissionCount() { return this.data?.Permissions?.Count; }
-}
\ No newline at end of file
+  get permissionCount() { return this.data?.permissions?.Count; }
+}
diff --git a/projects/eav-ui/src/app/apps-management/models/site-language.model.ts b/projects/eav-ui/src/app/apps-management/models/site-language.model.ts
index 135fd9125..504c5922c 100644
--- a/projects/eav-ui/src/app/apps-management/models/site-language.model.ts
+++ b/projects/eav-ui/src/app/apps-management/models/site-language.model.ts
@@ -1,11 +1,11 @@
 export interface SiteLanguage {
-  Code: string;
-  Culture: string;
-  IsEnabled: boolean;
-  NameId: string;
+  code: string;
+  culture: string;
+  isEnabled: boolean;
+  nameId: string;
 }
 
 export interface SiteLanguagePermissions extends SiteLanguage {
-  IsAllowed: boolean;
-  Permissions: { Count: number; };
+  isAllowed: boolean;
+  permissions: { Count: number; };
 }
diff --git a/projects/eav-ui/src/app/apps-management/models/system-info.model.ts b/projects/eav-ui/src/app/apps-management/models/system-info.model.ts
index a2e79eefb..42a70a65d 100644
--- a/projects/eav-ui/src/app/apps-management/models/system-info.model.ts
+++ b/projects/eav-ui/src/app/apps-management/models/system-info.model.ts
@@ -19,8 +19,8 @@ export interface LicenseInfo {
 }
 
 export interface WarningsCount {
-  WarningsObsolete: number;
-  WarningsOther: number;
+  warningsObsolete: number;
+  warningsOther: number;
 }
 
 export interface SiteStats {
diff --git a/projects/eav-ui/src/app/apps-management/site-languages/site-languages.ts b/projects/eav-ui/src/app/apps-management/site-languages/site-languages.ts
index 42a81033d..13d996aca 100644
--- a/projects/eav-ui/src/app/apps-management/site-languages/site-languages.ts
+++ b/projects/eav-ui/src/app/apps-management/site-languages/site-languages.ts
@@ -35,7 +35,7 @@ export class SiteLanguagesComponent {
   async #toggleLanguage(language: SiteLanguage, enable: boolean) {
     try {
       // Wait for the API call to complete and get the status code
-      const status = await this.#zoneSvc.toggleLanguage(language.Code, enable);
+      const status = await this.#zoneSvc.toggleLanguage(language.code, enable);
       if (status >= 200 && status < 300) {
         this.#refreshLanguagesSig.set(this.#refreshLanguagesSig() + 1);
       }
@@ -54,7 +54,7 @@ export class SiteLanguagesComponent {
           filter: 'agTextColumnFilter',
           cellRendererParams: (() => {
             const params: IdFieldParams<SiteLanguage> = {
-              tooltipGetter: (language: SiteLanguage) => `ID: ${language.Code}`,
+              tooltipGetter: (language: SiteLanguage) => `ID: ${language.code}`,
             };
             return params;
           })(),
@@ -66,7 +66,7 @@ export class SiteLanguagesComponent {
           sort: 'asc',
           onCellClicked: (params) => {
             const language: SiteLanguage = params.data;
-            this.#toggleLanguage(language, !language.IsEnabled);
+            this.#toggleLanguage(language, !language.isEnabled);
           },
         },
         {
@@ -76,7 +76,7 @@ export class SiteLanguagesComponent {
           cellClass: 'no-padding no-outline'.split(' '),
           sortable: true,
           filter: BooleanFilterComponent,
-          valueGetter: (p: { data: SiteLanguage }) => p.data.IsEnabled,
+          valueGetter: (p: { data: SiteLanguage }) => p.data.isEnabled,
           cellRenderer: SiteLanguagesStatusComponent,
           cellRendererParams: (() => {
             const params: SiteLanguagesStatusParams = {
diff --git a/projects/eav-ui/src/app/apps-management/system-info/system-info.ts b/projects/eav-ui/src/app/apps-management/system-info/system-info.ts
index 72b0effb8..41e47ce07 100644
--- a/projects/eav-ui/src/app/apps-management/system-info/system-info.ts
+++ b/projects/eav-ui/src/app/apps-management/system-info/system-info.ts
@@ -117,7 +117,7 @@ export class SystemInfoComponent implements OnInit {
     if (systemInfoSetValue == null || languagesValue == null) return;
 
     const allLanguages = languagesValue.length;
-    const activeLanguages = languagesValue.filter(l => l.IsEnabled).length;
+    const activeLanguages = languagesValue.filter(l => l.isEnabled).length;
 
     const info: InfoTemplate[] = [
       { label: 'Zone', value: systemInfoSetValue.Site.ZoneId.toString() },
@@ -148,7 +148,7 @@ export class SystemInfoComponent implements OnInit {
   warningIcon = computed(() => {
     const systemInfoSetValue = this.#systemInfoSet();
     if (systemInfoSetValue == null) return undefined;
-    if (systemInfoSetValue.Messages.WarningsObsolete || systemInfoSetValue.Messages.WarningsOther) {
+    if (systemInfoSetValue.Messages.warningsObsolete || systemInfoSetValue.Messages.warningsOther) {
       return 'warning';
     }
     return 'check';
@@ -161,8 +161,8 @@ export class SystemInfoComponent implements OnInit {
     const info: InfoTemplate[] = [
       {
         label: 'Warnings Obsolete',
-        value: systemInfoSetValue.Messages.WarningsObsolete.toString(),
-        link: !systemInfoSetValue.Messages.WarningsObsolete
+        value: systemInfoSetValue.Messages.warningsObsolete.toString(),
+        link: !systemInfoSetValue.Messages.warningsObsolete
           ? undefined
           : {
             url: window.$2sxc.http.apiUrl('sys/insights/logs?key=warnings-obsolete'),
@@ -172,8 +172,8 @@ export class SystemInfoComponent implements OnInit {
       },
       {
         label: 'Warnings Other',
-        value: systemInfoSetValue.Messages.WarningsOther.toString(),
-        link: !systemInfoSetValue.Messages.WarningsOther
+        value: systemInfoSetValue.Messages.warningsOther.toString(),
+        link: !systemInfoSetValue.Messages.warningsOther
           ? undefined
           : {
             url: window.$2sxc.http.apiUrl('sys/insights/logs'),
diff --git a/projects/eav-ui/src/app/code-editor/services/source.service.ts b/projects/eav-ui/src/app/code-editor/services/source.service.ts
index 51ae79e0b..3c036c0a9 100644
--- a/projects/eav-ui/src/app/code-editor/services/source.service.ts
+++ b/projects/eav-ui/src/app/code-editor/services/source.service.ts
@@ -21,10 +21,10 @@ const dataSourceAppWebApiControllerDetails = 'System.AppWebApiControllerDetails'
 const dataSourceAppWebApiControllerEndpoints = 'System.AppWebApiControllerEndpoints';
 
 interface AppWebApiControllerRow {
-  Path: string;
-  EndpointPath: string;
-  Edition: string;
-  Shared: boolean;
+  path: string;
+  endpointPath: string;
+  edition: string;
+  shared: boolean;
 }
 
 type WebApiControllerDetailsResponse = { Default?: WebApiControllerDetailsRaw[] };
@@ -98,7 +98,7 @@ export class SourceService extends HttpServiceBase {
 
   // TODO: @2dg, ask 2dm 
   // getSig(viewKey: string, global: boolean, urlItems: ViewOrFileIdentifier[], initial: undefined): Signal<SourceView> {
-  //   // Signal für die SourceView erstellen
+  //   // Signal für die SourceView erstellen
   //   const temp = this.getSignal<SourceView>(appFilesAsset, {
   //     params: {
   //       appId: this.appId,
@@ -187,19 +187,19 @@ export class SourceService extends HttpServiceBase {
 
   #mapWebApiRows(rows: AppWebApiControllerRow[]): WebApi[] {
     return rows.map(row => {
-      const splitIndex = row.Path.lastIndexOf('/');
-      const fileExtIndex = row.Path.lastIndexOf('.');
-      const folder = row.Path.substring(0, splitIndex);
-      const name = row.Path.substring(splitIndex + 1, fileExtIndex);
+      const splitIndex = row.path.lastIndexOf('/');
+      const fileExtIndex = row.path.lastIndexOf('.');
+      const folder = row.path.substring(0, splitIndex);
+      const name = row.path.substring(splitIndex + 1, fileExtIndex);
 
       return {
-        path: row.Path,
+        path: row.path,
         folder,
         name,
-        isShared: row.Shared,
-        endpointPath: row.EndpointPath,
+        isShared: row.shared,
+        endpointPath: row.endpointPath,
         isCompiled: false,
-        edition: row.Edition,
+        edition: row.edition,
       };
     });
   }
@@ -210,7 +210,7 @@ export class SourceService extends HttpServiceBase {
       source: dataSourceAppWebApiControllerDetails,
       params: {
         AppId: this.appId,
-        Path: path,
+        path,
       },
       streams: 'Default',
       noCamel: true,
@@ -232,7 +232,7 @@ export class SourceService extends HttpServiceBase {
       source: dataSourceAppWebApiControllerEndpoints,
       params: {
         AppId: this.appId,
-        Path: path,
+        path,
       },
       streams: 'Default',
       noCamel: true,
@@ -270,19 +270,19 @@ export class SourceService extends HttpServiceBase {
     } = details;
 
     return {
-      Controller: controller,
-      Path: path,
-      IgnoreSecurity: ignoreSecurity,
-      AllowAnonymous: allowAnonymous,
-      RequireVerificationToken: requireVerificationToken,
-      ValidateAntiForgeryToken: validateAntiForgeryToken,
-      AutoValidateAntiforgeryToken: autoValidateAntiforgeryToken,
-      IgnoreAntiforgeryToken: ignoreAntiforgeryToken,
-      View: view,
-      Edit: edit,
-      Admin: admin,
-      SuperUser: superUser,
-      RequireContext: requireContext,
+      controller,
+      path,
+      ignoreSecurity,
+      allowAnonymous,
+      requireVerificationToken,
+      validateAntiForgeryToken,
+      autoValidateAntiforgeryToken,
+      ignoreAntiforgeryToken,
+      view,
+      edit,
+      admin,
+      superUser,
+      requireContext,
     };
   }
 
@@ -305,20 +305,20 @@ export class SourceService extends HttpServiceBase {
     } = endpoint;
 
     return {
-      Name: name,
-      EndpointPath: endpointPath,
-      Returns: returns,
-      Verbs: verbs,
-      Parameters: parameters,
-      Security: security,
-      IgnoreSecurity: ignoreSecurity,
-      AllowAnonymous: allowAnonymous,
-      RequireVerificationToken: requireVerificationToken,
-      View: view,
-      Edit: edit,
-      Admin: admin,
-      SuperUser: superUser,
-      RequireContext: requireContext,
+      name,
+      endpointPath,
+      returns,
+      verbs,
+      parameters,
+      security,
+      ignoreSecurity,
+      allowAnonymous,
+      requireVerificationToken,
+      view,
+      edit,
+      admin,
+      superUser,
+      requireContext,
     };
   }
 
diff --git a/projects/eav-ui/src/app/content-export/content-export.html b/projects/eav-ui/src/app/content-export/content-export.html
index 914d0b822..5501871e0 100644
--- a/projects/eav-ui/src/app/content-export/content-export.html
+++ b/projects/eav-ui/src/app/content-export/content-export.html
@@ -18,7 +18,7 @@
               <mat-select [(ngModel)]="formValues.language" name="Language">
                 <mat-option value="">All</mat-option>
                 @for (lang of languages; track lang) {
-                  <mat-option [value]="lang.NameId">{{ lang.NameId }}</mat-option>
+                  <mat-option [value]="lang.nameId">{{ lang.nameId }}</mat-option>
                 }
               </mat-select>
             </mat-form-field>
diff --git a/projects/eav-ui/src/app/dev-rest/api/action-params/action-params.html b/projects/eav-ui/src/app/dev-rest/api/action-params/action-params.html
index 9700ef1bd..780c41d65 100644
--- a/projects/eav-ui/src/app/dev-rest/api/action-params/action-params.html
+++ b/projects/eav-ui/src/app/dev-rest/api/action-params/action-params.html
@@ -1,14 +1,14 @@
-<h3><code>{{ data()?.Name }}</code> Parameters</h3>
+<h3><code>{{ data()?.name }}</code> Parameters</h3>
 
-@if (!(data()?.Parameters?.length ?? 0)) {
+@if (!(data()?.parameters?.length ?? 0)) {
   <p class="warning info-box">
     <mat-icon>info</mat-icon>
     This endpoint doesn't seem to use any parameters.
   </p>
 }
 
-@if (data()?.Parameters?.length) {
-  <ag-grid-angular class="ag-theme-material" [rowData]="data()?.Parameters ?? []"
-    [gridOptions]="gridOptions" [style.height]="(33 + (data()?.Parameters?.length ?? 0) * 48) + 'px'">
+@if (data()?.parameters?.length) {
+  <ag-grid-angular class="ag-theme-material" [rowData]="data()?.parameters ?? []"
+    [gridOptions]="gridOptions" [style.height]="(33 + (data()?.parameters?.length ?? 0) * 48) + 'px'">
   </ag-grid-angular>
-}
\ No newline at end of file
+}
diff --git a/projects/eav-ui/src/app/dev-rest/api/api.html b/projects/eav-ui/src/app/dev-rest/api/api.html
index 4795a0500..eeb3a6683 100644
--- a/projects/eav-ui/src/app/dev-rest/api/api.html
+++ b/projects/eav-ui/src/app/dev-rest/api/api.html
@@ -17,10 +17,10 @@
         </app-selector-with-help>
         <mat-form-field color="accent" class="eav-mat-form-field" style="width: 360px; max-width: calc(100% - 40px);">
           <mat-label>Select an Action on the Controller</mat-label>
-          <mat-select [value]="vm.selected?.Name" (selectionChange)="updateAction($event.value)">
+          <mat-select [value]="vm.selected?.name" (selectionChange)="updateAction($event.value)">
             @for (endpoint of vm.endpoints; track endpoint) {
-              <mat-option [value]="endpoint.Name">
-                {{ endpoint.Name }} ({{ endpoint.Verbs }})
+              <mat-option [value]="endpoint.name">
+                {{ endpoint.name }} ({{ endpoint.verbs }})
               </mat-option>
             }
           </mat-select>
@@ -96,4 +96,4 @@
 }
 @else {
   <mat-spinner></mat-spinner>
-}
\ No newline at end of file
+}
diff --git a/projects/eav-ui/src/app/dev-rest/api/api.ts b/projects/eav-ui/src/app/dev-rest/api/api.ts
index 022d47bcf..8fa677e8b 100644
--- a/projects/eav-ui/src/app/dev-rest/api/api.ts
+++ b/projects/eav-ui/src/app/dev-rest/api/api.ts
@@ -115,8 +115,8 @@ export class DevRestApiComponent extends DevRestBase<DevRestApiModel> implements
       filter(endpoints => !!endpoints.length),
       logToSelectedAction.filter(),
     ).subscribe(endpoints => {
-      this.log.a(`first action '${endpoints[0]?.Name}'`);
-      return this.selectedActionName$.next(endpoints[0]?.Name);
+      this.log.a(`first action '${endpoints[0]?.name}'`);
+      return this.selectedActionName$.next(endpoints[0]?.name);
     });
 
     const logSelectedActions = new RxTapDebug(this.log, 'selectedAction$', true);
@@ -125,7 +125,7 @@ export class DevRestApiComponent extends DevRestBase<DevRestApiModel> implements
         logSelectedActions.pipe(),
         // add debounce because of diamond problem with apiDetails$ and selectedAction$
         // debounceTime(10),
-        map(([endpoints, name]) => endpoints?.find(a => a.Name === name) ?? endpoints?.[0] ?? null),
+        map(([endpoints, name]) => endpoints?.find(a => a.name === name) ?? endpoints?.[0] ?? null),
         logSelectedActions.map(),
       );
 
@@ -135,7 +135,7 @@ export class DevRestApiComponent extends DevRestBase<DevRestApiModel> implements
         const resolved = pathToApi
           .replace('{appname}', scenario.inSameContext ? 'auto' : encodeURI(dialogSettings.Context.App.Folder))
           .replace('{endpointPath}', webApi.endpointPath)
-          .replace('{action}', action?.Name ?? '');
+          .replace('{action}', action?.name ?? '');
         return this.rootBasedOnScenario(resolved, scenario);
       }),
     );
@@ -153,7 +153,7 @@ export class DevRestApiComponent extends DevRestBase<DevRestApiModel> implements
           endpoints,
           selected: selActions,
           permissionsHasAnonymous: true, // dummy value to prevent error being shown
-          apiCalls: generateWebApiCalls(dnnContext.$2sxc, scenario, context, root, urlParams, selActions?.Verbs ?? ''),
+          apiCalls: generateWebApiCalls(dnnContext.$2sxc, scenario, context, root, urlParams, selActions?.verbs ?? ''),
         })),
       );
   }
diff --git a/projects/eav-ui/src/app/dev-rest/api/permissions/permissions.ts b/projects/eav-ui/src/app/dev-rest/api/permissions/permissions.ts
index 162b00072..b5cf32d92 100644
--- a/projects/eav-ui/src/app/dev-rest/api/permissions/permissions.ts
+++ b/projects/eav-ui/src/app/dev-rest/api/permissions/permissions.ts
@@ -33,58 +33,58 @@ export class DevRestApiPermissionsComponent implements OnInit, OnChanges {
     this.gridItems = [
       {
         requirement: 'Ignore All Security Checks <code>[AllowAnonymous]</code>',
-        class: this.data().details?.IgnoreSecurity ?? false,
-        method: this.data().selected?.Security?.ignoreSecurity ?? false,
-        effective: this.data().selected?.IgnoreSecurity ?? false,
+        class: this.data().details?.ignoreSecurity ?? false,
+        method: this.data().selected?.security?.ignoreSecurity ?? false,
+        effective: this.data().selected?.ignoreSecurity ?? false,
         comments: 'If this is set all other security checks are skipped',
       },
       {
         requirement: 'Allow Anonymous Use',
-        class: this.data().details?.AllowAnonymous ?? false,
-        method: this.data().selected?.Security?.allowAnonymous ?? false,
-        effective: this.data().selected?.AllowAnonymous ?? false,
+        class: this.data().details?.allowAnonymous ?? false,
+        method: this.data().selected?.security?.allowAnonymous ?? false,
+        effective: this.data().selected?.allowAnonymous ?? false,
         comments: '',
       },
       {
         requirement: 'Require Verification Token',
-        class: this.data().details?.RequireVerificationToken ?? false,
-        method: this.data().selected?.Security?.requireVerificationToken ?? false,
-        effective: this.data().selected?.RequireVerificationToken ?? false,
+        class: this.data().details?.requireVerificationToken ?? false,
+        method: this.data().selected?.security?.requireVerificationToken ?? false,
+        effective: this.data().selected?.requireVerificationToken ?? false,
         comments: '',
       },
       {
         requirement: 'Allow users with <strong>view</strong> permissions',
-        class: this.data().details?.View ?? false,
-        method: this.data().selected?.Security?.view ?? false,
-        effective: this.data().selected?.View ?? false,
+        class: this.data().details?.view ?? false,
+        method: this.data().selected?.security?.view ?? false,
+        effective: this.data().selected?.view ?? false,
         comments: '',
       },
       {
         requirement: 'Allow users with <strong>edit</strong> permissions',
-        class: this.data().details?.Edit ?? false,
-        method: this.data().selected?.Security?.edit ?? false,
-        effective: this.data().selected?.Edit ?? false,
+        class: this.data().details?.edit ?? false,
+        method: this.data().selected?.security?.edit ?? false,
+        effective: this.data().selected?.edit ?? false,
         comments: '',
       },
       {
         requirement: 'Allow users with <strong>admin</strong> permissions',
-        class: this.data().details?.Admin ?? false,
-        method: this.data().selected?.Security?.admin ?? false,
-        effective: this.data().selected?.Admin ?? false,
+        class: this.data().details?.admin ?? false,
+        method: this.data().selected?.security?.admin ?? false,
+        effective: this.data().selected?.admin ?? false,
         comments: '',
       },
       {
         requirement: 'Allow users with <strong>super-user</strong> permissions',
-        class: this.data().details?.SuperUser ?? false,
-        method: this.data().selected?.Security?.superUser ?? false,
-        effective: this.data().selected?.SuperUser ?? false,
+        class: this.data().details?.superUser ?? false,
+        method: this.data().selected?.security?.superUser ?? false,
+        effective: this.data().selected?.superUser ?? false,
         comments: '',
       },
       {
         requirement: 'Require Context',
-        class: this.data().details?.RequireContext ?? false,
-        method: this.data().selected?.Security?.requireContext ?? false,
-        effective: this.data().selected?.RequireContext ?? false,
+        class: this.data().details?.requireContext ?? false,
+        method: this.data().selected?.security?.requireContext ?? false,
+        effective: this.data().selected?.requireContext ?? false,
         comments: 'If required, the context must be included - see also headers',
       },
     ];
diff --git a/projects/eav-ui/src/app/edit/dialog/header/language-settings-dialog/LanguageDropdown/language-dropdown.html b/projects/eav-ui/src/app/edit/dialog/header/language-settings-dialog/LanguageDropdown/language-dropdown.html
index be0198250..7c427df07 100644
--- a/projects/eav-ui/src/app/edit/dialog/header/language-settings-dialog/LanguageDropdown/language-dropdown.html
+++ b/projects/eav-ui/src/app/edit/dialog/header/language-settings-dialog/LanguageDropdown/language-dropdown.html
@@ -12,7 +12,7 @@
       {{'LanguageSettings.UseCurrentLanguage' | translate}}
     </mat-option>
     @for (option of options; track option) {
-      <mat-option [value]="option.Code.toLocaleLowerCase()">{{ option.label }}</mat-option>
+      <mat-option [value]="option.code.toLocaleLowerCase()">{{ option.label }}</mat-option>
     }
   </mat-select>
-</mat-form-field>
\ No newline at end of file
+</mat-form-field>
diff --git a/projects/eav-ui/src/app/edit/dialog/header/language-switcher/language-switcher.helpers.ts b/projects/eav-ui/src/app/edit/dialog/header/language-switcher/language-switcher.helpers.ts
index d1e0aedff..1a503730f 100644
--- a/projects/eav-ui/src/app/edit/dialog/header/language-switcher/language-switcher.helpers.ts
+++ b/projects/eav-ui/src/app/edit/dialog/header/language-switcher/language-switcher.helpers.ts
@@ -12,7 +12,7 @@ export function getLanguageOptions(languages: Language[]): LanguageOption[] {
   // count the number of repetitions of the same language without region key
   // e.g. English (United States) and English (Australia) are both English
   languages.forEach(language => {
-    const shortName = removeRegionName(language.Culture);
+    const shortName = removeRegionName(language.culture);
     if (shortCodesCount[shortName])
       shortCodesCount[shortName]++;
     else
@@ -21,11 +21,11 @@ export function getLanguageOptions(languages: Language[]): LanguageOption[] {
 
   // if language repeats, append language key to name which will be displayed
   languages.forEach(language => {
-    const shortCode = removeRegionName(language.Culture);
+    const shortCode = removeRegionName(language.culture);
 
     languageButtons.push({
       ...language,
-      label: (shortCodesCount[shortCode] > 1) ? `${shortCode} (${language.NameId})` : shortCode,
+      label: (shortCodesCount[shortCode] > 1) ? `${shortCode} (${language.nameId})` : shortCode,
     });
   });
 
diff --git a/projects/eav-ui/src/app/edit/dialog/header/language-switcher/language-switcher.html b/projects/eav-ui/src/app/edit/dialog/header/language-switcher/language-switcher.html
index 5d1eab276..aba862c53 100644
--- a/projects/eav-ui/src/app/edit/dialog/header/language-switcher/language-switcher.html
+++ b/projects/eav-ui/src/app/edit/dialog/header/language-switcher/language-switcher.html
@@ -8,11 +8,11 @@
   <div #scrollable class="scrollable lang-switch" tippyTranslate="Message.CantSwitchLanguage" [tippyDisabled]="!disabled()">
     @for (langButton of buttons; track langButton) {
       <!-- Current Button is a bit different, not clickable, but has language settings on hover -->
-      @if (current() === langButton.NameId) {
+      @if (current() === langButton.nameId) {
         <button mat-flat-button
           class="lang-switch__button hover-area"
           color="accent"
-          [tippy]="langButton.Culture"
+          [tippy]="langButton.culture"
           [tippyDisabled]="disabled()"
         >
           {{ langButton.label }}
@@ -28,7 +28,7 @@
           color="white"
           (mousedown)="lngButtonMouseDown($event)"
           (click)="lngButtonClick($event, langButton)"
-          [tippy]="langButton.Culture"
+          [tippy]="langButton.culture"
           [tippyDisabled]="disabled()"
         >
           {{ langButton.label }}
diff --git a/projects/eav-ui/src/app/edit/dialog/header/language-switcher/language-switcher.ts b/projects/eav-ui/src/app/edit/dialog/header/language-switcher/language-switcher.ts
index a0fa2d189..37b9d589e 100644
--- a/projects/eav-ui/src/app/edit/dialog/header/language-switcher/language-switcher.ts
+++ b/projects/eav-ui/src/app/edit/dialog/header/language-switcher/language-switcher.ts
@@ -90,10 +90,10 @@ export class LanguageSwitcherComponent implements AfterViewInit, OnDestroy {
     this.centerSelectedHelper.lngButtonClick(event);
 
     if (!this.centerSelectedHelper.stopClickIfMouseMoved()) {
-      this.languageInstanceService.setCurrent(this.formConfig.config.formId, language.NameId);
+      this.languageInstanceService.setCurrent(this.formConfig.config.formId, language.nameId);
 
       // Also set the UI language
-      const lngCode = this.userLanguageSvc.uiCode(language.NameId);
+      const lngCode = this.userLanguageSvc.uiCode(language.nameId);
       this.translate.use(lngCode);
     }
   }
diff --git a/projects/eav-ui/src/app/edit/dialog/main/edit-dialog-main.helpers.ts b/projects/eav-ui/src/app/edit/dialog/main/edit-dialog-main.helpers.ts
index fe5a53158..81c8e2fa7 100644
--- a/projects/eav-ui/src/app/edit/dialog/main/edit-dialog-main.helpers.ts
+++ b/projects/eav-ui/src/app/edit/dialog/main/edit-dialog-main.helpers.ts
@@ -20,16 +20,16 @@ export function sortLanguages(primaryLangKey: string, languages: Language[]) {
   const sameLangs: Language[] = [];
   const otherLangs: Language[] = [];
   for (const language of languages) {
-    if (language.NameId === primaryLangKey) {
+    if (language.nameId === primaryLangKey) {
       primaryLang = language;
-    } else if (language.NameId.startsWith(primaryLangKey.split('-')[0])) {
+    } else if (language.nameId.startsWith(primaryLangKey.split('-')[0])) {
       sameLangs.push(language);
     } else {
       otherLangs.push(language);
     }
   }
-  sameLangs.sort((a, b) => a.NameId.localeCompare(b.NameId));
-  otherLangs.sort((a, b) => a.NameId.localeCompare(b.NameId));
+  sameLangs.sort((a, b) => a.nameId.localeCompare(b.nameId));
+  otherLangs.sort((a, b) => a.nameId.localeCompare(b.nameId));
 
   const allLangsSorted: Language[] = !primaryLang ? [...sameLangs, ...otherLangs] : [primaryLang, ...sameLangs, ...otherLangs];
   return allLangsSorted;
diff --git a/projects/eav-ui/src/app/edit/dialog/main/form-slide.directive.ts b/projects/eav-ui/src/app/edit/dialog/main/form-slide.directive.ts
index d49ddb030..7443805ad 100644
--- a/projects/eav-ui/src/app/edit/dialog/main/form-slide.directive.ts
+++ b/projects/eav-ui/src/app/edit/dialog/main/form-slide.directive.ts
@@ -39,8 +39,8 @@ export class FormSlideDirective extends BaseDirective implements OnInit, OnDestr
           pairwise(),
           map(([previousLang, currentLang]) => {
             l.a('toggle', { previousLang, currentLang });
-            const prevIndex = languages.findIndex(lang => lang.NameId === previousLang);
-            const currentIndex = languages.findIndex(lang => lang.NameId === currentLang);
+            const prevIndex = languages.findIndex(lang => lang.nameId === previousLang);
+            const currentIndex = languages.findIndex(lang => lang.nameId === currentLang);
             const slide = (prevIndex > currentIndex) ? classPrevious : classNext;
             l.a('slide', { prevIndex, currentIndex, slide });
             return slide;
diff --git a/projects/eav-ui/src/app/edit/fields/basic/external-web-component/external-web-component.ts b/projects/eav-ui/src/app/edit/fields/basic/external-web-component/external-web-component.ts
index 237524575..f5eae9834 100644
--- a/projects/eav-ui/src/app/edit/fields/basic/external-web-component/external-web-component.ts
+++ b/projects/eav-ui/src/app/edit/fields/basic/external-web-component/external-web-component.ts
@@ -37,7 +37,7 @@ export class ExternalWebComponentComponent {
   }
 
   private loadAssets() {
-    const assets = this.config.inputTypeSpecs.metadata.UiAssets?.default?.split('\n') ?? [];
+    const assets = this.config.inputTypeSpecs.metadata.uiAssets?.default?.split('\n') ?? [];
     if (assets.length === 0)
       return;
     this.scriptsLoaderService.load(assets, this.assetsLoaded.bind(this));
diff --git a/projects/eav-ui/src/app/edit/fields/wrappers/localization/translate-menu-dialog/translate-menu-dialog.helpers.ts b/projects/eav-ui/src/app/edit/fields/wrappers/localization/translate-menu-dialog/translate-menu-dialog.helpers.ts
index 07fa5c976..84533c2f5 100644
--- a/projects/eav-ui/src/app/edit/fields/wrappers/localization/translate-menu-dialog/translate-menu-dialog.helpers.ts
+++ b/projects/eav-ui/src/app/edit/fields/wrappers/localization/translate-menu-dialog/translate-menu-dialog.helpers.ts
@@ -14,13 +14,13 @@ export function getTemplateLanguages(
   linkType: Of<typeof TranslationLinks>,
 ): TranslateMenuDialogTemplateLanguage[] {
   const templateLanguages = languages
-    .filter(lang => lang.NameId !== language.current)
+    .filter(lang => lang.nameId !== language.current)
     .map(lang => {
       const values = attributes[config.fieldName];
-      const disabled = (linkType === TranslationLinks.LinkReadWrite && !lang.IsAllowed)
-        || !new FieldReader(values, FormLanguage.diffCurrent(language, lang.NameId)).hasEditableValues;
+      const disabled = (linkType === TranslationLinks.LinkReadWrite && !lang.isAllowed)
+        || !new FieldReader(values, FormLanguage.diffCurrent(language, lang.nameId)).hasEditableValues;
       const templateLanguage: TranslateMenuDialogTemplateLanguage = {
-        key: lang.NameId,
+        key: lang.nameId,
         disabled,
       };
       return templateLanguage;
@@ -36,22 +36,22 @@ export function getTemplateLanguagesWithContent(
   translatableFields?: string[],
 ): TranslateMenuDialogTemplateLanguage[] {
   const templateLanguages = languages
-    .filter(lang => lang.NameId !== language.current)
+    .filter(lang => lang.nameId !== language.current)
     .map(lang => {
       let countTranslatableFields: number = 0;
       let countTranslatableFieldsWithContent: number = 0;
       let isDisabled: boolean = false;
-      const langDefToUse = FormLanguage.diffCurrent(language, lang.NameId);
+      const langDefToUse = FormLanguage.diffCurrent(language, lang.nameId);
       translatableFields.forEach(field => {
         const values = attributes[field];
         const fieldReader = new FieldReader(values, langDefToUse);
         countTranslatableFields += fieldReader.countEditable(); // LocalizationHelpers.countEditableValues(values, langDefToUse);
         countTranslatableFieldsWithContent += fieldReader.countEditableWithContents(); // LocalizationHelpers.countEditableValuesWithContent(values, langDefToUse);
-        isDisabled = (linkType === TranslationLinks.LinkReadWrite && !lang.IsAllowed)
+        isDisabled = (linkType === TranslationLinks.LinkReadWrite && !lang.isAllowed)
           || countTranslatableFields == 0;
       });
       const templateLanguage: TranslateMenuDialogTemplateLanguage = {
-        key: lang.NameId,
+        key: lang.nameId,
         disabled: isDisabled,
         noTranslatableFields: countTranslatableFields,
         noTranslatableFieldsThatHaveContent: countTranslatableFieldsWithContent,
diff --git a/projects/eav-ui/src/app/edit/form/form-data.service.ts b/projects/eav-ui/src/app/edit/form/form-data.service.ts
index 3f98c61bd..789be50bd 100644
--- a/projects/eav-ui/src/app/edit/form/form-data.service.ts
+++ b/projects/eav-ui/src/app/edit/form/form-data.service.ts
@@ -33,7 +33,7 @@ export class FormDataService extends HttpServiceBaseSignal {
       params: { appId: this.appId }
     }).pipe(
       map(formData => {
-        formData.Context.Language.List = formData.Context.Language.List.filter(language => language.IsEnabled);
+        formData.Context.Language.List = formData.Context.Language.List.filter(language => language.isEnabled);
         return formData;
       }),
       tap(formData => {
diff --git a/projects/eav-ui/src/app/edit/form/forms-state.service.ts b/projects/eav-ui/src/app/edit/form/forms-state.service.ts
index 73d847bdd..8f0f4f9c2 100644
--- a/projects/eav-ui/src/app/edit/form/forms-state.service.ts
+++ b/projects/eav-ui/src/app/edit/form/forms-state.service.ts
@@ -31,7 +31,7 @@ export class FormsStateService {
 
     const readOnly = computedObj('readOnly', () => {
       const itemsReadOnly = itemHeaders().some(itemHeader => itemHeader().EditInfo?.ReadOnly ?? false);
-      const languageAllowed = language().find(l => l.NameId === this.formConfig.language().current)?.IsAllowed ?? true;
+      const languageAllowed = language().find(l => l.nameId === this.formConfig.language().current)?.isAllowed ?? true;
       const isReadOnly = itemsReadOnly || !languageAllowed;
       const reason = itemsReadOnly ? 'Form' : !languageAllowed ? 'Language' : undefined;
 
diff --git a/projects/eav-ui/src/app/edit/form/initial-values-service.ts b/projects/eav-ui/src/app/edit/form/initial-values-service.ts
index be9237a4e..7a798a1eb 100644
--- a/projects/eav-ui/src/app/edit/form/initial-values-service.ts
+++ b/projects/eav-ui/src/app/edit/form/initial-values-service.ts
@@ -34,7 +34,7 @@ export class InitialValuesService {
     const l = this.log.fnIf('preserve');
     const items = this.itemService.getMany(this.formConfig.config.itemGuids);
 
-    const allLangs = this.languageService.getAll().map(language => language.NameId);
+    const allLangs = this.languageService.getAll().map(language => language.nameId);
     const language = this.formConfig.language();
     if (!allLangs.includes(language.current))
       allLangs.push(language.current);
@@ -60,4 +60,4 @@ export class InitialValuesService {
     return l.r(result);
   }
 
-}
\ No newline at end of file
+}
diff --git a/projects/eav-ui/src/app/edit/form/initialize-missing-values-services.ts b/projects/eav-ui/src/app/edit/form/initialize-missing-values-services.ts
index 9abf5fe29..7c9f64887 100644
--- a/projects/eav-ui/src/app/edit/form/initialize-missing-values-services.ts
+++ b/projects/eav-ui/src/app/edit/form/initialize-missing-values-services.ts
@@ -66,14 +66,14 @@ export class InitializeMissingValuesServices {
         const currentName = ctAttribute.Name;
         const l = this.log.fnIfInFields('initMissingValues', currentName);
 
-        const inputType = inputTypes.find(i => i.Type === ctAttribute.InputType);
-        const isEmptyType = InputTypeHelpers.isEmpty(inputType?.Type);
-        l.a(`Attribute: '${currentName}' InputType: '${inputType?.Type}' isEmptyType: '${isEmptyType}'`);
+        const inputType = inputTypes.find(i => i.type === ctAttribute.InputType);
+        const isEmptyType = InputTypeHelpers.isEmpty(inputType?.type);
+        l.a(`Attribute: '${currentName}' InputType: '${inputType?.type}' isEmptyType: '${isEmptyType}'`);
 
         if (isEmptyType)
           continue;
 
-        const logic = logicManager.get(inputType?.Type);
+        const logic = logicManager.get(inputType?.type);
 
         const attributeValues = item.Entity.Attributes[ctAttribute.Name];
         const fieldSettings = fss.getDefaultSettings(
@@ -95,7 +95,7 @@ export class InitializeMissingValuesServices {
           l.a(`${currentName} languages many, complex init`);
 
           // check if there is a value for the generic / all language
-          const disableI18n = inputType?.DisableI18n;
+          const disableI18n = inputType?.disableI18n;
           const noLanguageValue = new FieldReader(attributeValues, '*').currentOrDefault?.value;
           l.a(currentName, { disableI18n, noLanguageValue });
           if (!disableI18n && noLanguageValue !== undefined) {
@@ -148,4 +148,4 @@ export class InitializeMissingValuesServices {
     return lMain.r(switchToDefault);
   }
 
-}
\ No newline at end of file
+}
diff --git a/projects/eav-ui/src/app/edit/formulas/run/formula-run-context.ts b/projects/eav-ui/src/app/edit/formulas/run/formula-run-context.ts
index 857d04012..8d715162b 100644
--- a/projects/eav-ui/src/app/edit/formulas/run/formula-run-context.ts
+++ b/projects/eav-ui/src/app/edit/formulas/run/formula-run-context.ts
@@ -47,7 +47,7 @@ export class FormulaContextObject implements FormulaV1Context {
     const languages = specs.languages
     this.culture = {
       code: language.current,
-      name: languages.find(l => l.NameId === language.current)?.Culture,
+      name: languages.find(l => l.nameId === language.current)?.culture,
     };
 
     this.features = new FormulaContextFeatures(specs);
@@ -155,7 +155,7 @@ class FormulaContextApp implements FormulaV1CtxApp {
   getSetting(settingPath: string) {
     if (this.#propsData.runParameters.formula.version === FormulaVersions.V1) {
       console.warn('app.getSetting() is not available in v1 formulas, please use v2.');
-      return '⚠️ error - see console';
+      return '⚠️ error - see console';
     }
 
     const result = this.#propsData.formConfig.config.settings.Values[settingPath];
@@ -163,7 +163,7 @@ class FormulaContextApp implements FormulaV1CtxApp {
       return result;
     console.warn(`Error: Setting '${settingPath}' not found. Did you configure it in the ContentType to be included? ` +
       `See https://go.2sxc.org/formulas`);
-    return '⚠️ error - see console';
+    return '⚠️ error - see console';
   }
 }
 
@@ -196,4 +196,4 @@ class FormulaContextTarget implements FormulaV1CtxTarget {
       : def.target.substring(0, def.target.lastIndexOf('.'))
   }
 
-}
\ No newline at end of file
+}
diff --git a/projects/eav-ui/src/app/edit/localization/language.service.ts b/projects/eav-ui/src/app/edit/localization/language.service.ts
index 8d163e086..92b1d226f 100644
--- a/projects/eav-ui/src/app/edit/localization/language.service.ts
+++ b/projects/eav-ui/src/app/edit/localization/language.service.ts
@@ -10,5 +10,5 @@ export class LanguageService extends SignalStoreBase<string, Language> {
     super(classLog({LanguageService}));
   }
 
-  override getId = (item: Language) => item.NameId.toLocaleLowerCase();
+  override getId = (item: Language) => item.nameId.toLocaleLowerCase();
 }
diff --git a/projects/eav-ui/src/app/edit/shared/input-types/input-type.service.ts b/projects/eav-ui/src/app/edit/shared/input-types/input-type.service.ts
index d81bcac1e..566439a95 100644
--- a/projects/eav-ui/src/app/edit/shared/input-types/input-type.service.ts
+++ b/projects/eav-ui/src/app/edit/shared/input-types/input-type.service.ts
@@ -16,7 +16,7 @@ export class InputTypeService extends SignalStoreBase<string, InputTypeMetadata>
     super(classLog({InputTypeService}, null));
   }
 
-  override getId = (item: InputTypeMetadata) => item.Type;
+  override getId = (item: InputTypeMetadata) => item.type;
 
   /**
    * Get Name specs with a nice name and a longer name
@@ -38,11 +38,11 @@ export class InputTypeService extends SignalStoreBase<string, InputTypeMetadata>
   }
 
   #getSpecsInternal(inputType: Of<typeof InputTypeCatalog>, inputTypes: InputTypeMetadata[]): InputTypeSpecs {
-    const inputTypeMetadata = inputTypes.find(i => i.Type === inputType);
+    const inputTypeMetadata = inputTypes.find(i => i.type === inputType);
     const name = inputType.toString();
     const calculated: InputTypeSpecs = {
       inputType,
-      isExternal: !!inputTypeMetadata?.UiAssets?.default,
+      isExternal: !!inputTypeMetadata?.uiAssets?.default,
       mustUseGuid: !name.startsWith('string') && !name.startsWith('number'),
       componentTagName: `field-${inputType}`,
       componentTagDialogName: `field-${inputType}-dialog`,
diff --git a/projects/eav-ui/src/app/edit/state/fields-settings-update-helper.ts b/projects/eav-ui/src/app/edit/state/fields-settings-update-helper.ts
index 1ab173ea9..2ceb666dc 100644
--- a/projects/eav-ui/src/app/edit/state/fields-settings-update-helper.ts
+++ b/projects/eav-ui/src/app/edit/state/fields-settings-update-helper.ts
@@ -102,7 +102,7 @@ export class FieldSettingsUpdateHelper {
       return true;
 
     // Disable translation if the input type says it can't be translated (e.g. Entity).
-    if (inputType?.DisableI18n)
+    if (inputType?.disableI18n)
       return true;
 
     // TODO: CHECK if this should be here - it's repeated below
diff --git a/projects/eav-ui/src/app/edit/state/item-updater.helper.ts b/projects/eav-ui/src/app/edit/state/item-updater.helper.ts
index 37289d69c..2758c6f1a 100644
--- a/projects/eav-ui/src/app/edit/state/item-updater.helper.ts
+++ b/projects/eav-ui/src/app/edit/state/item-updater.helper.ts
@@ -135,7 +135,7 @@ export class ItemUpdateHelper {
     defaultLanguage: string,
   ): FieldValue {
     const l = this.log.fnIf('setDefaultValue', { item, ctAttribute, inputType, settings, languages, defaultLanguage }, `Name: ${ctAttribute.Name}`);
-    const defaultValue = new FieldDefaults(ctAttribute.Name, inputType?.Type, settings, item.Header).getDefaultOrPrefillValue();
+    const defaultValue = new FieldDefaults(ctAttribute.Name, inputType?.type, settings, item.Header).getDefaultOrPrefillValue();
 
     // const defaultLanguageValue = LocalizationHelpers.getBestValue(
     //   item.Entity.Attributes[ctAttribute.Name],
@@ -146,7 +146,7 @@ export class ItemUpdateHelper {
     const defaultLanguageValue = new FieldReader(item.Entity.Attributes[ctAttribute.Name], defaultLanguage).currentOrDefault?.value;
 
     // 2023-08-31 2dm simplified; leave comments in till EOY in case I broke something
-    const languageCode = (languages.length === 0 || inputType?.DisableI18n) ? '*' : defaultLanguage;
+    const languageCode = (languages.length === 0 || inputType?.disableI18n) ? '*' : defaultLanguage;
     if (defaultLanguageValue === undefined) {
       this.addItemAttributeValue(item.Entity.Guid, ctAttribute.Name, defaultValue, languageCode, false, ctAttribute.Type);
     } else {
@@ -265,4 +265,4 @@ export class ItemUpdateHelper {
 
   //#endregion
 
-}
\ No newline at end of file
+}
diff --git a/projects/eav-ui/src/app/shared/fields/input-type-metadata.model.ts b/projects/eav-ui/src/app/shared/fields/input-type-metadata.model.ts
index a6dee0da8..d44d0e547 100644
--- a/projects/eav-ui/src/app/shared/fields/input-type-metadata.model.ts
+++ b/projects/eav-ui/src/app/shared/fields/input-type-metadata.model.ts
@@ -2,14 +2,14 @@ import { Of } from '../../../../../core';
 import { InputTypeCatalog } from './input-type-catalog';
 
 export interface InputTypeMetadata {
-  UiAssets: Record<'default' | string, string>;
-  Description: string;
-  DisableI18n: boolean;
-  IsDefault?: boolean;
-  IsObsolete?: boolean;
-  IsRecommended?: boolean;
-  Label: string;
-  ObsoleteMessage?: string;
-  Type: Of<typeof InputTypeCatalog>;
-  UseAdam: boolean;
+  uiAssets: Record<'default' | string, string>;
+  description: string;
+  disableI18n: boolean;
+  isDefault?: boolean;
+  isObsolete?: boolean;
+  isRecommended?: boolean;
+  label: string;
+  obsoleteMessage?: string;
+  type: Of<typeof InputTypeCatalog>;
+  useAdam: boolean;
 }
diff --git a/projects/eav-ui/src/app/shared/models/language.model.ts b/projects/eav-ui/src/app/shared/models/language.model.ts
index 4e581f90d..d15d86058 100644
--- a/projects/eav-ui/src/app/shared/models/language.model.ts
+++ b/projects/eav-ui/src/app/shared/models/language.model.ts
@@ -1,9 +1,9 @@
 export interface Language {
-  readonly Code: string;
+  readonly code: string;
   /** Previously name */
-  readonly Culture: string;
-  readonly IsAllowed: boolean;
-  readonly IsEnabled: boolean;
+  readonly culture: string;
+  readonly isAllowed: boolean;
+  readonly isEnabled: boolean;
   /** Previously key */
-  readonly NameId: string;
+  readonly nameId: string;
 }