diff --git a/core/interfaces/i_keyboard_accessible.js b/core/interfaces/i_keyboard_accessible.js
index 5807e47bf..3720ddc08 100644
--- a/core/interfaces/i_keyboard_accessible.js
+++ b/core/interfaces/i_keyboard_accessible.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.IKeyboardAccessible');
+goog.module('Blockly.IKeyboardAccessible');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.ShortcutRegistry');
 
@@ -20,11 +21,13 @@ goog.requireType('Blockly.ShortcutRegistry');
  * An interface for an object that handles keyboard shortcuts.
  * @interface
  */
-Blockly.IKeyboardAccessible = function() {};
+const IKeyboardAccessible = function() {};
 
 /**
  * Handles the given keyboard shortcut.
  * @param {!Blockly.ShortcutRegistry.KeyboardShortcut} shortcut The shortcut to be handled.
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  */
-Blockly.IKeyboardAccessible.prototype.onShortcut;
+IKeyboardAccessible.prototype.onShortcut;
+
+exports = IKeyboardAccessible;
diff --git a/tests/deps.js b/tests/deps.js
index 9346e750f..188e4ed43 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -89,7 +89,7 @@ goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteAr
 goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], []);
-goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], []);
+goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], []);
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});