diff --git a/src/dataSources/index.ts b/src/data_sources/index.ts
similarity index 100%
rename from src/dataSources/index.ts
rename to src/data_sources/index.ts
diff --git a/src/dataSources/model/DataRecord.ts b/src/data_sources/model/DataRecord.ts
similarity index 91%
rename from src/dataSources/model/DataRecord.ts
rename to src/data_sources/model/DataRecord.ts
index 663cd48a8..362538a32 100644
--- a/src/dataSources/model/DataRecord.ts
+++ b/src/data_sources/model/DataRecord.ts
@@ -2,6 +2,8 @@ import { keys } from 'underscore';
 import { Model } from '../../common';
 import { DataRecordProps, DataSourcesEvents } from '../types';
 import DataRecords from './DataRecords';
+import DataSource from './DataSource';
+import EditorModel from '../../editor/model/Editor';
 
 export default class DataRecord<T extends DataRecordProps = DataRecordProps> extends Model<T> {
   constructor(props: T, opts = {}) {
@@ -13,11 +15,11 @@ export default class DataRecord<T extends DataRecordProps = DataRecordProps> ext
     return this.collection as unknown as DataRecords;
   }
 
-  get dataSource() {
+  get dataSource(): DataSource {
     return this.cl.dataSource;
   }
 
-  get em() {
+  get em(): EditorModel {
     return this.dataSource.em;
   }
 
diff --git a/src/dataSources/model/DataRecords.ts b/src/data_sources/model/DataRecords.ts
similarity index 100%
rename from src/dataSources/model/DataRecords.ts
rename to src/data_sources/model/DataRecords.ts
diff --git a/src/dataSources/model/DataSource.ts b/src/data_sources/model/DataSource.ts
similarity index 100%
rename from src/dataSources/model/DataSource.ts
rename to src/data_sources/model/DataSource.ts
diff --git a/src/dataSources/model/DataSources.ts b/src/data_sources/model/DataSources.ts
similarity index 100%
rename from src/dataSources/model/DataSources.ts
rename to src/data_sources/model/DataSources.ts
diff --git a/src/dataSources/types.ts b/src/data_sources/types.ts
similarity index 100%
rename from src/dataSources/types.ts
rename to src/data_sources/types.ts
diff --git a/src/dom_components/view/ComponentDataVariableView.ts b/src/dom_components/view/ComponentDataVariableView.ts
index 2bf2bf6c3..102638669 100644
--- a/src/dom_components/view/ComponentDataVariableView.ts
+++ b/src/dom_components/view/ComponentDataVariableView.ts
@@ -1,4 +1,4 @@
-import { DataSourcesEvents, DataVariableListener } from '../../dataSources/types';
+import { DataSourcesEvents, DataVariableListener } from '../../data_sources/types';
 import { stringToPath } from '../../utils/mixins';
 import ComponentDataVariable from '../model/ComponentDataVariable';
 import ComponentView from './ComponentView';
diff --git a/src/editor/index.ts b/src/editor/index.ts
index d911307c5..88204a697 100644
--- a/src/editor/index.ts
+++ b/src/editor/index.ts
@@ -65,7 +65,7 @@ import { AddOptions, EventHandler, LiteralUnion } from '../common';
 import CssComposer from '../css_composer';
 import CssRule from '../css_composer/model/CssRule';
 import CssRules from '../css_composer/model/CssRules';
-import DataSourceManager from '../dataSources';
+import DataSourceManager from '../data_sources';
 import DeviceManager from '../device_manager';
 import ComponentManager, { ComponentEvent } from '../dom_components';
 import Component from '../dom_components/model/Component';
diff --git a/src/editor/model/Editor.ts b/src/editor/model/Editor.ts
index 0ff22979c..798351338 100644
--- a/src/editor/model/Editor.ts
+++ b/src/editor/model/Editor.ts
@@ -42,7 +42,7 @@ import CssRules from '../../css_composer/model/CssRules';
 import { ComponentAdd, DragMode } from '../../dom_components/model/types';
 import ComponentWrapper from '../../dom_components/model/ComponentWrapper';
 import { CanvasSpotBuiltInTypes } from '../../canvas/model/CanvasSpot';
-import DataSourceManager from '../../dataSources';
+import DataSourceManager from '../../data_sources';
 
 Backbone.$ = $;
 
diff --git a/src/index.ts b/src/index.ts
index 66a3127c0..fc5fbc843 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -140,5 +140,10 @@ export type { default as Sector } from './style_manager/model/Sector';
 export type { default as Sectors } from './style_manager/model/Sectors';
 export type { default as Trait } from './trait_manager/model/Trait';
 export type { default as Traits } from './trait_manager/model/Traits';
+export type { default as DataSourceManager } from './data_sources';
+export type { default as DataSources } from './data_sources/model/DataSources';
+export type { default as DataSource } from './data_sources/model/DataSource';
+export type { default as DataRecord } from './data_sources/model/DataRecord';
+export type { default as DataRecords } from './data_sources/model/DataRecords';
 
 export default grapesjs;
diff --git a/test/specs/dataSources/index.ts b/test/specs/dataSources/index.ts
index eebe96dbb..98f133176 100644
--- a/test/specs/dataSources/index.ts
+++ b/test/specs/dataSources/index.ts
@@ -1,6 +1,6 @@
 import Editor from '../../../src/editor/model/Editor';
-import DataSourceManager from '../../../src/dataSources';
-import { DataSourceProps, DataSourcesEvents } from '../../../src/dataSources/types';
+import DataSourceManager from '../../../src/data_sources';
+import { DataSourceProps, DataSourcesEvents } from '../../../src/data_sources/types';
 import ComponentWrapper from '../../../src/dom_components/model/ComponentWrapper';
 import ComponentDataVariable from '../../../src/dom_components/model/ComponentDataVariable';