diff --git a/packages/grafana-ui/src/components/Thresholds/Threshold.test.tsx b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.test.tsx
similarity index 97%
rename from packages/grafana-ui/src/components/Thresholds/Threshold.test.tsx
rename to packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.test.tsx
index 90ce6687985..6d6449aaa60 100644
--- a/packages/grafana-ui/src/components/Thresholds/Threshold.test.tsx
+++ b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.test.tsx
@@ -4,7 +4,7 @@ import { PanelOptionsProps } from '@grafana/ui';
 import { defaultProps } from 'app/plugins/panel/gauge/GaugePanelOptions';
 import { Options } from 'app/plugins/panel/gauge/types';
 import { BasicGaugeColor } from 'app/types';
-import { ThresholdsEditor } from './Thresholds';
+import { ThresholdsEditor } from './ThresholdsEditor';
 
 const setup = (propOverrides?: object) => {
   const props: PanelOptionsProps<Options> = {
diff --git a/packages/grafana-ui/src/components/Thresholds/Thresholds.tsx b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
similarity index 100%
rename from packages/grafana-ui/src/components/Thresholds/Thresholds.tsx
rename to packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
diff --git a/packages/grafana-ui/src/components/Thresholds/_Thresholds.scss b/packages/grafana-ui/src/components/ThresholdsEditor/_ThresholdsEditor.scss
similarity index 100%
rename from packages/grafana-ui/src/components/Thresholds/_Thresholds.scss
rename to packages/grafana-ui/src/components/ThresholdsEditor/_ThresholdsEditor.scss
diff --git a/packages/grafana-ui/src/components/index.scss b/packages/grafana-ui/src/components/index.scss
index d0a81675490..cc5979c8444 100644
--- a/packages/grafana-ui/src/components/index.scss
+++ b/packages/grafana-ui/src/components/index.scss
@@ -1,4 +1,4 @@
 @import 'CustomScrollbar/CustomScrollbar';
 @import 'DeleteButton/DeleteButton';
-@import 'Thresholds/Thresholds';
+@import 'ThresholdsEditor/ThresholdsEditor';
 @import 'Tooltip/Tooltip';
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index 79764ac8fa4..4b60557be7e 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -5,4 +5,4 @@ export { CustomScrollbar } from './CustomScrollbar/CustomScrollbar';
 export { ColorPicker } from './ColorPicker/ColorPicker';
 export { SeriesColorPickerPopover } from './ColorPicker/SeriesColorPickerPopover';
 export { SeriesColorPicker } from './ColorPicker/SeriesColorPicker';
-export { ThresholdsEditor } from './Thresholds/Thresholds';
+export { ThresholdsEditor } from './ThresholdsEditor/ThresholdsEditor';