diff --git a/src/legacy/core_plugins/interpreter/public/functions/esaggs.ts b/src/legacy/core_plugins/interpreter/public/functions/esaggs.ts
index eb24d59f9ca7..d853ff412b29 100644
--- a/src/legacy/core_plugins/interpreter/public/functions/esaggs.ts
+++ b/src/legacy/core_plugins/interpreter/public/functions/esaggs.ts
@@ -20,7 +20,7 @@
 import { get, has } from 'lodash';
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
-import { AggConfigs } from 'ui/vis/agg_configs';
+import { AggConfigs } from 'ui/agg_types/agg_configs';
 import { createFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 import chrome from 'ui/chrome';
 
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/_geo_hash.js b/src/legacy/ui/public/agg_types/__tests__/buckets/_geo_hash.js
index a9bb92ff26dc..7172d1f40936 100644
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/_geo_hash.js
+++ b/src/legacy/ui/public/agg_types/__tests__/buckets/_geo_hash.js
@@ -20,7 +20,7 @@
 import expect from '@kbn/expect';
 import sinon from 'sinon';
 import { geoHashBucketAgg } from '../../buckets/geo_hash';
-import * as AggConfigModule from '../../../vis/agg_config';
+import * as AggConfigModule from '../../agg_config';
 import * as BucketAggTypeModule from '../../buckets/_bucket_agg_type';
 
 describe('Geohash Agg', () => {
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js b/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
index 41d4cc38b335..62280aed2086 100644
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
+++ b/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
@@ -26,7 +26,7 @@ import AggParamWriterProvider from '../../agg_param_writer';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import chrome from '../../../../chrome';
 import { aggTypes } from '../../..';
-import { AggConfig } from '../../../../vis/agg_config';
+import { AggConfig } from '../../../agg_config';
 import { timefilter } from 'ui/timefilter';
 
 const config = chrome.getUiSettingsClient();
diff --git a/src/legacy/ui/public/vis/agg_config.ts b/src/legacy/ui/public/agg_types/agg_config.ts
similarity index 97%
rename from src/legacy/ui/public/vis/agg_config.ts
rename to src/legacy/ui/public/agg_types/agg_config.ts
index 67a4a94d3068..0977f62629d6 100644
--- a/src/legacy/ui/public/vis/agg_config.ts
+++ b/src/legacy/ui/public/agg_types/agg_config.ts
@@ -26,14 +26,13 @@
 
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { BucketAggType } from 'ui/agg_types';
-import { AggGroupNames } from './editors/default/agg_groups';
-import { AggType, FieldParamType } from '../agg_types';
+import { AggType, FieldParamType, BucketAggType } from '.';
+import { AggGroupNames } from '../vis/editors/default/agg_groups';
 // @ts-ignore
 import { fieldFormats } from '../registry/field_formats';
-import { writeParams } from '../agg_types/agg_params';
+import { writeParams } from './agg_params';
 import { AggConfigs } from './agg_configs';
-import { Schema } from './editors/default/schemas';
+import { Schema } from '../vis/editors/default/schemas';
 
 export interface AggConfigOptions {
   id: string;
diff --git a/src/legacy/ui/public/vis/agg_configs.ts b/src/legacy/ui/public/agg_types/agg_configs.ts
similarity index 99%
rename from src/legacy/ui/public/vis/agg_configs.ts
rename to src/legacy/ui/public/agg_types/agg_configs.ts
index e16784bb6e2f..e90d91eb7fd7 100644
--- a/src/legacy/ui/public/vis/agg_configs.ts
+++ b/src/legacy/ui/public/agg_types/agg_configs.ts
@@ -31,7 +31,7 @@ import { TimeRange } from 'src/plugins/data/public';
 import { Schemas } from '../visualize/loader/pipeline_helpers/build_pipeline';
 import { Schema } from '../vis/editors/default/schemas';
 import { AggConfig, AggConfigOptions } from './agg_config';
-import { AggGroupNames } from './editors/default/agg_groups';
+import { AggGroupNames } from '../vis/editors/default/agg_groups';
 import { IndexPattern } from '../../../core_plugins/data/public';
 
 function removeParentAggs(obj: any) {
diff --git a/src/legacy/ui/public/agg_types/agg_params.ts b/src/legacy/ui/public/agg_types/agg_params.ts
index 743a94788d88..c68d10d2ba7c 100644
--- a/src/legacy/ui/public/agg_types/agg_params.ts
+++ b/src/legacy/ui/public/agg_types/agg_params.ts
@@ -23,8 +23,8 @@ import { OptionedParamType } from './param_types/optioned';
 import { StringParamType } from './param_types/string';
 import { JsonParamType } from './param_types/json';
 import { BaseParamType } from './param_types/base';
-import { AggConfig } from '../vis/agg_config';
-import { AggConfigs } from '../vis/agg_configs';
+import { AggConfig } from './agg_config';
+import { AggConfigs } from './agg_configs';
 
 export type AggParam = BaseParamType;
 
diff --git a/src/legacy/ui/public/agg_types/agg_type.ts b/src/legacy/ui/public/agg_types/agg_type.ts
index f58a8b877fb7..eb233b4d5909 100644
--- a/src/legacy/ui/public/agg_types/agg_type.ts
+++ b/src/legacy/ui/public/agg_types/agg_type.ts
@@ -24,7 +24,7 @@ import { AggParam, initParams } from './agg_params';
 // @ts-ignore
 import { FieldFormat, fieldFormats } from '../registry/field_formats';
 import { AggConfig } from '../vis';
-import { AggConfigs } from '../vis/agg_configs';
+import { AggConfigs } from './agg_configs';
 import { SearchSource } from '../courier';
 import { Adapters } from '../inspector';
 
diff --git a/src/legacy/ui/public/agg_types/agg_utils.ts b/src/legacy/ui/public/agg_types/agg_utils.ts
index 14412903bc1e..d7f4ec961ded 100644
--- a/src/legacy/ui/public/agg_types/agg_utils.ts
+++ b/src/legacy/ui/public/agg_types/agg_utils.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { AggConfig } from '../vis/agg_config';
+import { AggConfig } from './agg_config';
 
 function safeMakeLabel(agg: AggConfig) {
   try {
diff --git a/src/legacy/ui/public/agg_types/buckets/migrate_include_exclude_format.d.ts b/src/legacy/ui/public/agg_types/buckets/migrate_include_exclude_format.d.ts
index d9bce19b7dbc..bb032faf11f5 100644
--- a/src/legacy/ui/public/agg_types/buckets/migrate_include_exclude_format.d.ts
+++ b/src/legacy/ui/public/agg_types/buckets/migrate_include_exclude_format.d.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { AggConfig } from 'ui/vis/agg_config';
+import { AggConfig } from 'ui/agg_types/agg_config';
 
 export function isStringType(type: AggConfig): boolean;
 export function isType(type: string): (agg: AggConfig) => boolean;
diff --git a/src/legacy/ui/public/agg_types/index.ts b/src/legacy/ui/public/agg_types/index.ts
index 8f2b5d6f1f8c..6c521e23a37f 100644
--- a/src/legacy/ui/public/agg_types/index.ts
+++ b/src/legacy/ui/public/agg_types/index.ts
@@ -128,6 +128,8 @@ aggTypes.buckets.forEach(aggType => (aggType.type = 'buckets'));
 
 export { AggParam } from './agg_params';
 export { AggType } from './agg_type';
+export { AggConfig } from './agg_config';
+export { AggConfigs } from './agg_configs';
 export { FieldParamType } from './param_types';
 export { BucketAggType } from './buckets/_bucket_agg_type';
 export { setBounds };
diff --git a/src/legacy/ui/public/agg_types/param_types/agg.ts b/src/legacy/ui/public/agg_types/param_types/agg.ts
index 5729848c0082..5c1743aeb926 100644
--- a/src/legacy/ui/public/agg_types/param_types/agg.ts
+++ b/src/legacy/ui/public/agg_types/param_types/agg.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { AggConfig } from '../../vis/agg_config';
+import { AggConfig } from '../agg_config';
 import { BaseParamType } from './base';
 
 export class AggParamType extends BaseParamType {
diff --git a/src/legacy/ui/public/agg_types/param_types/base.ts b/src/legacy/ui/public/agg_types/param_types/base.ts
index c1e6c52d76b1..c42c8cdb61aa 100644
--- a/src/legacy/ui/public/agg_types/param_types/base.ts
+++ b/src/legacy/ui/public/agg_types/param_types/base.ts
@@ -18,7 +18,7 @@
  */
 
 import { AggParam } from '../';
-import { AggConfigs } from '../../vis/agg_configs';
+import { AggConfigs } from '../agg_configs';
 import { AggConfig } from '../../vis';
 import { SearchSource } from '../../courier';
 
diff --git a/src/legacy/ui/public/vis/__tests__/_agg_config.js b/src/legacy/ui/public/vis/__tests__/_agg_config.js
index af00c2e1f280..dd5586721fc1 100644
--- a/src/legacy/ui/public/vis/__tests__/_agg_config.js
+++ b/src/legacy/ui/public/vis/__tests__/_agg_config.js
@@ -22,7 +22,7 @@ import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import { VisProvider } from '..';
 import { AggType } from '../../agg_types/agg_type';
-import { AggConfig } from '../agg_config';
+import { AggConfig } from '../../agg_types/agg_config';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import { fieldFormats } from '../../registry/field_formats';
 
diff --git a/src/legacy/ui/public/vis/__tests__/_agg_configs.js b/src/legacy/ui/public/vis/__tests__/_agg_configs.js
index 95419e3c345f..96e4aa943ed1 100644
--- a/src/legacy/ui/public/vis/__tests__/_agg_configs.js
+++ b/src/legacy/ui/public/vis/__tests__/_agg_configs.js
@@ -21,9 +21,9 @@ import _ from 'lodash';
 import sinon from 'sinon';
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
-import { AggConfig } from '../agg_config';
+import { AggConfig } from '../../agg_types/agg_config';
 import { VisProvider } from '..';
-import { AggConfigs } from '../agg_configs';
+import { AggConfigs } from '../../agg_types/agg_configs';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import { Schemas } from '../editors/default/schemas';
 import { AggGroupNames } from '../editors/default/agg_groups';
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_group.test.tsx b/src/legacy/ui/public/vis/editors/default/components/agg_group.test.tsx
index c29706d3228a..05e8c44b9c72 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_group.test.tsx
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_group.test.tsx
@@ -23,7 +23,7 @@ import { act } from 'react-dom/test-utils';
 import { VisState, AggConfig } from '../../../';
 import { Schema } from '../schemas';
 import { AggGroupNames } from '../agg_groups';
-import { AggConfigs } from '../../../agg_configs';
+import { AggConfigs } from '../../../../agg_types/agg_configs';
 import { DefaultEditorAggGroup, DefaultEditorAggGroupProps } from './agg_group';
 import { DefaultEditorAgg } from './agg';
 import { DefaultEditorAggAdd } from './agg_add';
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx b/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx
index 61c988966d35..7a75f12e0b58 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx
@@ -27,7 +27,7 @@ import {
   EuiPanel,
 } from '@elastic/eui';
 
-import { AggConfig } from '../../../agg_config';
+import { AggConfig } from '../../../../agg_types/agg_config';
 import { aggGroupNamesMap, AggGroupNames } from '../agg_groups';
 import { DefaultEditorAgg } from './agg';
 import { DefaultEditorAggAdd } from './agg_add';
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_group_helper.test.ts b/src/legacy/ui/public/vis/editors/default/components/agg_group_helper.test.ts
index a8232f717140..b2dac344950b 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_group_helper.test.ts
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_group_helper.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { AggConfig } from '../../../agg_config';
+import { AggConfig } from '../../../../agg_types/agg_config';
 import { isAggRemovable, calcAggIsTooLow, isInvalidAggsTouched } from './agg_group_helper';
 import { AggsState } from './agg_group_state';
 
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_group_helper.tsx b/src/legacy/ui/public/vis/editors/default/components/agg_group_helper.tsx
index 99b913d8f94c..5bfb2cdfb48d 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_group_helper.tsx
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_group_helper.tsx
@@ -18,7 +18,7 @@
  */
 
 import { findIndex, reduce, isEmpty } from 'lodash';
-import { AggConfig } from '../../../agg_config';
+import { AggConfig } from '../../../../agg_types/agg_config';
 import { AggsState } from './agg_group_state';
 
 const isAggRemovable = (agg: AggConfig, group: AggConfig[]) => {
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_group_state.tsx b/src/legacy/ui/public/vis/editors/default/components/agg_group_state.tsx
index 2bb892138478..8e8926f027ca 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_group_state.tsx
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_group_state.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { AggConfig } from '../../../agg_config';
+import { AggConfig } from '../../../../agg_types/agg_config';
 
 export enum AGGS_ACTION_KEYS {
   TOUCHED = 'aggsTouched',
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_param_props.ts b/src/legacy/ui/public/vis/editors/default/components/agg_param_props.ts
index f90eb28842d8..aafba008f97c 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_param_props.ts
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_param_props.ts
@@ -19,7 +19,7 @@
 
 import { Field } from 'ui/index_patterns';
 import { AggParam } from 'ui/agg_types';
-import { AggConfig } from '../../../agg_config';
+import { AggConfig } from '../../../../agg_types/agg_config';
 import { ComboBoxGroupedOptions } from '../utils';
 import { EditorConfig } from '../../config/types';
 import { VisState } from '../../..';
diff --git a/src/legacy/ui/public/vis/editors/default/vis_options_props.tsx b/src/legacy/ui/public/vis/editors/default/vis_options_props.tsx
index b9573de58845..3f9fa9f5f352 100644
--- a/src/legacy/ui/public/vis/editors/default/vis_options_props.tsx
+++ b/src/legacy/ui/public/vis/editors/default/vis_options_props.tsx
@@ -18,7 +18,7 @@
  */
 
 import { PersistedState } from 'ui/persisted_state';
-import { AggConfigs } from 'ui/vis/agg_configs';
+import { AggConfigs } from 'ui/agg_types/agg_configs';
 import { Vis } from './../..';
 
 export interface VisOptionsProps<VisParamType = unknown> {
diff --git a/src/legacy/ui/public/vis/index.d.ts b/src/legacy/ui/public/vis/index.d.ts
index ce220070a5f2..5a2a7edb6329 100644
--- a/src/legacy/ui/public/vis/index.d.ts
+++ b/src/legacy/ui/public/vis/index.d.ts
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-export { AggConfig } from './agg_config';
+export { AggConfig } from '../agg_types/agg_config';
 export { Vis, VisProvider, VisParams, VisState } from './vis';
 export { VisualizationController, VisType } from './vis_types/vis_type';
diff --git a/src/legacy/ui/public/vis/vis.d.ts b/src/legacy/ui/public/vis/vis.d.ts
index 22881a6fda18..be73cccf06a5 100644
--- a/src/legacy/ui/public/vis/vis.d.ts
+++ b/src/legacy/ui/public/vis/vis.d.ts
@@ -18,7 +18,7 @@
  */
 
 import { VisType } from './vis_types/vis_type';
-import { AggConfigs } from './agg_configs';
+import { AggConfigs } from '../agg_types/agg_configs';
 
 export interface Vis {
   type: VisType;
diff --git a/src/legacy/ui/public/vis/vis.js b/src/legacy/ui/public/vis/vis.js
index 16c8d05c2d06..0c4802288bd3 100644
--- a/src/legacy/ui/public/vis/vis.js
+++ b/src/legacy/ui/public/vis/vis.js
@@ -30,7 +30,7 @@
 import { EventEmitter } from 'events';
 import _ from 'lodash';
 import { VisTypesRegistryProvider } from '../registry/vis_types';
-import { AggConfigs } from './agg_configs';
+import { AggConfigs } from '../agg_types/agg_configs';
 import { PersistedState } from '../persisted_state';
 import { FilterBarQueryFilterProvider } from '../filter_manager/query_filter';
 import { updateVisualizationConfig } from './vis_update';
diff --git a/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.test.ts b/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.test.ts
index 4dc0a2d5db62..51ba983bd9a5 100644
--- a/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.test.ts
+++ b/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.test.ts
@@ -25,7 +25,7 @@ import { Vis } from '../../vis';
 import { VisResponseData } from './types';
 import { Inspector } from '../../inspector';
 import { EmbeddedVisualizeHandler, RequestHandlerParams } from './embedded_visualize_handler';
-import { AggConfigs } from 'ui/vis/agg_configs';
+import { AggConfigs } from 'ui/agg_types/agg_configs';
 
 jest.mock('ui/new_platform');
 
diff --git a/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts b/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts
index a88e5c76fd02..60a1800dd9ea 100644
--- a/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts
+++ b/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts
@@ -25,7 +25,7 @@ import { i18n } from '@kbn/i18n';
 import { Filter } from '@kbn/es-query';
 import { toastNotifications } from 'ui/notify';
 // @ts-ignore untyped dependency
-import { AggConfigs } from 'ui/vis/agg_configs';
+import { AggConfigs } from 'ui/agg_types/agg_configs';
 import { SearchSource } from 'ui/courier';
 import { QueryFilter } from 'ui/filter_manager/query_filter';
 import { TimeRange } from 'src/plugins/data/public';
diff --git a/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.test.ts b/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.test.ts
index a12eeef12231..1c8621848dbc 100644
--- a/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.test.ts
+++ b/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.test.ts
@@ -27,7 +27,7 @@ import {
   Schemas,
 } from './build_pipeline';
 import { Vis, VisState } from 'ui/vis';
-import { AggConfig } from 'ui/vis/agg_config';
+import { AggConfig } from 'ui/agg_types/agg_config';
 import { SearchSource } from 'ui/courier';
 
 jest.mock('ui/new_platform');
diff --git a/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.test.js b/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.test.js
index 99177af4b7a4..51e1c82a7733 100644
--- a/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.test.js
@@ -13,7 +13,7 @@ jest.mock('ui/vis/editors/default/schemas', () => {
   };
 });
 jest.mock('../../kibana_services', () => {});
-jest.mock('ui/vis/agg_configs', () => {});
+jest.mock('ui/agg_types', () => {});
 jest.mock('ui/timefilter', () => {});
 jest.mock('../vector_layer', () => {});
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
index d0f175136e9b..b52ebc98b8c5 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
@@ -12,7 +12,7 @@ import { AbstractESSource } from '../es_source';
 import { HeatmapLayer } from '../../heatmap_layer';
 import { VectorLayer } from '../../vector_layer';
 import { Schemas } from 'ui/vis/editors/default/schemas';
-import { AggConfigs } from 'ui/vis/agg_configs';
+import { AggConfigs } from 'ui/agg_types';
 import { tabifyAggResponse } from 'ui/agg_response/tabify';
 import { convertToGeoJson } from './convert_to_geojson';
 import { VectorStyle } from '../../styles/vector_style';
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
index 4514c8fac309..d5c612fd1093 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
@@ -19,7 +19,7 @@ import { SOURCE_DATA_ID_ORIGIN, ES_PEW_PEW } from '../../../../common/constants'
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
 import { convertToLines } from './convert_to_lines';
 import { Schemas } from 'ui/vis/editors/default/schemas';
-import { AggConfigs } from 'ui/vis/agg_configs';
+import { AggConfigs } from 'ui/agg_types';
 
 const COUNT_PROP_LABEL = 'count';
 const COUNT_PROP_NAME = 'doc_count';
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_source.js
index afb7314908c4..1ff0d973ccbe 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_source.js
@@ -13,7 +13,7 @@ import {
 import { createExtentFilter } from '../../elasticsearch_geo_utils';
 import { timefilter } from 'ui/timefilter';
 import _ from 'lodash';
-import { AggConfigs } from 'ui/vis/agg_configs';
+import { AggConfigs } from 'ui/agg_types';
 import { i18n } from '@kbn/i18n';
 import { ESAggMetricTooltipProperty } from '../tooltips/es_aggmetric_tooltip_property';
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.js
index ad404d9af1ea..14760c7c5064 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.js
@@ -8,7 +8,7 @@ import _ from 'lodash';
 
 import { AbstractESSource } from './es_source';
 import { Schemas } from 'ui/vis/editors/default/schemas';
-import { AggConfigs } from 'ui/vis/agg_configs';
+import { AggConfigs } from 'ui/agg_types';
 import { i18n } from '@kbn/i18n';
 import { ESTooltipProperty } from '../tooltips/es_tooltip_property';
 import { ES_SIZE_LIMIT } from '../../../common/constants';
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.test.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.test.js
index 67a25769ee5c..ea11c7e367e5 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.test.js
@@ -11,7 +11,7 @@ jest.mock('ui/vis/editors/default/schemas', () => ({
   Schemas: function () {}
 }));
 jest.mock('../../kibana_services', () => {});
-jest.mock('ui/vis/agg_configs', () => {});
+jest.mock('ui/agg_types', () => {});
 jest.mock('ui/timefilter', () => {});
 
 const indexPatternTitle = 'myIndex';