diff --git a/packages/grafana-data/src/transformations/index.ts b/packages/grafana-data/src/transformations/index.ts
index 1a4beed28d3b..ebe98678d413 100644
--- a/packages/grafana-data/src/transformations/index.ts
+++ b/packages/grafana-data/src/transformations/index.ts
@@ -7,7 +7,12 @@ export { FilterFieldsByNameTransformerOptions } from './transformers/filterByNam
 export { FilterFramesByRefIdTransformerOptions } from './transformers/filterByRefId';
 export { SeriesToColumnsOptions } from './transformers/seriesToColumns';
 export { ReduceTransformerOptions } from './transformers/reduce';
-export { CalculateFieldTransformerOptions } from './transformers/calculateField';
+export { LabelsToFieldsOptions } from './transformers/labelsToFields';
+export {
+  CalculateFieldTransformerOptions,
+  CalculateFieldMode,
+  getResultFieldNameForCalculateFieldTransformerOptions,
+} from './transformers/calculateField';
 export { OrganizeFieldsTransformerOptions } from './transformers/organize';
 export { createOrderFieldsComparer } from './transformers/order';
 export { transformDataFrame } from './transformDataFrame';
diff --git a/packages/grafana-ui/src/components/TransformersUI/CalculateFieldTransformerEditor.tsx b/packages/grafana-ui/src/components/TransformersUI/CalculateFieldTransformerEditor.tsx
index cfce662033e1..97a9ffbde461 100644
--- a/packages/grafana-ui/src/components/TransformersUI/CalculateFieldTransformerEditor.tsx
+++ b/packages/grafana-ui/src/components/TransformersUI/CalculateFieldTransformerEditor.tsx
@@ -12,16 +12,14 @@ import {
   BinaryOperationID,
   SelectableValue,
   binaryOperators,
+  CalculateFieldMode,
+  getResultFieldNameForCalculateFieldTransformerOptions,
 } from '@grafana/data';
 import { StatsPicker } from '../StatsPicker/StatsPicker';
 import { Switch } from '../Forms/Legacy/Switch/Switch';
 import { Input } from '../Input/Input';
 import { FilterPill } from '../FilterPill/FilterPill';
 import { HorizontalGroup } from '../Layout/Layout';
-import {
-  CalculateFieldMode,
-  getResultFieldNameForCalculateFieldTransformerOptions,
-} from '@grafana/data/src/transformations/transformers/calculateField';
 import { Select } from '../Select/Select';
 import defaults from 'lodash/defaults';
 
diff --git a/packages/grafana-ui/src/components/TransformersUI/LabelsToFieldsTransformerEditor.tsx b/packages/grafana-ui/src/components/TransformersUI/LabelsToFieldsTransformerEditor.tsx
index b4be3f90cf15..1f18f7e3628d 100644
--- a/packages/grafana-ui/src/components/TransformersUI/LabelsToFieldsTransformerEditor.tsx
+++ b/packages/grafana-ui/src/components/TransformersUI/LabelsToFieldsTransformerEditor.tsx
@@ -1,6 +1,11 @@
 import React from 'react';
-import { DataTransformerID, standardTransformers, TransformerRegistyItem, TransformerUIProps } from '@grafana/data';
-import { LabelsToFieldsOptions } from '@grafana/data/src/transformations/transformers/labelsToFields';
+import {
+  DataTransformerID,
+  standardTransformers,
+  TransformerRegistyItem,
+  TransformerUIProps,
+  LabelsToFieldsOptions,
+} from '@grafana/data';
 
 export const LabelsAsFieldsTransformerEditor: React.FC<TransformerUIProps<LabelsToFieldsOptions>> = ({
   input,