diff --git a/core/interfaces/i_collapsible_toolbox_item.js b/core/interfaces/i_collapsible_toolbox_item.js
index 3af4d2692..732c7aab7 100644
--- a/core/interfaces/i_collapsible_toolbox_item.js
+++ b/core/interfaces/i_collapsible_toolbox_item.js
@@ -14,20 +14,20 @@
 goog.module('Blockly.ICollapsibleToolboxItem');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ISelectableToolboxItem');
-goog.requireType('Blockly.IToolboxItem');
+const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem');
+const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 
 
 /**
  * Interface for an item in the toolbox that can be collapsed.
- * @extends {Blockly.ISelectableToolboxItem}
+ * @extends {ISelectableToolboxItem}
  * @interface
  */
 const ICollapsibleToolboxItem = function() {};
 
 /**
  * Gets any children toolbox items. (ex. Gets the subcategories)
- * @return {!Array<!Blockly.IToolboxItem>} The child toolbox items.
+ * @return {!Array<!IToolboxItem>} The child toolbox items.
  */
 ICollapsibleToolboxItem.prototype.getChildToolboxItems;
 
diff --git a/core/interfaces/i_selectable_toolbox_item.js b/core/interfaces/i_selectable_toolbox_item.js
index 535f65401..2addc7b9e 100644
--- a/core/interfaces/i_selectable_toolbox_item.js
+++ b/core/interfaces/i_selectable_toolbox_item.js
@@ -14,13 +14,13 @@
 goog.module('Blockly.ISelectableToolboxItem');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IToolboxItem');
-goog.requireType('Blockly.utils.toolbox');
+const IToolboxItem = goog.require('Blockly.IToolboxItem');
+const {FlyoutItemInfoArray} = goog.requireType('Blockly.utils.toolbox');
 
 
 /**
  * Interface for an item in the toolbox that can be selected.
- * @extends {Blockly.IToolboxItem}
+ * @extends {IToolboxItem}
  * @interface
  */
 const ISelectableToolboxItem = function() {};
@@ -35,7 +35,7 @@ ISelectableToolboxItem.prototype.getName;
 /**
  * Gets the contents of the toolbox item. These are items that are meant to be
  * displayed in the flyout.
- * @return {!Blockly.utils.toolbox.FlyoutItemInfoArray|string} The definition
+ * @return {!FlyoutItemInfoArray|string} The definition
  *     of items to be displayed in the flyout.
  * @public
  */