diff --git a/src/plugins/data/public/query/saved_query/saved_query_service.test.ts b/src/plugins/data/public/query/saved_query/saved_query_service.test.ts
index c983cc4ea8fc5..a86a5b4ed401e 100644
--- a/src/plugins/data/public/query/saved_query/saved_query_service.test.ts
+++ b/src/plugins/data/public/query/saved_query/saved_query_service.test.ts
@@ -18,8 +18,8 @@
  */
 
 import { createSavedQueryService } from './saved_query_service';
-import { SavedQueryAttributes } from '../..';
 import { FilterStateStore } from '../../../common';
+import { SavedQueryAttributes } from './types';
 
 const savedQueryAttributes: SavedQueryAttributes = {
   title: 'foo',
diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts
index ba20611e2fcc8..f7a437572ad47 100644
--- a/src/plugins/data/public/search/search_source/search_source.ts
+++ b/src/plugins/data/public/search/search_source/search_source.ts
@@ -353,7 +353,7 @@ export class SearchSource {
 
     searchRequest.body = searchRequest.body || {};
     const { body, index, fields, query, filters, highlightAll } = searchRequest;
-    searchRequest.indexType = this.getIndexType(index);
+    searchRequest.type = this.getIndexType(index);
 
     const computedFields = index ? index.getComputedFields() : {};
 
diff --git a/src/plugins/data/public/search/search_strategy/default_search_strategy.ts b/src/plugins/data/public/search/search_strategy/default_search_strategy.ts
index 77cb8b2595dc4..9990338e960f0 100644
--- a/src/plugins/data/public/search/search_strategy/default_search_strategy.ts
+++ b/src/plugins/data/public/search/search_strategy/default_search_strategy.ts
@@ -74,10 +74,10 @@ function search({
 }: SearchStrategySearchParams) {
   const abortController = new AbortController();
   const searchParams = getSearchParams(config, esShardTimeout);
-  const promises = searchRequests.map(({ index, indexType, body }) => {
+  const promises = searchRequests.map(({ index, type, body }) => {
     const params = {
       index: index.title || index,
-      indexType,
+      type,
       body,
       ...searchParams,
     };
diff --git a/src/plugins/data/server/search/es_search/es_search_strategy.ts b/src/plugins/data/server/search/es_search/es_search_strategy.ts
index ffb47b2e6c3ae..610bf62da17d3 100644
--- a/src/plugins/data/server/search/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/es_search/es_search_strategy.ts
@@ -32,12 +32,12 @@ export const esSearchStrategyProvider: TSearchStrategyProvider<typeof ES_SEARCH_
       const config = await context.config$.pipe(first()).toPromise();
       const defaultParams = getDefaultSearchParams(config);
       // fix me
-      const { indexType, ...rest } = request.params as any;
+      const { type, ...rest } = request.params;
 
       // Only default index pattern type is supported here.
       // See data_enhanced for other type support.
-      if (!indexType) {
-        throw new Error(`Unsupported index pattern type ${indexType}`);
+      if (!type) {
+        throw new Error(`Unsupported index pattern type ${type}`);
       }
 
       const params = {
diff --git a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
index e73cf648accc6..e444154c51e9d 100644
--- a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
+++ b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
@@ -28,10 +28,10 @@ export const enhancedEsSearchStrategyProvider: TSearchStrategyProvider<typeof ES
   ) => {
     const config = await context.config$.pipe(first()).toPromise();
     const defaultParams = getDefaultSearchParams(config);
-    const { indexType, ...rest } = request.params;
+    const { type, ...rest } = request.params;
     const params = { ...defaultParams, ...rest };
 
-    const rawResponse = (await (indexType === 'rollup'
+    const rawResponse = (await (type === 'rollup'
       ? rollupSearch(caller, { ...request, params }, options)
       : caller('search', params, options))) as SearchResponse<any>;