diff --git a/plugins/block-plus-minus/src/if.js b/plugins/block-plus-minus/src/if.js
index 11d7b732d5..ee014cf3b8 100644
--- a/plugins/block-plus-minus/src/if.js
+++ b/plugins/block-plus-minus/src/if.js
@@ -8,7 +8,7 @@
  * @fileoverview Changes the if block to use a +/- mutator UI.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 import {createMinusField} from './field_minus';
 import {createPlusField} from './field_plus';
 
diff --git a/plugins/block-plus-minus/src/list_create.js b/plugins/block-plus-minus/src/list_create.js
index ccc01694f5..e937ff8f76 100644
--- a/plugins/block-plus-minus/src/list_create.js
+++ b/plugins/block-plus-minus/src/list_create.js
@@ -8,7 +8,7 @@
  * @fileoverview Changes the list_create block to use a +/- mutator UI.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 import {createPlusField} from './field_plus';
 import {createMinusField} from './field_minus';
 
diff --git a/plugins/block-plus-minus/src/procedures.js b/plugins/block-plus-minus/src/procedures.js
index 78589d4f18..7ecf4093ed 100644
--- a/plugins/block-plus-minus/src/procedures.js
+++ b/plugins/block-plus-minus/src/procedures.js
@@ -8,7 +8,7 @@
  * @fileoverview Changes the procedure blocks to use a +/- mutator UI.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 import {createMinusField} from './field_minus';
 import {createPlusField} from './field_plus';
 
diff --git a/plugins/block-plus-minus/src/text_join.js b/plugins/block-plus-minus/src/text_join.js
index 0ee8dde378..f4267a9990 100644
--- a/plugins/block-plus-minus/src/text_join.js
+++ b/plugins/block-plus-minus/src/text_join.js
@@ -8,7 +8,7 @@
  * @fileoverview Changes the text_join block to use a +/- mutator UI.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 import {createPlusField} from './field_plus';
 import {createMinusField} from './field_minus';
 
diff --git a/plugins/block-test/src/serialization/blocks.js b/plugins/block-test/src/serialization/blocks.js
index 7703be887c..bb7d6a0aee 100644
--- a/plugins/block-test/src/serialization/blocks.js
+++ b/plugins/block-test/src/serialization/blocks.js
@@ -7,7 +7,7 @@
 
 'use strict';
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 import './fields';
 
 Blockly.defineBlocksWithJsonArray([
diff --git a/plugins/block-test/src/serialization/category.js b/plugins/block-test/src/serialization/category.js
index 22d73337a2..776f1bd892 100644
--- a/plugins/block-test/src/serialization/category.js
+++ b/plugins/block-test/src/serialization/category.js
@@ -6,7 +6,7 @@
 
 'use strict';
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 import './blocks';
 
 /**
diff --git a/plugins/block-test/src/serialization/fields.js b/plugins/block-test/src/serialization/fields.js
index 9655ae5d0c..0c687225c2 100644
--- a/plugins/block-test/src/serialization/fields.js
+++ b/plugins/block-test/src/serialization/fields.js
@@ -6,7 +6,7 @@
 
 'use strict';
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 /**
  * Field that does not override any serialization hooks.
diff --git a/plugins/dev-create/templates/block/template/src/index.js b/plugins/dev-create/templates/block/template/src/index.js
index a510970d7b..2d2a5c99c4 100644
--- a/plugins/dev-create/templates/block/template/src/index.js
+++ b/plugins/dev-create/templates/block/template/src/index.js
@@ -9,7 +9,7 @@
  * @fileoverview Block overview.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 // TODO: Update block definition.
 Blockly.defineBlocksWithJsonArray([
diff --git a/plugins/dev-create/templates/field/template/src/index.js b/plugins/dev-create/templates/field/template/src/index.js
index 8d9b8d32bc..1d10505b5d 100644
--- a/plugins/dev-create/templates/field/template/src/index.js
+++ b/plugins/dev-create/templates/field/template/src/index.js
@@ -9,7 +9,7 @@
  * @fileoverview Field overview.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 // TODO: Rename field and update description.
 /**
diff --git a/plugins/dev-create/templates/theme/template/src/index.js b/plugins/dev-create/templates/theme/template/src/index.js
index 86b3d471eb..a03b6b9948 100644
--- a/plugins/dev-create/templates/theme/template/src/index.js
+++ b/plugins/dev-create/templates/theme/template/src/index.js
@@ -9,7 +9,7 @@
  * @fileoverview Theme overview.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 // TODO: Edit theme name.
 export default Blockly.Theme.defineTheme('THEME_NAME', {
diff --git a/plugins/dev-create/templates/typescript-block/template/src/index.ts b/plugins/dev-create/templates/typescript-block/template/src/index.ts
index a510970d7b..2d2a5c99c4 100644
--- a/plugins/dev-create/templates/typescript-block/template/src/index.ts
+++ b/plugins/dev-create/templates/typescript-block/template/src/index.ts
@@ -9,7 +9,7 @@
  * @fileoverview Block overview.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 // TODO: Update block definition.
 Blockly.defineBlocksWithJsonArray([
diff --git a/plugins/dev-tools/src/debugDrawer.js b/plugins/dev-tools/src/debugDrawer.js
index ebd2d36d00..4950b8abe4 100644
--- a/plugins/dev-tools/src/debugDrawer.js
+++ b/plugins/dev-tools/src/debugDrawer.js
@@ -8,7 +8,7 @@
  * @fileoverview Visualizer for debugging custom renderers in Blockly.
  * @author fenichel@google.com (Rachel Fenichel)
  */
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 /**
  * A basic visualizer for debugging custom renderers.
diff --git a/plugins/dev-tools/src/populateRandom.js b/plugins/dev-tools/src/populateRandom.js
index b98c6a8b35..422a725893 100644
--- a/plugins/dev-tools/src/populateRandom.js
+++ b/plugins/dev-tools/src/populateRandom.js
@@ -8,7 +8,7 @@
  * @fileoverview Helper for randomly populating a workspace.
  * @author fenichel@google.com (Rachel Fenichel)
  */
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 /**
  * Populate the workspace with a random set of blocks, for testing.
diff --git a/plugins/dev-tools/src/screenshot.js b/plugins/dev-tools/src/screenshot.js
index fb29fc2b24..a704268b83 100644
--- a/plugins/dev-tools/src/screenshot.js
+++ b/plugins/dev-tools/src/screenshot.js
@@ -8,7 +8,7 @@
  * @fileoverview Download screenshot.
  * @author samelh@google.com (Sam El-Husseini)
  */
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 /**
  * Convert an SVG datauri into a PNG datauri.
diff --git a/plugins/dev-tools/src/spaghetti.js b/plugins/dev-tools/src/spaghetti.js
index 216a821c31..bc0b525651 100644
--- a/plugins/dev-tools/src/spaghetti.js
+++ b/plugins/dev-tools/src/spaghetti.js
@@ -9,7 +9,7 @@
  * blocks, for testing.
  * @author samelh@google.com (Sam El-Husseini)
  */
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 const spaghettiXml = [
   '  <block type="controls_if">',
diff --git a/plugins/field-bitmap/src/field-bitmap.ts b/plugins/field-bitmap/src/field-bitmap.ts
index 336b9d3092..3819a0aa4b 100644
--- a/plugins/field-bitmap/src/field-bitmap.ts
+++ b/plugins/field-bitmap/src/field-bitmap.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 export const DEFAULT_HEIGHT = 5;
 export const DEFAULT_WIDTH = 5;
diff --git a/plugins/fixed-edges/src/index.js b/plugins/fixed-edges/src/index.js
index 05d84871c9..096d47477a 100644
--- a/plugins/fixed-edges/src/index.js
+++ b/plugins/fixed-edges/src/index.js
@@ -9,7 +9,7 @@
  * configurable.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 /**
  * @typedef {{
diff --git a/plugins/migration/test/rename.mocha.js b/plugins/migration/test/rename.mocha.js
index ab869591cf..675597e9c9 100644
--- a/plugins/migration/test/rename.mocha.js
+++ b/plugins/migration/test/rename.mocha.js
@@ -53,7 +53,7 @@ suite('Rename', function () {
       ],
     };
     const oldString = `
-import Blockly from 'blockly';
+import * as Blockly from 'blockly';
 
 class SubClass extends Blockly.moduleC {
   constructor() {
@@ -81,7 +81,7 @@ class SubClass extends Blockly.moduleC {
     const newString = new Renamer(database, '0.0.0', '1.0.0').rename(oldString);
 
     const expectedString = `
-import Blockly from 'blockly';
+import * as Blockly from 'blockly';
 
 class SubClass extends Blockly.moduleC.ClassC {
   constructor() {
diff --git a/plugins/scroll-options/src/index.js b/plugins/scroll-options/src/index.js
index 629092d125..d0d9ca05d2 100644
--- a/plugins/scroll-options/src/index.js
+++ b/plugins/scroll-options/src/index.js
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 import {EdgeScrollOptions, ScrollBlockDragger} from './ScrollBlockDragger';
 import {getTranslation} from './utils';
 
diff --git a/plugins/theme-dark/src/index.js b/plugins/theme-dark/src/index.js
index af1f2f4738..7b095dce65 100644
--- a/plugins/theme-dark/src/index.js
+++ b/plugins/theme-dark/src/index.js
@@ -8,7 +8,7 @@
  * @fileoverview Dark theme.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 /**
  * Dark theme.
diff --git a/plugins/theme-deuteranopia/src/index.js b/plugins/theme-deuteranopia/src/index.js
index ea385cf639..78afbf3773 100644
--- a/plugins/theme-deuteranopia/src/index.js
+++ b/plugins/theme-deuteranopia/src/index.js
@@ -8,7 +8,7 @@
  * @fileoverview Deuteranopia theme.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 const defaultBlockStyles = {
   colour_blocks: {
diff --git a/plugins/theme-highcontrast/src/index.js b/plugins/theme-highcontrast/src/index.js
index a8d2d3c2ef..70a0924c6f 100644
--- a/plugins/theme-highcontrast/src/index.js
+++ b/plugins/theme-highcontrast/src/index.js
@@ -10,7 +10,7 @@
  * Darker colours to contrast the white font.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 const defaultBlockStyles = {
   colour_blocks: {
diff --git a/plugins/theme-modern/src/index.js b/plugins/theme-modern/src/index.js
index fcf34d8efa..40f5a79d70 100644
--- a/plugins/theme-modern/src/index.js
+++ b/plugins/theme-modern/src/index.js
@@ -8,7 +8,7 @@
  * @fileoverview Modern theme.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 export default Blockly.Theme.defineTheme('modern', {
   base: Blockly.Themes.Classic,
diff --git a/plugins/theme-tritanopia/src/index.js b/plugins/theme-tritanopia/src/index.js
index d2a9e49d24..17c5b25243 100644
--- a/plugins/theme-tritanopia/src/index.js
+++ b/plugins/theme-tritanopia/src/index.js
@@ -8,7 +8,7 @@
  * @fileoverview Tritanopia theme.
  */
 
-import Blockly from 'blockly/core';
+import * as Blockly from 'blockly/core';
 
 const defaultBlockStyles = {
   colour_blocks: {