diff --git a/core/interfaces/i_component.js b/core/interfaces/i_component.js
index efb195966..d1acc592f 100644
--- a/core/interfaces/i_component.js
+++ b/core/interfaces/i_component.js
@@ -12,7 +12,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IComponent');
+goog.module('Blockly.IComponent');
+goog.module.declareLegacyNamespace();
 
 
 /**
@@ -20,11 +21,13 @@ goog.provide('Blockly.IComponent');
  * ComponentManager.
  * @interface
  */
-Blockly.IComponent = function() {};
+const IComponent = function() {};
 
 /**
  * The unique id for this component that is used to register with the
  * ComponentManager.
  * @type {string}
  */
-Blockly.IComponent.id;
+IComponent.id;
+
+exports = IComponent;
diff --git a/tests/deps.js b/tests/deps.js
index ac9153ec9..ed2af0dc9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -78,7 +78,7 @@ goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHid
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable']);
-goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], []);
+goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], []);
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], []);
 goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], []);