diff --git a/packages/devextreme/js/data/array_store.d.ts b/packages/devextreme/js/data/array_store.d.ts
index 60e27adc7392..3e32dac7582d 100644
--- a/packages/devextreme/js/data/array_store.d.ts
+++ b/packages/devextreme/js/data/array_store.d.ts
@@ -10,6 +10,7 @@ export {
 /**
  * @public
  * @deprecated Use ArrayStoreOptions from /common/data instead
+ * @namespace DevExpress.data.ArrayStore
  */
 export type Options<
     TItem = any,
diff --git a/packages/devextreme/js/data/custom_store.d.ts b/packages/devextreme/js/data/custom_store.d.ts
index 45a84ef17941..505b18d8a0fd 100644
--- a/packages/devextreme/js/data/custom_store.d.ts
+++ b/packages/devextreme/js/data/custom_store.d.ts
@@ -18,6 +18,7 @@ export {
 /**
  * @public
  * @deprecated Use CustomStoreOptions from /common/data instead
+ * @namespace DevExpress.data.CustomStore
  */
 export type Options<
     TItem = any,
diff --git a/packages/devextreme/js/data/local_store.d.ts b/packages/devextreme/js/data/local_store.d.ts
index 2dbf421e7e8b..e9fe4eb14006 100644
--- a/packages/devextreme/js/data/local_store.d.ts
+++ b/packages/devextreme/js/data/local_store.d.ts
@@ -18,6 +18,7 @@ export default LocalStore;
 /**
 * @public
 * @deprecated Use LocalStoreOptions from /common/data instead
+* @namespace DevExpress.data.LocalStore
 */
 export type Options<
   TItem = any,
diff --git a/packages/devextreme/js/data/odata/store.d.ts b/packages/devextreme/js/data/odata/store.d.ts
index d15b355abe15..512c03221279 100644
--- a/packages/devextreme/js/data/odata/store.d.ts
+++ b/packages/devextreme/js/data/odata/store.d.ts
@@ -3,6 +3,7 @@ import { ODataStoreOptions, ODataStore } from '../../common/data';
 /**
  * @public
  * @deprecated Use ODataStoreOptions from /common/data instead
+ * @namespace DevExpress.data.ODataStore
  */
 export type Options<
     TItem = any,
diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts
index eb549bd67747..280334662e00 100644
--- a/packages/devextreme/ts/dx.all.d.ts
+++ b/packages/devextreme/ts/dx.all.d.ts
@@ -6263,19 +6263,6 @@ declare module DevExpress.data {
     withCredentials?: boolean;
   }
   /**
-   * @deprecated Use ArrayStoreOptions from /common/data instead
-   */
-  export type Options<TItem = any, TKey = any> = ArrayStoreOptions<TItem, TKey>;
-  /**
-   * @public
-   * @deprecated Use CustomStoreOptions from /common/data instead
-   */
-  export type Options<TItem = any, TKey = any> = CustomStoreOptions<
-    TItem,
-    TKey
-  >;
-  /**
-   * @public
    * @deprecated Use DataSourceOptions from /common/data instead
    */
   export type Options<
@@ -6284,16 +6271,6 @@ declare module DevExpress.data {
     TItem = TMappedItem,
     TKey = any
   > = DataSourceOptions<TStoreItem, TItem, TMappedItem, TKey>;
-  /**
-   * @public
-   * @deprecated Use LocalStoreOptions from /common/data instead
-   */
-  export type Options<TItem = any, TKey = any> = LocalStoreOptions<TItem, TKey>;
-  /**
-   * @public
-   * @deprecated Use ODataStoreOptions from /common/data instead
-   */
-  export type Options<TItem = any, TKey = any> = ODataStoreOptions<TItem, TKey>;
   /**
    * [descr:PivotGridDataSource]
    */
@@ -6824,6 +6801,33 @@ declare module DevExpress.data {
     url?: string;
   }
 }
+declare module DevExpress.data.ArrayStore {
+  /**
+   * @deprecated Use ArrayStoreOptions from /common/data instead
+   */
+  export type Options<TItem = any, TKey = any> = ArrayStoreOptions<TItem, TKey>;
+}
+declare module DevExpress.data.CustomStore {
+  /**
+   * @deprecated Use CustomStoreOptions from /common/data instead
+   */
+  export type Options<TItem = any, TKey = any> = CustomStoreOptions<
+    TItem,
+    TKey
+  >;
+}
+declare module DevExpress.data.LocalStore {
+  /**
+   * @deprecated Use LocalStoreOptions from /common/data instead
+   */
+  export type Options<TItem = any, TKey = any> = LocalStoreOptions<TItem, TKey>;
+}
+declare module DevExpress.data.ODataStore {
+  /**
+   * @deprecated Use ODataStoreOptions from /common/data instead
+   */
+  export type Options<TItem = any, TKey = any> = ODataStoreOptions<TItem, TKey>;
+}
 declare module DevExpress.data.PivotGridDataSource {
   /**
    * [descr:PivotGridDataSourceOptions.fields]