diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts
index 9ce02b89a247..be977eb272a1 100644
--- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts
+++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts
@@ -23,7 +23,7 @@ import inflector from '@ts/core/utils/m_inflector';
 import type { Column, ColumnsChanges, FilterField } from '@ts/grids/grid_core/columns_controller/types';
 import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller';
 import type { FocusController } from '@ts/grids/grid_core/focus/m_focus';
-import type { StateStoringController } from '@ts/grids/grid_core/state_storing/m_state_storing_controller';
+import type { StateStoringController } from '@ts/grids/grid_core/state_storing/state_storing_controller_core';
 
 import { AI_COLUMN_NAME } from '../ai_column/const';
 import modules from '../m_modules';
diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_types.ts b/packages/devextreme/js/__internal/grids/grid_core/m_types.ts
index ebcdb7eb8463..d493128c4f7d 100644
--- a/packages/devextreme/js/__internal/grids/grid_core/m_types.ts
+++ b/packages/devextreme/js/__internal/grids/grid_core/m_types.ts
@@ -208,7 +208,7 @@ export interface Controllers {
   selection: import('./selection/m_selection').SelectionController;
   validating: import('./validating/m_validating').ValidatingController;
   searchPanel: import('./search/m_search').SearchPanelViewController;
-  stateStoring: import('./state_storing/m_state_storing_controller').StateStoringController;
+  stateStoring: import('./state_storing/state_storing_controller_core').StateStoringController;
   synchronizeScrolling: import('./views/m_grid_view').SynchronizeScrollingController;
   tablePosition: import('./columns_resizing_reordering/m_columns_resizing_reordering').TablePositionViewController;
   toastViewController: import('./toast/m_toast_controller').ToastViewController;
diff --git a/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts b/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts
index 50a378828822..45fd42c36a64 100644
--- a/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts
+++ b/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts
@@ -20,7 +20,7 @@ import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/m
 import type { Column } from '@ts/grids/grid_core/columns_controller/types';
 import type { ContextMenuController } from '@ts/grids/grid_core/context_menu/m_context_menu';
 import type { ModuleType } from '@ts/grids/grid_core/m_types';
-import type { StateStoringController } from '@ts/grids/grid_core/state_storing/m_state_storing_controller';
+import type { StateStoringController } from '@ts/grids/grid_core/state_storing/state_storing_controller_core';
 import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
 import Selection from '@ts/ui/selection/selection';
 
diff --git a/packages/devextreme/js/__internal/grids/grid_core/state_storing/extenders/state_storing_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/state_storing/extenders/state_storing_data_controller.ts
index 76968891462e..0a8ab22a0ee0 100644
--- a/packages/devextreme/js/__internal/grids/grid_core/state_storing/extenders/state_storing_data_controller.ts
+++ b/packages/devextreme/js/__internal/grids/grid_core/state_storing/extenders/state_storing_data_controller.ts
@@ -5,7 +5,7 @@ import { isDefined } from '@js/core/utils/type';
 import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller';
 import type { ModuleType } from '@ts/grids/grid_core/m_types';
 
-import type { StateStoringController } from '../m_state_storing_controller';
+import type { StateStoringController } from '../state_storing_controller_core';
 
 export interface StateStoringDataControllerExtension {
   stateLoaded: Callback<[]>;
diff --git a/packages/devextreme/js/__internal/grids/grid_core/state_storing/state_storing_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/state_storing/state_storing_controller.ts
index e5eaf8dee013..f42878b52337 100644
--- a/packages/devextreme/js/__internal/grids/grid_core/state_storing/state_storing_controller.ts
+++ b/packages/devextreme/js/__internal/grids/grid_core/state_storing/state_storing_controller.ts
@@ -5,7 +5,7 @@ import type { DataController } from '@ts/grids/grid_core/data_controller/data_co
 import type { InternalGridOptions } from '@ts/grids/grid_core/m_types';
 
 import type { StateStoringDataControllerExtension } from './extenders/state_storing_data_controller';
-import { StateStoringController } from './m_state_storing_controller';
+import { StateStoringController } from './state_storing_controller_core';
 import type { GridState } from './types';
 
 const getDataState = (that): GridState => {
diff --git a/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/state_storing/state_storing_controller_core.ts
similarity index 100%
rename from packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing_controller.ts
rename to packages/devextreme/js/__internal/grids/grid_core/state_storing/state_storing_controller_core.ts
diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/data_controller/m_data_controller.ts b/packages/devextreme/js/__internal/grids/pivot_grid/data_controller/m_data_controller.ts
index 9d7e4cd84b66..9fa8cc1a29bc 100644
--- a/packages/devextreme/js/__internal/grids/pivot_grid/data_controller/m_data_controller.ts
+++ b/packages/devextreme/js/__internal/grids/pivot_grid/data_controller/m_data_controller.ts
@@ -5,7 +5,7 @@ import { extend } from '@js/core/utils/extend';
 import { each, map } from '@js/core/utils/iterator';
 import { format } from '@js/core/utils/string';
 import { isDefined, isString } from '@js/core/utils/type';
-import stateStoring from '@ts/grids/grid_core/state_storing/m_state_storing_controller';
+import stateStoring from '@ts/grids/grid_core/state_storing/state_storing_controller_core';
 import { createColumnsInfo, foreachColumnInfo } from '@ts/grids/grid_core/virtual_columns/m_virtual_columns_core';
 import VirtualScrollControllerModule from '@ts/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core';
 
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataController.tests.js
index 07ada5ea3355..07f2dbf508e2 100644
--- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataController.tests.js
+++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataController.tests.js
@@ -2,7 +2,7 @@ import $ from 'jquery';
 import Class from 'core/class';
 import { DataController } from '__internal/grids/pivot_grid/data_controller/m_data_controller';
 import virtualScrolling from '__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core';
-import stateStoring from '__internal/grids/grid_core/state_storing/m_state_storing_controller';
+import stateStoring from '__internal/grids/grid_core/state_storing/state_storing_controller_core';
 import pivotGridUtils from '__internal/grids/pivot_grid/m_widget_utils';
 import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source';