diff --git a/projects/flexmonster/angular/src/flexmonster.component.ts b/projects/flexmonster/angular/src/flexmonster.component.ts
index e77893a..e425bba 100644
--- a/projects/flexmonster/angular/src/flexmonster.component.ts
+++ b/projects/flexmonster/angular/src/flexmonster.component.ts
@@ -13,7 +13,7 @@ import {
   type IGridCellObject,
   type ReportInputParams,
   type ReportOutputParams,
-  FMCompositeViewType,
+  FMMultiTableViewType,
   SortInputParams,
   SortOutputParams,
   type FlatSortInputParams,
@@ -89,5 +89,5 @@ export class FMFlexmonster implements AfterViewInit, OnDestroy, IFMFlexmonster {
   openFieldList(): void { this._flexmonster.openFieldList(); }
   scrollToColumn(columnIndex: number): void { this._flexmonster.scrollToColumn(columnIndex); }
   scrollToRow(rowIndex: number): void { this._flexmonster.scrollToRow(rowIndex); }
-  setViewType(viewType: `${FMCompositeViewType}`): void { this._flexmonster.setViewType(viewType); }
+  setViewType(viewType: `${FMMultiTableViewType}`): void { this._flexmonster.setViewType(viewType); }
 }
diff --git a/projects/test-app/src/app/app.html b/projects/test-app/src/app/app.html
index e2f3249..b20f2a4 100644
--- a/projects/test-app/src/app/app.html
+++ b/projects/test-app/src/app/app.html
@@ -1,7 +1,7 @@
 <h1>Angular Flexmonster Showcase</h1>
 <h2 id="flexmonster">Flexmonster</h2>
 
-<fm-button size="sm" (click)="openFieldListComposite()">Open Field List</fm-button>
+<fm-button size="sm" (click)="openFieldListMultiTable()">Open Field List</fm-button>
 <fm-button size="sm" (click)="setViewType('flat')">Flat view</fm-button>
 <fm-button size="sm" (click)="setViewType('pivot')">Pivot view</fm-button>
 
diff --git a/projects/test-app/src/app/app.ts b/projects/test-app/src/app/app.ts
index 80602fb..2709405 100644
--- a/projects/test-app/src/app/app.ts
+++ b/projects/test-app/src/app/app.ts
@@ -13,8 +13,8 @@ import '@flexmonster/js/flexmonster.css'
 
 //Import Toolbar component
 import { ToolbarComponent } from './toolbar/toolbar.component';
-import { FMCompositeViewType, IFMFlexmonsterOptionsInputParams, StateInputParams } from '@flexmonster/js';
-// import { DataSourceType, F16CompositeViewType } from '@flexmonster/js';
+import { FMMultiTableViewType, IFMFlexmonsterOptionsInputParams, StateInputParams } from '@flexmonster/js';
+// import { DataSourceType, F16MultiTableViewType } from '@flexmonster/js';
 
 @Component({
 	selector: 'app-root',
@@ -45,7 +45,7 @@ export class App implements AfterViewInit {
 
 	// Method to open the field list - test API calls
 	// Example of using Flexmonster reference passed from the same component
-	public async openFieldListComposite() {
+	public async openFieldListMultiTable() {
 		await this.composite().flexmonster.openFieldList();
 	}
 
@@ -67,8 +67,8 @@ export class App implements AfterViewInit {
 		alert(`Value of the first cell: ${cell.value}`);
 	}
 
-	public setViewType(type: `${FMCompositeViewType}`) {
-		this.composite().flexmonster.setViewType(type as FMCompositeViewType);
+	public setViewType(type: `${FMMultiTableViewType}`) {
+		this.composite().flexmonster.setViewType(type as FMMultiTableViewType);
 	}
 
 	// Test property binding with our toolkit element