diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/README.md b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/README.md
new file mode 100644
index 0000000000000..bb3d81a8fb68a
--- /dev/null
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/README.md
@@ -0,0 +1,23 @@
+## @superset-ui/chart-controls
+
+[![Version](https://img.shields.io/npm/v/@superset-ui/chart-controls.svg?style=flat)](https://img.shields.io/npm/v/@superset-ui/chart-controls.svg?style=flat)
+[![David (path)](https://img.shields.io/david/apache-superset/superset-ui.svg?path=packages%2Fsuperset-ui-chart-controls&style=flat-square)](https://david-dm.org/apache-superset/superset-ui?path=packages/superset-ui-chart-controls)
+
+Description
+
+#### Example usage
+
+```js
+import { xxx } from '@superset-ui/chart-controls';
+```
+
+#### API
+
+`fn(args)`
+
+- Do something
+
+### Development
+
+`@data-ui/build-config` is used to manage the build configuration for this package including babel
+builds, jest testing, eslint, and prettier.
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/package.json b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/package.json
similarity index 96%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/package.json
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/package.json
index 1e7c2097b6fd9..7d8e7710187c5 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@superset-ui/control-utils",
+  "name": "@superset-ui/chart-controls",
   "version": "0.13.31",
   "description": "Superset UI control-utils",
   "sideEffects": false,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/components/ColumnOption.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/components/ColumnOption.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/components/ColumnOption.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/components/ColumnOption.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/components/ColumnTypeLabel.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/components/ColumnTypeLabel.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/components/ColumnTypeLabel.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/components/ColumnTypeLabel.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/components/InfoTooltipWithTrigger.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/components/InfoTooltipWithTrigger.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/components/InfoTooltipWithTrigger.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/components/InfoTooltipWithTrigger.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/components/MetricOption.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/components/MetricOption.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/components/MetricOption.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/components/MetricOption.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/constants.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/constants.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/constants.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/constants.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/index.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/index.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/index.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/sections.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/sections.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/sections.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/shared-controls.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/shared-controls.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/shared-controls.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/types.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/types.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/types.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/types.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/utils/D3Formatting.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/utils/D3Formatting.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/utils/D3Formatting.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/utils/D3Formatting.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/utils/mainMetric.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/utils/mainMetric.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/utils/mainMetric.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/utils/mainMetric.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/utils/selectOptions.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/utils/selectOptions.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/src/utils/selectOptions.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/src/utils/selectOptions.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/components/ColumnOption.test.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/components/ColumnOption.test.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/components/ColumnOption.test.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/components/ColumnOption.test.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/components/ColumnTypeLabel.test.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/components/ColumnTypeLabel.test.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/components/ColumnTypeLabel.test.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/components/ColumnTypeLabel.test.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/components/InfoTooltipWithTrigger.test.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/components/InfoTooltipWithTrigger.test.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/components/InfoTooltipWithTrigger.test.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/components/InfoTooltipWithTrigger.test.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/components/MetricOption.test.tsx b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/components/MetricOption.test.tsx
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/components/MetricOption.test.tsx
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/components/MetricOption.test.tsx
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/index.test.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/index.test.ts
similarity index 95%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/index.test.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/index.test.ts
index f96405d0e3a72..ebde70f867290 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/index.test.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/index.test.ts
@@ -18,7 +18,7 @@
  */
 import { sections } from '../src';
 
-describe('@superset-ui/control-utils', () => {
+describe('@superset-ui/chart-controls', () => {
   it('exports sections', () => {
     expect(sections).toBeDefined();
     expect(sections.datasourceAndVizType).toBeDefined();
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/utils/mainMetric.test.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/utils/mainMetric.test.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/utils/mainMetric.test.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/utils/mainMetric.test.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/utils/selectOptions.test.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/utils/selectOptions.test.ts
similarity index 100%
rename from superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/test/utils/selectOptions.test.ts
rename to superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/utils/selectOptions.test.ts
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/README.md b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/README.md
deleted file mode 100644
index 072ba793cb354..0000000000000
--- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-control-utils/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-## @superset-ui/control-utils
-
-[![Version](https://img.shields.io/npm/v/@superset-ui/control-utils.svg?style=flat)](https://img.shields.io/npm/v/@superset-ui/control-utils.svg?style=flat)
-[![David (path)](https://img.shields.io/david/apache-superset/superset-ui.svg?path=packages%2Fsuperset-ui-control-utils&style=flat-square)](https://david-dm.org/apache-superset/superset-ui?path=packages/superset-ui-control-utils)
-
-Description
-
-#### Example usage
-
-```js
-import { xxx } from '@superset-ui/control-utils';
-```
-
-#### API
-
-`fn(args)`
-
-- Do something
-
-### Development
-
-`@data-ui/build-config` is used to manage the build configuration for this package including babel
-builds, jest testing, eslint, and prettier.
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-superset-ui/package.json b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-superset-ui/package.json
index be5f522ce7999..57a2194b65a46 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-superset-ui/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-superset-ui/package.json
@@ -30,7 +30,7 @@
     "@superset-ui/chart-composition": "0.13.31",
     "@superset-ui/color": "0.13.29",
     "@superset-ui/connection": "0.13.27",
-    "@superset-ui/control-utils": "0.13.31",
+    "@superset-ui/chart-controls": "0.13.31",
     "@superset-ui/core": "0.13.27",
     "@superset-ui/dimension": "0.13.27",
     "@superset-ui/number-format": "0.13.27",
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-superset-ui/src/index.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-superset-ui/src/index.ts
index e76afdfb83230..c9078fb59edca 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-superset-ui/src/index.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-superset-ui/src/index.ts
@@ -2,7 +2,7 @@ export * from '@superset-ui/chart';
 export * from '@superset-ui/chart-composition';
 export * from '@superset-ui/color';
 export * from '@superset-ui/connection';
-export * from '@superset-ui/control-utils';
+export * from '@superset-ui/chart-controls';
 export * from '@superset-ui/core';
 export * from '@superset-ui/dimension';
 export * from '@superset-ui/number-format';
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-superset-ui/test/index.test.ts b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-superset-ui/test/index.test.ts
index 249bee9821e66..05f3bc29ad2db 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-superset-ui/test/index.test.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-superset-ui/test/index.test.ts
@@ -27,7 +27,7 @@ describe('@superset-ui/superset-ui', () => {
   it('should export @superset-ui/connection', () => {
     expect(SupersetClient).toBeDefined();
   });
-  it('should export @superset-ui/control-utils', () => {
+  it('should export @superset-ui/chart-controls', () => {
     expect(D3_FORMAT_DOCS).toBeDefined();
   });
   it('should export @superset-ui/core', () => {
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/package.json
index 0f86009ec7b38..9f65e6d032e1c 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/package.json
@@ -36,7 +36,7 @@
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
     "@superset-ui/color": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.3",
+    "@superset-ui/chart-controls": "^0.13.3",
     "@superset-ui/number-format": "^0.13.0",
     "@superset-ui/style": "^0.13.21",
     "@superset-ui/time-format": "^0.13.0",
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.js
index 2bbfbf001790f..48879814a8e73 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.js
@@ -22,7 +22,7 @@ import {
   formatSelectOptions,
   D3_TIME_FORMAT_OPTIONS,
   D3_FORMAT_DOCS,
-} from '@superset-ui/control-utils';
+} from '@superset-ui/chart-controls';
 
 export default {
   requiresTime: true,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-country-map/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-country-map/package.json
index 7889f331f870b..6601e3e13ce90 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-country-map/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-country-map/package.json
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/control-utils": "0.13.31",
+    "@superset-ui/chart-controls": "0.13.31",
     "d3": "^3.5.17",
     "d3-array": "^2.0.3",
     "prop-types": "^15.6.2"
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts
index 0341b3ba91672..6bd847d570b15 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { D3_FORMAT_OPTIONS, D3_FORMAT_DOCS } from '@superset-ui/control-utils';
+import { D3_FORMAT_OPTIONS, D3_FORMAT_DOCS } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-event-flow/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-event-flow/package.json
index 1e90ebd439409..e8e81b09d96cc 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-event-flow/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-event-flow/package.json
@@ -33,7 +33,7 @@
   },
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.12",
+    "@superset-ui/chart-controls": "^0.13.12",
     "@superset-ui/translation": "^0.13.0",
     "@superset-ui/validator": "^0.13.3",
     "react": "^15 || ^16"
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.jsx
index 214f81425bb72..5964c12a00142 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-event-flow/src/controlPanel.jsx
@@ -23,7 +23,7 @@ import {
   ColumnOption,
   internalSharedControls,
   formatSelectOptionsForRange,
-} from '@superset-ui/control-utils';
+} from '@superset-ui/chart-controls';
 
 const { columnChoices } = internalSharedControls;
 
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/package.json
index a98e831cf00d9..5fab340bc46a2 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/package.json
@@ -33,7 +33,7 @@
   },
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.12",
+    "@superset-ui/chart-controls": "^0.13.12",
     "@superset-ui/translation": "^0.13.0"
   }
 }
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.js
index afbcc5de7a97e..caa034e5eb86f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { formatSelectOptions } from '@superset-ui/control-utils';
+import { formatSelectOptions } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/package.json
index 7b65a891f9f5b..58aa05c2fc392 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/package.json
@@ -36,7 +36,7 @@
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
     "@superset-ui/color": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.12",
+    "@superset-ui/chart-controls": "^0.13.12",
     "@superset-ui/number-format": "^0.13.0",
     "@superset-ui/translation": "^0.13.0",
     "@superset-ui/validator": "^0.13.3"
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.js
index bf9e559b84b81..83d5fd5c5caf8 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.js
@@ -22,7 +22,7 @@ import {
   internalSharedControls,
   formatSelectOptionsForRange,
   formatSelectOptions,
-} from '@superset-ui/control-utils';
+} from '@superset-ui/chart-controls';
 
 const { columnChoices } = internalSharedControls;
 
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/package.json
index fa5c26adad010..7722dbaf5a6f2 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/package.json
@@ -38,7 +38,7 @@
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
     "@superset-ui/color": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.12",
+    "@superset-ui/chart-controls": "^0.13.12",
     "@superset-ui/style": "^0.13.26",
     "@superset-ui/translation": "^0.13.0",
     "@superset-ui/validator": "^0.13.3",
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.js
index d40e4e4985112..f6b66d1fcb0a0 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.js
@@ -18,7 +18,7 @@
  */
 import { t } from '@superset-ui/translation';
 import { validateNonEmpty } from '@superset-ui/validator';
-import { formatSelectOptions, internalSharedControls } from '@superset-ui/control-utils';
+import { formatSelectOptions, internalSharedControls } from '@superset-ui/chart-controls';
 
 const { columnChoices } = internalSharedControls;
 
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/package.json
index ef8f589dceaba..e771403634655 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/package.json
@@ -34,7 +34,7 @@
   },
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.12",
+    "@superset-ui/chart-controls": "^0.13.12",
     "@superset-ui/translation": "^0.13.0",
     "react": "^15 || ^16"
   }
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.js
index ef31b01a77c30..361291254e35b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { formatSelectOptions } from '@superset-ui/control-utils';
+import { formatSelectOptions } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/package.json
index 37ae778c68424..0183c37d48d22 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/package.json
@@ -37,7 +37,7 @@
   },
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.12",
+    "@superset-ui/chart-controls": "^0.13.12",
     "@superset-ui/translation": "^0.13.0",
     "react": "^15 || ^16"
   }
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.js
index 9d6c77060f7b4..e21c2244d2a68 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { formatSelectOptions, internalSharedControls } from '@superset-ui/control-utils';
+import { formatSelectOptions, internalSharedControls } from '@superset-ui/chart-controls';
 
 const { columnChoices } = internalSharedControls;
 
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-markup/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-markup/package.json
index 9410c46640874..455c6f2a8e49a 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-markup/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-markup/package.json
@@ -32,7 +32,7 @@
   },
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.9",
+    "@superset-ui/chart-controls": "^0.13.9",
     "@superset-ui/style": "^0.13.26",
     "@superset-ui/translation": "^0.13.0",
     "@superset-ui/validator": "^0.13.0",
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-markup/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-markup/src/controlPanel.js
index 51a051f89db35..5b91e8d025f2e 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-markup/src/controlPanel.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-markup/src/controlPanel.js
@@ -18,7 +18,7 @@
  */
 import { t } from '@superset-ui/translation';
 import { validateNonEmpty } from '@superset-ui/validator';
-import { formatSelectOptions } from '@superset-ui/control-utils';
+import { formatSelectOptions } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/package.json
index 41d61eb5492b1..a14fb2d65ff8d 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/package.json
@@ -35,7 +35,7 @@
   "peerDependencies": {
     "@superset-ui/chart": "0.13.3",
     "@superset-ui/color": "^0.13.3",
-    "@superset-ui/control-utils": "^0.13.9",
+    "@superset-ui/chart-controls": "^0.13.9",
     "@superset-ui/number-format": "^0.13.3",
     "@superset-ui/time-format": "^0.13.3",
     "@superset-ui/translation": "^0.13.3",
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/OptionDescription.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/OptionDescription.jsx
index e3593ee6fe74c..75dca19630974 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/OptionDescription.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/OptionDescription.jsx
@@ -20,7 +20,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { InfoTooltipWithTrigger } from '@superset-ui/control-utils';
+import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 
 const propTypes = {
   option: PropTypes.object.isRequired,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.jsx
index e3e7d771d0ef5..13dbfba4c6d68 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.jsx
@@ -24,7 +24,7 @@ import {
   D3_TIME_FORMAT_OPTIONS,
   D3_FORMAT_DOCS,
   D3_FORMAT_OPTIONS,
-} from '@superset-ui/control-utils';
+} from '@superset-ui/chart-controls';
 import OptionDescription from './OptionDescription';
 
 export default {
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.jsx
index ec6a54f194011..47f23ad7529b1 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/test/OptionDescription.test.jsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { InfoTooltipWithTrigger } from '@superset-ui/control-utils';
+import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import OptionDescription from '../src/OptionDescription';
 
 const defaultProps = {
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/package.json
index e8438bb644bde..9b03050ef7f37 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/package.json
@@ -34,7 +34,7 @@
   },
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.9",
+    "@superset-ui/chart-controls": "^0.13.9",
     "@superset-ui/number-format": "^0.13.0",
     "@superset-ui/translation": "^0.13.0"
   }
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.js
index 8aefaa3877268..ea02baa3bf465 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.js
@@ -17,7 +17,11 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { D3_FORMAT_OPTIONS, D3_FORMAT_DOCS, formatSelectOptions } from '@superset-ui/control-utils';
+import {
+  D3_FORMAT_OPTIONS,
+  D3_FORMAT_DOCS,
+  formatSelectOptions,
+} from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/package.json
index 17cbd86dbcf6f..935d0607d4961 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/package.json
@@ -35,7 +35,7 @@
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
     "@superset-ui/color": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.9",
+    "@superset-ui/chart-controls": "^0.13.9",
     "@superset-ui/number-format": "^0.13.0",
     "@superset-ui/time-format": "^0.13.0",
     "@superset-ui/translation": "^0.13.0",
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.jsx
index af7729ab383f6..fc6fbf94defa9 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.jsx
@@ -23,7 +23,7 @@ import {
   D3_FORMAT_OPTIONS,
   D3_FORMAT_DOCS,
   formatSelectOptions,
-} from '@superset-ui/control-utils';
+} from '@superset-ui/chart-controls';
 
 export default {
   requiresTime: true,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sunburst/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sunburst/package.json
index c428a69999ecf..0808835a9c613 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sunburst/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sunburst/package.json
@@ -34,7 +34,7 @@
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
     "@superset-ui/color": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.0",
+    "@superset-ui/chart-controls": "^0.13.0",
     "@superset-ui/number-format": "^0.13.0",
     "@superset-ui/translation": "^0.13.0"
   }
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-table/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-table/package.json
index 42a74571f4429..749a6cc8792ce 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-table/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-table/package.json
@@ -35,7 +35,7 @@
   },
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.12",
+    "@superset-ui/chart-controls": "^0.13.12",
     "@superset-ui/number-format": "^0.13.0",
     "@superset-ui/query": "^0.13.0",
     "@superset-ui/time-format": "^0.13.0",
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-table/src/controlPanel.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-table/src/controlPanel.tsx
index 345ffab2d1b6e..ccd25c0dcd457 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-table/src/controlPanel.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-table/src/controlPanel.tsx
@@ -24,7 +24,7 @@ import {
   D3_TIME_FORMAT_OPTIONS,
   ColumnOption,
   ControlPanelConfig,
-} from '@superset-ui/control-utils';
+} from '@superset-ui/chart-controls';
 import { validateNonEmpty } from '@superset-ui/validator';
 
 const config: ControlPanelConfig = {
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/package.json
index 1b01d7e3c044c..32e2fe89c5b7f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/package.json
@@ -35,7 +35,7 @@
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
     "@superset-ui/color": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.9",
+    "@superset-ui/chart-controls": "^0.13.9",
     "@superset-ui/number-format": "^0.13.0",
     "@superset-ui/translation": "^0.13.0"
   }
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.js
index 2bbf5f589ba51..a16ffddd3e0e9 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { D3_FORMAT_OPTIONS, D3_FORMAT_DOCS } from '@superset-ui/control-utils';
+import { D3_FORMAT_OPTIONS, D3_FORMAT_DOCS } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/package.json
index ad31e3fd022ba..04451bfabbda9 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/package.json
@@ -34,7 +34,7 @@
   },
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.9",
+    "@superset-ui/chart-controls": "^0.13.9",
     "@superset-ui/number-format": "^0.13.0",
     "@superset-ui/translation": "^0.13.0"
   }
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.js
index 607403f930a2b..32ab79e0de318 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { formatSelectOptions } from '@superset-ui/control-utils';
+import { formatSelectOptions } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/package.json
index b54ca83a04a6f..bb8a4387d1232 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/package.json
@@ -37,7 +37,7 @@
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
     "@superset-ui/color": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.0",
+    "@superset-ui/chart-controls": "^0.13.0",
     "@superset-ui/core": "^0.13.0",
     "@superset-ui/dimension": "^0.13.3",
     "@superset-ui/number-format": "^0.13.14",
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx
index 1f2968aa30a5d..e44935edac7df 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/src/BigNumber/controlPanel.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { formatSelectOptions, ControlPanelConfig } from '@superset-ui/control-utils';
+import { formatSelectOptions, ControlPanelConfig } from '@superset-ui/chart-controls';
 import React from 'react';
 import { headerFontSize, subheaderFontSize } from '../sharedControls';
 
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts
index 1165155a618f5..c7330066a4a61 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/src/sharedControls.ts
@@ -19,7 +19,7 @@
 
 // These are control configurations that are shared ONLY within the BigNumber viz plugin repo.
 import { t } from '@superset-ui/translation';
-import { CustomControlItem } from '@superset-ui/control-utils';
+import { CustomControlItem } from '@superset-ui/chart-controls';
 
 export const headerFontSize: CustomControlItem = {
   name: 'header_font_size',
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/package.json
index 8858a390dd380..62fc1dc1bfcd7 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/package.json
@@ -43,7 +43,7 @@
   "peerDependencies": {
     "@superset-ui/chart": "^0.13.0",
     "@superset-ui/color": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.9",
+    "@superset-ui/chart-controls": "^0.13.9",
     "@superset-ui/core": "^0.13.0",
     "@superset-ui/dimension": "^0.13.0",
     "@superset-ui/number-format": "^0.13.0",
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts
index eb0c7f7c81eff..afbdf76f3c3cf 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { sections } from '@superset-ui/control-utils';
+import { sections } from '@superset-ui/chart-controls';
 import {
   lineInterpolation,
   showBrush,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts
index 9413acdd5a358..3c8dd933d33ef 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { sections } from '@superset-ui/control-utils';
+import { sections } from '@superset-ui/chart-controls';
 import {
   lineInterpolation,
   showBrush,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts
index abbce843c5081..1d98ba8575ad7 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bubble/controlPanel.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { D3_FORMAT_OPTIONS, formatSelectOptions } from '@superset-ui/control-utils';
+import { D3_FORMAT_OPTIONS, formatSelectOptions } from '@superset-ui/chart-controls';
 import {
   showLegend,
   xAxisLabel,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts
index d7f3a10edd45e..5fd46309adec4 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { sections } from '@superset-ui/control-utils';
+import { sections } from '@superset-ui/chart-controls';
 import {
   xAxisLabel,
   yAxisLabel,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts
index 5a24b140a90fe..ec6b30364c915 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/DualLine/controlPanel.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { sections } from '@superset-ui/control-utils';
+import { sections } from '@superset-ui/chart-controls';
 import { xAxisFormat, yAxis2Format } from '../NVD3Controls';
 
 export default {
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts
index 6988973698dcb..447fd6996ee66 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { sections } from '@superset-ui/control-utils';
+import { sections } from '@superset-ui/chart-controls';
 import {
   lineInterpolation,
   showBrush,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts
index 617762bc62854..78ec77bf8b6ad 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/LineMulti/controlPanel.ts
@@ -19,7 +19,7 @@
  */
 import { t } from '@superset-ui/translation';
 import { validateNonEmpty } from '@superset-ui/validator';
-import { D3_TIME_FORMAT_OPTIONS, sections } from '@superset-ui/control-utils';
+import { D3_TIME_FORMAT_OPTIONS, sections } from '@superset-ui/chart-controls';
 import {
   lineInterpolation,
   showLegend,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx
index 3ace1147af79c..79d9f700535d9 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx
@@ -24,7 +24,7 @@ import {
   D3_TIME_FORMAT_OPTIONS,
   D3_FORMAT_DOCS,
   D3_FORMAT_OPTIONS,
-} from '@superset-ui/control-utils';
+} from '@superset-ui/chart-controls';
 
 /*
   Plugins in question:
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts
index 970222897147b..8ec50677ceec8 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Pie/controlPanel.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { D3_FORMAT_OPTIONS } from '@superset-ui/control-utils';
+import { D3_FORMAT_OPTIONS } from '@superset-ui/chart-controls';
 import { showLegend } from '../NVD3Controls';
 
 export default {
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/TimePivot/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/TimePivot/controlPanel.ts
index 02503f70199e7..67e536ac0f0e3 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/TimePivot/controlPanel.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/TimePivot/controlPanel.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { D3_FORMAT_OPTIONS } from '@superset-ui/control-utils';
+import { D3_FORMAT_OPTIONS } from '@superset-ui/chart-controls';
 import {
   lineInterpolation,
   showLegend,
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/package.json
index 1c36656852a20..1df2ab490ba8b 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/package.json
@@ -43,7 +43,7 @@
     "@superset-ui/chart": "^0.13.0",
     "@superset-ui/chart-composition": "^0.13.0",
     "@superset-ui/color": "^0.13.0",
-    "@superset-ui/control-utils": "^0.13.9",
+    "@superset-ui/chart-controls": "^0.13.9",
     "@superset-ui/core": "^0.13.0",
     "@superset-ui/dimension": "^0.13.0",
     "@superset-ui/number-format": "^0.13.0",
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/controlPanel.ts
index 0c61245165643..a76bd135d9e0a 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/controlPanel.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/src/BoxPlot/controlPanel.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
-import { formatSelectOptions } from '@superset-ui/control-utils';
+import { formatSelectOptions } from '@superset-ui/chart-controls';
 
 export default {
   controlPanelSections: [