diff --git a/core/interfaces/i_ast_node_location_with_block.js b/core/interfaces/i_ast_node_location_with_block.js
index 612ef0e73..85606e546 100644
--- a/core/interfaces/i_ast_node_location_with_block.js
+++ b/core/interfaces/i_ast_node_location_with_block.js
@@ -12,7 +12,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IASTNodeLocationWithBlock');
+goog.module('Blockly.IASTNodeLocationWithBlock');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IASTNodeLocation');
 goog.requireType('Blockly.Block');
@@ -23,10 +24,12 @@ goog.requireType('Blockly.Block');
  * @interface
  * @extends {Blockly.IASTNodeLocation}
  */
-Blockly.IASTNodeLocationWithBlock = function() {};
+const IASTNodeLocationWithBlock = function() {};
 
 /**
  * Get the source block associated with this node.
  * @return {Blockly.Block} The source block.
  */
-Blockly.IASTNodeLocationWithBlock.prototype.getSourceBlock;
+IASTNodeLocationWithBlock.prototype.getSourceBlock;
+
+exports = IASTNodeLocationWithBlock;
diff --git a/tests/deps.js b/tests/deps.js
index d2f153f3c..9346e750f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -75,7 +75,7 @@ goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockl
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es5'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], ['Blockly.IASTNodeLocation']);
+goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent']);
 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'});