diff --git a/src/legacy/core_plugins/data/public/index.ts b/src/legacy/core_plugins/data/public/index.ts
index 36bbccde7db67..e4a737ed1e1f1 100644
--- a/src/legacy/core_plugins/data/public/index.ts
+++ b/src/legacy/core_plugins/data/public/index.ts
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-// /// Define plguin function
+// /// Define plugin function
 import { DataPlugin as Plugin } from './plugin';
 
 export function plugin() {
   return new Plugin();
 }
 
-// /// Export types
+// /// Export types & static code
 
 /** @public types */
 export { ExpressionRenderer, ExpressionRendererProps, ExpressionRunner } from './expressions';
diff --git a/src/legacy/core_plugins/metrics/public/components/vis_types/gauge/series.test.tsx b/src/legacy/core_plugins/metrics/public/components/vis_types/gauge/series.test.js
similarity index 95%
rename from src/legacy/core_plugins/metrics/public/components/vis_types/gauge/series.test.tsx
rename to src/legacy/core_plugins/metrics/public/components/vis_types/gauge/series.test.js
index 92221c4762908..edbeba5d176ae 100644
--- a/src/legacy/core_plugins/metrics/public/components/vis_types/gauge/series.test.tsx
+++ b/src/legacy/core_plugins/metrics/public/components/vis_types/gauge/series.test.js
@@ -17,14 +17,12 @@
  * under the License.
  */
 import React from 'react';
-
-// @ts-ignore
 import { GaugeSeries } from './series';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
 jest.mock('plugins/data', () => {
   return {
-    QueryBarInput: () => <div className="queryBarInput"></div>,
+    QueryBarInput: () => <div className="queryBarInput" />,
   };
 });
 
diff --git a/src/legacy/core_plugins/metrics/public/components/vis_types/metric/series.test.tsx b/src/legacy/core_plugins/metrics/public/components/vis_types/metric/series.test.js
similarity index 96%
rename from src/legacy/core_plugins/metrics/public/components/vis_types/metric/series.test.tsx
rename to src/legacy/core_plugins/metrics/public/components/vis_types/metric/series.test.js
index 7c28087c1305e..cfcac5d4908a0 100644
--- a/src/legacy/core_plugins/metrics/public/components/vis_types/metric/series.test.tsx
+++ b/src/legacy/core_plugins/metrics/public/components/vis_types/metric/series.test.js
@@ -18,13 +18,12 @@
  */
 
 import React from 'react';
-// @ts-ignore
 import { MetricSeries } from './series';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
 jest.mock('plugins/data', () => {
   return {
-    QueryBarInput: () => <div className="queryBarInput"></div>,
+    QueryBarInput: () => <div className="queryBarInput" />,
   };
 });
 
diff --git a/src/legacy/ui/public/agg_types/buckets/filters.js b/src/legacy/ui/public/agg_types/buckets/filters.js
index aad56541bb2cd..d7553cf81a11a 100644
--- a/src/legacy/ui/public/agg_types/buckets/filters.js
+++ b/src/legacy/ui/public/agg_types/buckets/filters.js
@@ -27,9 +27,9 @@ import { i18n } from '@kbn/i18n';
 
 import chrome from 'ui/chrome';
 import { buildEsQuery } from '@kbn/es-query';
-import { setup } from '../../../../core_plugins/data/public/legacy';
+import { setup as data } from '../../../../core_plugins/data/public/legacy';
 
-const { getQueryLog } = setup.query.helpers;
+const { getQueryLog } = data.query.helpers;
 const config = chrome.getUiSettingsClient();
 
 export const filtersBucketAgg = new BucketAggType({
diff --git a/x-pack/legacy/plugins/maps/public/kibana_services.js b/x-pack/legacy/plugins/maps/public/kibana_services.js
index 7008039710e4b..23a1380181c73 100644
--- a/x-pack/legacy/plugins/maps/public/kibana_services.js
+++ b/x-pack/legacy/plugins/maps/public/kibana_services.js
@@ -8,9 +8,9 @@ import { uiModules } from 'ui/modules';
 import { SearchSourceProvider } from 'ui/courier';
 import { getRequestInspectorStats, getResponseInspectorStats } from 'ui/courier/utils/courier_inspector_utils';
 export { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
-import { setup } from '../../../../../src/legacy/core_plugins/data/public/legacy';
+import { setup as data } from '../../../../../src/legacy/core_plugins/data/public/legacy';
 
-export const indexPatternService = setup.indexPatterns.indexPatterns;
+export const indexPatternService = data.indexPatterns.indexPatterns;
 
 export let SearchSource;