diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index ab839daff..2d0e0957b 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -10,39 +10,39 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.MarkerMove');
+goog.module('Blockly.Events.MarkerMove');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.ASTNode');
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.Workspace');
+const ASTNode = goog.require('Blockly.ASTNode');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a marker move event.
- * @param {?Blockly.Block=} opt_block The affected block. Null if current node
+ * @param {?Block=} opt_block The affected block. Null if current node
  *    is of type workspace. Undefined for a blank event.
  * @param {boolean=} isCursor Whether this is a cursor event. Undefined for a
  *    blank event.
- * @param {?Blockly.ASTNode=} opt_oldNode The old node the marker used to be on.
+ * @param {?ASTNode=} opt_oldNode The old node the marker used to be on.
  *    Undefined for a blank event.
- * @param {!Blockly.ASTNode=} opt_newNode The new node the marker is now on.
+ * @param {!ASTNode=} opt_newNode The new node the marker is now on.
  *    Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
-Blockly.Events.MarkerMove = function(opt_block, isCursor, opt_oldNode,
-    opt_newNode) {
-  var workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  if (opt_newNode && opt_newNode.getType() == Blockly.ASTNode.types.WORKSPACE) {
-    workspaceId =
-        (/** @type {!Blockly.Workspace} */ (opt_newNode.getLocation())).id;
+const MarkerMove = function(opt_block, isCursor, opt_oldNode, opt_newNode) {
+  let workspaceId = opt_block ? opt_block.workspace.id : undefined;
+  if (opt_newNode && opt_newNode.getType() == ASTNode.types.WORKSPACE) {
+    workspaceId = (/** @type {!Workspace} */ (opt_newNode.getLocation())).id;
   }
-  Blockly.Events.MarkerMove.superClass_.constructor.call(this, workspaceId);
+  MarkerMove.superClass_.constructor.call(this, workspaceId);
 
   /**
    * The workspace identifier for this event.
@@ -52,13 +52,13 @@ Blockly.Events.MarkerMove = function(opt_block, isCursor, opt_oldNode,
 
   /**
    * The old node the marker used to be on.
-   * @type {?Blockly.ASTNode|undefined}
+   * @type {?ASTNode|undefined}
    */
   this.oldNode = opt_oldNode;
 
   /**
    * The new node the  marker is now on.
-   * @type {Blockly.ASTNode|undefined}
+   * @type {ASTNode|undefined}
    */
   this.newNode = opt_newNode;
 
@@ -68,20 +68,20 @@ Blockly.Events.MarkerMove = function(opt_block, isCursor, opt_oldNode,
    */
   this.isCursor = isCursor;
 };
-Blockly.utils.object.inherits(Blockly.Events.MarkerMove, Blockly.Events.UiBase);
+object.inherits(MarkerMove, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE;
+MarkerMove.prototype.type = Events.MARKER_MOVE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.MarkerMove.prototype.toJson = function() {
-  var json = Blockly.Events.MarkerMove.superClass_.toJson.call(this);
+MarkerMove.prototype.toJson = function() {
+  const json = MarkerMove.superClass_.toJson.call(this);
   json['isCursor'] = this.isCursor;
   json['blockId'] = this.blockId;
   json['oldNode'] = this.oldNode;
@@ -93,13 +93,14 @@ Blockly.Events.MarkerMove.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.MarkerMove.prototype.fromJson = function(json) {
-  Blockly.Events.MarkerMove.superClass_.fromJson.call(this, json);
+MarkerMove.prototype.fromJson = function(json) {
+  MarkerMove.superClass_.fromJson.call(this, json);
   this.isCursor = json['isCursor'];
   this.blockId = json['blockId'];
   this.oldNode = json['oldNode'];
   this.newNode = json['newNode'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.MARKER_MOVE, Blockly.Events.MarkerMove);
+registry.register(registry.Type.EVENT, Events.MARKER_MOVE, MarkerMove);
+
+exports = MarkerMove;
diff --git a/tests/deps.js b/tests/deps.js
index 1e9ef54f4..cdb39710c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -39,7 +39,7 @@ goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abst
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);