diff --git a/generators/javascript/loops.js b/generators/javascript/loops.js
index ffb9d094c..0626f37e4 100644
--- a/generators/javascript/loops.js
+++ b/generators/javascript/loops.js
@@ -6,17 +6,17 @@
 
 /**
  * @fileoverview Generating JavaScript for loop blocks.
- * @suppress {missingRequire}
  */
 'use strict';
 
-goog.provide('Blockly.JavaScript.loops');
+goog.module('Blockly.JavaScript.loops');
 
-goog.require('Blockly.JavaScript');
-goog.require('Blockly.utils.string');
+const stringUtils = goog.require('Blockly.utils.string');
+const JavaScript = goog.require('Blockly.JavaScript');
+const {NameType} = goog.require('Blockly.Names');
 
 
-Blockly.JavaScript['controls_repeat_ext'] = function(block) {
+JavaScript['controls_repeat_ext'] = function(block) {
   // Repeat n times.
   let repeats;
   if (block.getField('TIMES')) {
@@ -24,64 +24,63 @@ Blockly.JavaScript['controls_repeat_ext'] = function(block) {
     repeats = String(Number(block.getFieldValue('TIMES')));
   } else {
     // External number.
-    repeats = Blockly.JavaScript.valueToCode(block, 'TIMES',
-        Blockly.JavaScript.ORDER_ASSIGNMENT) || '0';
+    repeats =
+        JavaScript.valueToCode(block, 'TIMES', JavaScript.ORDER_ASSIGNMENT) ||
+        '0';
   }
-  let branch = Blockly.JavaScript.statementToCode(block, 'DO');
-  branch = Blockly.JavaScript.addLoopTrap(branch, block);
+  let branch = JavaScript.statementToCode(block, 'DO');
+  branch = JavaScript.addLoopTrap(branch, block);
   let code = '';
-  const loopVar = Blockly.JavaScript.nameDB_.getDistinctName(
-      'count', Blockly.VARIABLE_CATEGORY_NAME);
+  const loopVar =
+      JavaScript.nameDB_.getDistinctName('count', NameType.VARIABLE);
   let endVar = repeats;
-  if (!repeats.match(/^\w+$/) && !Blockly.utils.string.isNumber(repeats)) {
-    endVar = Blockly.JavaScript.nameDB_.getDistinctName(
-        'repeat_end', Blockly.VARIABLE_CATEGORY_NAME);
+  if (!repeats.match(/^\w+$/) && !stringUtils.isNumber(repeats)) {
+    endVar =
+        JavaScript.nameDB_.getDistinctName('repeat_end', NameType.VARIABLE);
     code += 'var ' + endVar + ' = ' + repeats + ';\n';
   }
-  code += 'for (var ' + loopVar + ' = 0; ' +
-      loopVar + ' < ' + endVar + '; ' +
-      loopVar + '++) {\n' +
-      branch + '}\n';
+  code += 'for (var ' + loopVar + ' = 0; ' + loopVar + ' < ' + endVar + '; ' +
+      loopVar + '++) {\n' + branch + '}\n';
   return code;
 };
 
-Blockly.JavaScript['controls_repeat'] =
-    Blockly.JavaScript['controls_repeat_ext'];
+JavaScript['controls_repeat'] = JavaScript['controls_repeat_ext'];
 
-Blockly.JavaScript['controls_whileUntil'] = function(block) {
+JavaScript['controls_whileUntil'] = function(block) {
   // Do while/until loop.
   const until = block.getFieldValue('MODE') === 'UNTIL';
-  let argument0 = Blockly.JavaScript.valueToCode(block, 'BOOL',
-      until ? Blockly.JavaScript.ORDER_LOGICAL_NOT :
-      Blockly.JavaScript.ORDER_NONE) || 'false';
-  let branch = Blockly.JavaScript.statementToCode(block, 'DO');
-  branch = Blockly.JavaScript.addLoopTrap(branch, block);
+  let argument0 =
+      JavaScript.valueToCode(
+          block, 'BOOL',
+          until ? JavaScript.ORDER_LOGICAL_NOT : JavaScript.ORDER_NONE) ||
+      'false';
+  let branch = JavaScript.statementToCode(block, 'DO');
+  branch = JavaScript.addLoopTrap(branch, block);
   if (until) {
     argument0 = '!' + argument0;
   }
   return 'while (' + argument0 + ') {\n' + branch + '}\n';
 };
 
-Blockly.JavaScript['controls_for'] = function(block) {
+JavaScript['controls_for'] = function(block) {
   // For loop.
-  const variable0 = Blockly.JavaScript.nameDB_.getName(
-      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
-  const argument0 = Blockly.JavaScript.valueToCode(block, 'FROM',
-      Blockly.JavaScript.ORDER_ASSIGNMENT) || '0';
-  const argument1 = Blockly.JavaScript.valueToCode(block, 'TO',
-      Blockly.JavaScript.ORDER_ASSIGNMENT) || '0';
-  const increment = Blockly.JavaScript.valueToCode(block, 'BY',
-      Blockly.JavaScript.ORDER_ASSIGNMENT) || '1';
-  let branch = Blockly.JavaScript.statementToCode(block, 'DO');
-  branch = Blockly.JavaScript.addLoopTrap(branch, block);
+  const variable0 =
+      JavaScript.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
+  const argument0 =
+      JavaScript.valueToCode(block, 'FROM', JavaScript.ORDER_ASSIGNMENT) || '0';
+  const argument1 =
+      JavaScript.valueToCode(block, 'TO', JavaScript.ORDER_ASSIGNMENT) || '0';
+  const increment =
+      JavaScript.valueToCode(block, 'BY', JavaScript.ORDER_ASSIGNMENT) || '1';
+  let branch = JavaScript.statementToCode(block, 'DO');
+  branch = JavaScript.addLoopTrap(branch, block);
   let code;
-  if (Blockly.utils.string.isNumber(argument0) && Blockly.utils.string.isNumber(argument1) &&
-      Blockly.utils.string.isNumber(increment)) {
+  if (stringUtils.isNumber(argument0) && stringUtils.isNumber(argument1) &&
+      stringUtils.isNumber(increment)) {
     // All arguments are simple numbers.
     const up = Number(argument0) <= Number(argument1);
-    code = 'for (' + variable0 + ' = ' + argument0 + '; ' +
-        variable0 + (up ? ' <= ' : ' >= ') + argument1 + '; ' +
-        variable0;
+    code = 'for (' + variable0 + ' = ' + argument0 + '; ' + variable0 +
+        (up ? ' <= ' : ' >= ') + argument1 + '; ' + variable0;
     const step = Math.abs(Number(increment));
     if (step === 1) {
       code += up ? '++' : '--';
@@ -93,86 +92,82 @@ Blockly.JavaScript['controls_for'] = function(block) {
     code = '';
     // Cache non-trivial values to variables to prevent repeated look-ups.
     let startVar = argument0;
-    if (!argument0.match(/^\w+$/) && !Blockly.utils.string.isNumber(argument0)) {
-      startVar = Blockly.JavaScript.nameDB_.getDistinctName(
-          variable0 + '_start', Blockly.VARIABLE_CATEGORY_NAME);
+    if (!argument0.match(/^\w+$/) && !stringUtils.isNumber(argument0)) {
+      startVar = JavaScript.nameDB_.getDistinctName(
+          variable0 + '_start', NameType.VARIABLE);
       code += 'var ' + startVar + ' = ' + argument0 + ';\n';
     }
     let endVar = argument1;
-    if (!argument1.match(/^\w+$/) && !Blockly.utils.string.isNumber(argument1)) {
-      endVar = Blockly.JavaScript.nameDB_.getDistinctName(
-          variable0 + '_end', Blockly.VARIABLE_CATEGORY_NAME);
+    if (!argument1.match(/^\w+$/) && !stringUtils.isNumber(argument1)) {
+      endVar = JavaScript.nameDB_.getDistinctName(
+          variable0 + '_end', NameType.VARIABLE);
       code += 'var ' + endVar + ' = ' + argument1 + ';\n';
     }
     // Determine loop direction at start, in case one of the bounds
     // changes during loop execution.
-    const incVar = Blockly.JavaScript.nameDB_.getDistinctName(
-        variable0 + '_inc', Blockly.VARIABLE_CATEGORY_NAME);
+    const incVar = JavaScript.nameDB_.getDistinctName(
+        variable0 + '_inc', NameType.VARIABLE);
     code += 'var ' + incVar + ' = ';
-    if (Blockly.utils.string.isNumber(increment)) {
+    if (stringUtils.isNumber(increment)) {
       code += Math.abs(increment) + ';\n';
     } else {
       code += 'Math.abs(' + increment + ');\n';
     }
     code += 'if (' + startVar + ' > ' + endVar + ') {\n';
-    code += Blockly.JavaScript.INDENT + incVar + ' = -' + incVar + ';\n';
+    code += JavaScript.INDENT + incVar + ' = -' + incVar + ';\n';
     code += '}\n';
-    code += 'for (' + variable0 + ' = ' + startVar + '; ' +
-        incVar + ' >= 0 ? ' +
-        variable0 + ' <= ' + endVar + ' : ' +
-        variable0 + ' >= ' + endVar + '; ' +
-        variable0 + ' += ' + incVar + ') {\n' +
+    code += 'for (' + variable0 + ' = ' + startVar + '; ' + incVar +
+        ' >= 0 ? ' + variable0 + ' <= ' + endVar + ' : ' + variable0 +
+        ' >= ' + endVar + '; ' + variable0 + ' += ' + incVar + ') {\n' +
         branch + '}\n';
   }
   return code;
 };
 
-Blockly.JavaScript['controls_forEach'] = function(block) {
+JavaScript['controls_forEach'] = function(block) {
   // For each loop.
-  const variable0 = Blockly.JavaScript.nameDB_.getName(
-      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
-  const argument0 = Blockly.JavaScript.valueToCode(block, 'LIST',
-      Blockly.JavaScript.ORDER_ASSIGNMENT) || '[]';
-  let branch = Blockly.JavaScript.statementToCode(block, 'DO');
-  branch = Blockly.JavaScript.addLoopTrap(branch, block);
+  const variable0 =
+      JavaScript.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
+  const argument0 =
+      JavaScript.valueToCode(block, 'LIST', JavaScript.ORDER_ASSIGNMENT) ||
+      '[]';
+  let branch = JavaScript.statementToCode(block, 'DO');
+  branch = JavaScript.addLoopTrap(branch, block);
   let code = '';
   // Cache non-trivial values to variables to prevent repeated look-ups.
   let listVar = argument0;
   if (!argument0.match(/^\w+$/)) {
-    listVar = Blockly.JavaScript.nameDB_.getDistinctName(
-        variable0 + '_list', Blockly.VARIABLE_CATEGORY_NAME);
+    listVar = JavaScript.nameDB_.getDistinctName(
+        variable0 + '_list', NameType.VARIABLE);
     code += 'var ' + listVar + ' = ' + argument0 + ';\n';
   }
-  const indexVar = Blockly.JavaScript.nameDB_.getDistinctName(
-      variable0 + '_index', Blockly.VARIABLE_CATEGORY_NAME);
-  branch = Blockly.JavaScript.INDENT + variable0 + ' = ' +
-      listVar + '[' + indexVar + '];\n' + branch;
+  const indexVar = JavaScript.nameDB_.getDistinctName(
+      variable0 + '_index', NameType.VARIABLE);
+  branch = JavaScript.INDENT + variable0 + ' = ' + listVar + '[' + indexVar +
+      '];\n' + branch;
   code += 'for (var ' + indexVar + ' in ' + listVar + ') {\n' + branch + '}\n';
   return code;
 };
 
-Blockly.JavaScript['controls_flow_statements'] = function(block) {
+JavaScript['controls_flow_statements'] = function(block) {
   // Flow statements: continue, break.
   let xfix = '';
-  if (Blockly.JavaScript.STATEMENT_PREFIX) {
+  if (JavaScript.STATEMENT_PREFIX) {
     // Automatic prefix insertion is switched off for this block.  Add manually.
-    xfix += Blockly.JavaScript.injectId(Blockly.JavaScript.STATEMENT_PREFIX,
-        block);
+    xfix += JavaScript.injectId(JavaScript.STATEMENT_PREFIX, block);
   }
-  if (Blockly.JavaScript.STATEMENT_SUFFIX) {
+  if (JavaScript.STATEMENT_SUFFIX) {
     // Inject any statement suffix here since the regular one at the end
     // will not get executed if the break/continue is triggered.
-    xfix += Blockly.JavaScript.injectId(Blockly.JavaScript.STATEMENT_SUFFIX,
-        block);
+    xfix += JavaScript.injectId(JavaScript.STATEMENT_SUFFIX, block);
   }
-  if (Blockly.JavaScript.STATEMENT_PREFIX) {
+  if (JavaScript.STATEMENT_PREFIX) {
     const loop = block.getSurroundLoop();
     if (loop && !loop.suppressPrefixSuffix) {
       // Inject loop's statement prefix here since the regular one at the end
       // of the loop will not get executed if 'continue' is triggered.
       // In the case of 'break', a prefix is needed due to the loop's suffix.
-      xfix += Blockly.JavaScript.injectId(Blockly.JavaScript.STATEMENT_PREFIX,
-          loop);
+      xfix += JavaScript.injectId(JavaScript.STATEMENT_PREFIX, loop);
     }
   }
   switch (block.getFieldValue('FLOW')) {
diff --git a/tests/deps.js b/tests/deps.js
index b80e77039..e5ed27c44 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -281,7 +281,7 @@ goog.addDependency('../../generators/javascript/all.js', ['Blockly.JavaScript.al
 goog.addDependency('../../generators/javascript/colour.js', ['Blockly.JavaScript.colour'], ['Blockly.JavaScript'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../generators/javascript/lists.js', ['Blockly.JavaScript.lists'], ['Blockly.JavaScript', 'Blockly.Names'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../generators/javascript/logic.js', ['Blockly.JavaScript.logic'], ['Blockly.JavaScript'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../generators/javascript/loops.js', ['Blockly.JavaScript.loops'], ['Blockly.JavaScript', 'Blockly.utils.string'], {'lang': 'es6'});
+goog.addDependency('../../generators/javascript/loops.js', ['Blockly.JavaScript.loops'], ['Blockly.JavaScript', 'Blockly.Names', 'Blockly.utils.string'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../generators/javascript/math.js', ['Blockly.JavaScript.math'], ['Blockly.JavaScript', 'Blockly.Names'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../generators/javascript/procedures.js', ['Blockly.JavaScript.procedures'], ['Blockly.JavaScript', 'Blockly.Names'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../generators/javascript/text.js', ['Blockly.JavaScript.texts'], ['Blockly.JavaScript', 'Blockly.Names'], {'lang': 'es6', 'module': 'goog'});