diff --git a/core/interfaces/i_ast_node_location_svg.js b/core/interfaces/i_ast_node_location_svg.js
index 7711289b1..cf7c1e1cf 100644
--- a/core/interfaces/i_ast_node_location_svg.js
+++ b/core/interfaces/i_ast_node_location_svg.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IASTNodeLocationSvg');
+goog.module('Blockly.IASTNodeLocationSvg');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IASTNodeLocation');
 
@@ -21,18 +22,20 @@ goog.require('Blockly.IASTNodeLocation');
  * @interface
  * @extends {Blockly.IASTNodeLocation}
  */
-Blockly.IASTNodeLocationSvg = function() {};
+const IASTNodeLocationSvg = function() {};
 
 /**
  * Add the marker SVG to this node's SVG group.
  * @param {SVGElement} markerSvg The SVG root of the marker to be added to the
  *     SVG group.
  */
-Blockly.IASTNodeLocationSvg.prototype.setMarkerSvg;
+IASTNodeLocationSvg.prototype.setMarkerSvg;
 
 /**
  * Add the cursor SVG to this node's SVG group.
  * @param {SVGElement} cursorSvg The SVG root of the cursor to be added to the
  *     SVG group.
  */
-Blockly.IASTNodeLocationSvg.prototype.setCursorSvg;
+IASTNodeLocationSvg.prototype.setCursorSvg;
+
+exports = IASTNodeLocationSvg;
diff --git a/tests/deps.js b/tests/deps.js
index 274980325..d2f153f3c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -74,7 +74,7 @@ goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connectio
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
 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']);
+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_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent']);
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});