diff --git a/generators/dart.js b/generators/dart.js
index c5eadde41..444709d91 100644
--- a/generators/dart.js
+++ b/generators/dart.js
@@ -114,7 +114,7 @@ Blockly.Dart.init = function(workspace) {
   var variables = Blockly.Variables.allUsedVarModels(workspace);
   for (var i = 0; i < variables.length; i++) {
     defvars.push(Blockly.Dart.variableDB_.getName(variables[i].getId(),
-        Blockly.Variables.NAME_TYPE));
+        Blockly.VARIABLE_CATEGORY_NAME));
   }
 
   // Declare all of the variables.
@@ -226,7 +226,7 @@ Blockly.Dart.scrub_ = function(block, code, opt_thisOnly) {
       if (block.inputList[i].type == Blockly.INPUT_VALUE) {
         var childBlock = block.inputList[i].connection.targetBlock();
         if (childBlock) {
-          var comment = Blockly.Dart.allNestedComments(childBlock);
+          comment = Blockly.Dart.allNestedComments(childBlock);
           if (comment) {
             commentCode += Blockly.Dart.prefixLines(comment, '// ');
           }
diff --git a/generators/dart/lists.js b/generators/dart/lists.js
index 19ad8871b..37f780de7 100644
--- a/generators/dart/lists.js
+++ b/generators/dart/lists.js
@@ -95,7 +95,7 @@ Blockly.Dart['lists_getIndex'] = function(block) {
   // Closure, which accesses and modifies 'list'.
   function cacheList() {
     var listVar = Blockly.Dart.variableDB_.getDistinctName(
-        'tmp_list', Blockly.Variables.NAME_TYPE);
+        'tmp_list', Blockly.VARIABLE_CATEGORY_NAME);
     var code = 'List ' + listVar + ' = ' + list + ';\n';
     list = listVar;
     return code;
@@ -112,7 +112,7 @@ Blockly.Dart['lists_getIndex'] = function(block) {
       // We can use multiple statements.
       var code = cacheList();
       var xVar = Blockly.Dart.variableDB_.getDistinctName(
-          'tmp_x', Blockly.Variables.NAME_TYPE);
+          'tmp_x', Blockly.VARIABLE_CATEGORY_NAME);
       code += 'int ' + xVar + ' = new Math.Random().nextInt(' + list +
           '.length);\n';
       code += list + '.removeAt(' + xVar + ');\n';
@@ -211,7 +211,7 @@ Blockly.Dart['lists_getIndex'] = function(block) {
         if (mode == 'REMOVE') {
           // We can use multiple statements.
           var xVar = Blockly.Dart.variableDB_.getDistinctName(
-              'tmp_x', Blockly.Variables.NAME_TYPE);
+              'tmp_x', Blockly.VARIABLE_CATEGORY_NAME);
           var code = 'int ' + xVar + ' = new Math.Random().nextInt(' + list +
               '.length);\n';
           code += list + '.removeAt(' + xVar + ');\n';
@@ -259,7 +259,7 @@ Blockly.Dart['lists_setIndex'] = function(block) {
       return '';
     }
     var listVar = Blockly.Dart.variableDB_.getDistinctName(
-        'tmp_list', Blockly.Variables.NAME_TYPE);
+        'tmp_list', Blockly.VARIABLE_CATEGORY_NAME);
     var code = 'List ' + listVar + ' = ' + list + ';\n';
     list = listVar;
     return code;
@@ -308,7 +308,7 @@ Blockly.Dart['lists_setIndex'] = function(block) {
           'import \'dart:math\' as Math;';
       var code = cacheList();
       var xVar = Blockly.Dart.variableDB_.getDistinctName(
-          'tmp_x', Blockly.Variables.NAME_TYPE);
+          'tmp_x', Blockly.VARIABLE_CATEGORY_NAME);
       code += 'int ' + xVar +
           ' = new Math.Random().nextInt(' + list + '.length);\n';
       if (mode == 'SET') {
diff --git a/generators/dart/loops.js b/generators/dart/loops.js
index 63a5dbb7c..3f362162b 100644
--- a/generators/dart/loops.js
+++ b/generators/dart/loops.js
@@ -40,11 +40,11 @@ Blockly.Dart['controls_repeat_ext'] = function(block) {
   branch = Blockly.Dart.addLoopTrap(branch, block);
   var code = '';
   var loopVar = Blockly.Dart.variableDB_.getDistinctName(
-      'count', Blockly.Variables.NAME_TYPE);
+      'count', Blockly.VARIABLE_CATEGORY_NAME);
   var endVar = repeats;
   if (!repeats.match(/^\w+$/) && !Blockly.isNumber(repeats)) {
     var endVar = Blockly.Dart.variableDB_.getDistinctName(
-        'repeat_end', Blockly.Variables.NAME_TYPE);
+        'repeat_end', Blockly.VARIABLE_CATEGORY_NAME);
     code += 'var ' + endVar + ' = ' + repeats + ';\n';
   }
   code += 'for (int ' + loopVar + ' = 0; ' +
@@ -73,7 +73,7 @@ Blockly.Dart['controls_whileUntil'] = function(block) {
 Blockly.Dart['controls_for'] = function(block) {
   // For loop.
   var variable0 = Blockly.Dart.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var argument0 = Blockly.Dart.valueToCode(block, 'FROM',
       Blockly.Dart.ORDER_ASSIGNMENT) || '0';
   var argument1 = Blockly.Dart.valueToCode(block, 'TO',
@@ -103,19 +103,19 @@ Blockly.Dart['controls_for'] = function(block) {
     var startVar = argument0;
     if (!argument0.match(/^\w+$/) && !Blockly.isNumber(argument0)) {
       var startVar = Blockly.Dart.variableDB_.getDistinctName(
-          variable0 + '_start', Blockly.Variables.NAME_TYPE);
+          variable0 + '_start', Blockly.VARIABLE_CATEGORY_NAME);
       code += 'var ' + startVar + ' = ' + argument0 + ';\n';
     }
     var endVar = argument1;
     if (!argument1.match(/^\w+$/) && !Blockly.isNumber(argument1)) {
       var endVar = Blockly.Dart.variableDB_.getDistinctName(
-          variable0 + '_end', Blockly.Variables.NAME_TYPE);
+          variable0 + '_end', Blockly.VARIABLE_CATEGORY_NAME);
       code += 'var ' + endVar + ' = ' + argument1 + ';\n';
     }
     // Determine loop direction at start, in case one of the bounds
     // changes during loop execution.
     var incVar = Blockly.Dart.variableDB_.getDistinctName(
-        variable0 + '_inc', Blockly.Variables.NAME_TYPE);
+        variable0 + '_inc', Blockly.VARIABLE_CATEGORY_NAME);
     code += 'num ' + incVar + ' = ';
     if (Blockly.isNumber(increment)) {
       code += Math.abs(increment) + ';\n';
@@ -138,7 +138,7 @@ Blockly.Dart['controls_for'] = function(block) {
 Blockly.Dart['controls_forEach'] = function(block) {
   // For each loop.
   var variable0 = Blockly.Dart.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var argument0 = Blockly.Dart.valueToCode(block, 'LIST',
       Blockly.Dart.ORDER_ASSIGNMENT) || '[]';
   var branch = Blockly.Dart.statementToCode(block, 'DO');
diff --git a/generators/dart/math.js b/generators/dart/math.js
index 09b36f0e7..95645887e 100644
--- a/generators/dart/math.js
+++ b/generators/dart/math.js
@@ -252,7 +252,7 @@ Blockly.Dart['math_change'] = function(block) {
   var argument0 = Blockly.Dart.valueToCode(block, 'DELTA',
       Blockly.Dart.ORDER_ADDITIVE) || '0';
   var varName = Blockly.Dart.variableDB_.getName(block.getFieldValue('VAR'),
-      Blockly.Variables.NAME_TYPE);
+      Blockly.VARIABLE_CATEGORY_NAME);
   return varName + ' = (' + varName + ' is num ? ' + varName + ' : 0) + ' +
       argument0 + ';\n';
 };
diff --git a/generators/dart/procedures.js b/generators/dart/procedures.js
index 84fe8f759..d21fdfd81 100644
--- a/generators/dart/procedures.js
+++ b/generators/dart/procedures.js
@@ -61,7 +61,7 @@ Blockly.Dart['procedures_defreturn'] = function(block) {
   var args = [];
   for (var i = 0; i < block.arguments_.length; i++) {
     args[i] = Blockly.Dart.variableDB_.getName(block.arguments_[i],
-        Blockly.Variables.NAME_TYPE);
+        Blockly.VARIABLE_CATEGORY_NAME);
   }
   var code = returnType + ' ' + funcName + '(' + args.join(', ') + ') {\n' +
       xfix1 + loopTrap + branch + xfix2 + returnValue + '}';
diff --git a/generators/dart/text.js b/generators/dart/text.js
index bb8c41860..b53eddf2b 100644
--- a/generators/dart/text.js
+++ b/generators/dart/text.js
@@ -64,7 +64,7 @@ Blockly.Dart['text_join'] = function(block) {
 Blockly.Dart['text_append'] = function(block) {
   // Append to a variable in place.
   var varName = Blockly.Dart.variableDB_.getName(block.getFieldValue('VAR'),
-      Blockly.Variables.NAME_TYPE);
+      Blockly.VARIABLE_CATEGORY_NAME);
   var value = Blockly.Dart.valueToCode(block, 'TEXT',
       Blockly.Dart.ORDER_NONE) || '\'\'';
   return varName + ' = [' + varName + ', ' + value + '].join();\n';
diff --git a/generators/dart/variables.js b/generators/dart/variables.js
index 5c8db1b21..dd4d7cf92 100644
--- a/generators/dart/variables.js
+++ b/generators/dart/variables.js
@@ -29,7 +29,7 @@ goog.require('Blockly.Dart');
 Blockly.Dart['variables_get'] = function(block) {
   // Variable getter.
   var code = Blockly.Dart.variableDB_.getName(block.getFieldValue('VAR'),
-      Blockly.Variables.NAME_TYPE);
+      Blockly.VARIABLE_CATEGORY_NAME);
   return [code, Blockly.Dart.ORDER_ATOMIC];
 };
 
@@ -38,6 +38,6 @@ Blockly.Dart['variables_set'] = function(block) {
   var argument0 = Blockly.Dart.valueToCode(block, 'VALUE',
       Blockly.Dart.ORDER_ASSIGNMENT) || '0';
   var varName = Blockly.Dart.variableDB_.getName(block.getFieldValue('VAR'),
-      Blockly.Variables.NAME_TYPE);
+      Blockly.VARIABLE_CATEGORY_NAME);
   return varName + ' = ' + argument0 + ';\n';
 };
diff --git a/generators/javascript.js b/generators/javascript.js
index 29bc0373c..68cdbbd74 100644
--- a/generators/javascript.js
+++ b/generators/javascript.js
@@ -156,7 +156,7 @@ Blockly.JavaScript.init = function(workspace) {
   var variables = Blockly.Variables.allUsedVarModels(workspace);
   for (var i = 0; i < variables.length; i++) {
     defvars.push(Blockly.JavaScript.variableDB_.getName(variables[i].getId(),
-        Blockly.Variables.NAME_TYPE));
+        Blockly.VARIABLE_CATEGORY_NAME));
   }
 
   // Declare all of the variables.
@@ -251,7 +251,7 @@ Blockly.JavaScript.scrub_ = function(block, code, opt_thisOnly) {
       if (block.inputList[i].type == Blockly.INPUT_VALUE) {
         var childBlock = block.inputList[i].connection.targetBlock();
         if (childBlock) {
-          var comment = Blockly.JavaScript.allNestedComments(childBlock);
+          comment = Blockly.JavaScript.allNestedComments(childBlock);
           if (comment) {
             commentCode += Blockly.JavaScript.prefixLines(comment, '// ');
           }
diff --git a/generators/javascript/lists.js b/generators/javascript/lists.js
index 6f9e1a4b3..84e0cfea6 100644
--- a/generators/javascript/lists.js
+++ b/generators/javascript/lists.js
@@ -186,7 +186,7 @@ Blockly.JavaScript['lists_setIndex'] = function(block) {
       return '';
     }
     var listVar = Blockly.JavaScript.variableDB_.getDistinctName(
-        'tmpList', Blockly.Variables.NAME_TYPE);
+        'tmpList', Blockly.VARIABLE_CATEGORY_NAME);
     var code = 'var ' + listVar + ' = ' + list + ';\n';
     list = listVar;
     return code;
@@ -232,7 +232,7 @@ Blockly.JavaScript['lists_setIndex'] = function(block) {
     case ('RANDOM'):
       var code = cacheList();
       var xVar = Blockly.JavaScript.variableDB_.getDistinctName(
-          'tmpX', Blockly.Variables.NAME_TYPE);
+          'tmpX', Blockly.VARIABLE_CATEGORY_NAME);
       code += 'var ' + xVar + ' = Math.floor(Math.random() * ' + list +
           '.length);\n';
       if (mode == 'SET') {
diff --git a/generators/javascript/loops.js b/generators/javascript/loops.js
index f408ca1e4..711d8904e 100644
--- a/generators/javascript/loops.js
+++ b/generators/javascript/loops.js
@@ -40,11 +40,11 @@ Blockly.JavaScript['controls_repeat_ext'] = function(block) {
   branch = Blockly.JavaScript.addLoopTrap(branch, block);
   var code = '';
   var loopVar = Blockly.JavaScript.variableDB_.getDistinctName(
-      'count', Blockly.Variables.NAME_TYPE);
+      'count', Blockly.VARIABLE_CATEGORY_NAME);
   var endVar = repeats;
   if (!repeats.match(/^\w+$/) && !Blockly.isNumber(repeats)) {
     var endVar = Blockly.JavaScript.variableDB_.getDistinctName(
-        'repeat_end', Blockly.Variables.NAME_TYPE);
+        'repeat_end', Blockly.VARIABLE_CATEGORY_NAME);
     code += 'var ' + endVar + ' = ' + repeats + ';\n';
   }
   code += 'for (var ' + loopVar + ' = 0; ' +
@@ -74,7 +74,7 @@ Blockly.JavaScript['controls_whileUntil'] = function(block) {
 Blockly.JavaScript['controls_for'] = function(block) {
   // For loop.
   var variable0 = Blockly.JavaScript.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var argument0 = Blockly.JavaScript.valueToCode(block, 'FROM',
       Blockly.JavaScript.ORDER_ASSIGNMENT) || '0';
   var argument1 = Blockly.JavaScript.valueToCode(block, 'TO',
@@ -104,19 +104,19 @@ Blockly.JavaScript['controls_for'] = function(block) {
     var startVar = argument0;
     if (!argument0.match(/^\w+$/) && !Blockly.isNumber(argument0)) {
       startVar = Blockly.JavaScript.variableDB_.getDistinctName(
-          variable0 + '_start', Blockly.Variables.NAME_TYPE);
+          variable0 + '_start', Blockly.VARIABLE_CATEGORY_NAME);
       code += 'var ' + startVar + ' = ' + argument0 + ';\n';
     }
     var endVar = argument1;
     if (!argument1.match(/^\w+$/) && !Blockly.isNumber(argument1)) {
       var endVar = Blockly.JavaScript.variableDB_.getDistinctName(
-          variable0 + '_end', Blockly.Variables.NAME_TYPE);
+          variable0 + '_end', Blockly.VARIABLE_CATEGORY_NAME);
       code += 'var ' + endVar + ' = ' + argument1 + ';\n';
     }
     // Determine loop direction at start, in case one of the bounds
     // changes during loop execution.
     var incVar = Blockly.JavaScript.variableDB_.getDistinctName(
-        variable0 + '_inc', Blockly.Variables.NAME_TYPE);
+        variable0 + '_inc', Blockly.VARIABLE_CATEGORY_NAME);
     code += 'var ' + incVar + ' = ';
     if (Blockly.isNumber(increment)) {
       code += Math.abs(increment) + ';\n';
@@ -139,7 +139,7 @@ Blockly.JavaScript['controls_for'] = function(block) {
 Blockly.JavaScript['controls_forEach'] = function(block) {
   // For each loop.
   var variable0 = Blockly.JavaScript.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var argument0 = Blockly.JavaScript.valueToCode(block, 'LIST',
       Blockly.JavaScript.ORDER_ASSIGNMENT) || '[]';
   var branch = Blockly.JavaScript.statementToCode(block, 'DO');
@@ -149,11 +149,11 @@ Blockly.JavaScript['controls_forEach'] = function(block) {
   var listVar = argument0;
   if (!argument0.match(/^\w+$/)) {
     listVar = Blockly.JavaScript.variableDB_.getDistinctName(
-        variable0 + '_list', Blockly.Variables.NAME_TYPE);
+        variable0 + '_list', Blockly.VARIABLE_CATEGORY_NAME);
     code += 'var ' + listVar + ' = ' + argument0 + ';\n';
   }
   var indexVar = Blockly.JavaScript.variableDB_.getDistinctName(
-      variable0 + '_index', Blockly.Variables.NAME_TYPE);
+      variable0 + '_index', Blockly.VARIABLE_CATEGORY_NAME);
   branch = Blockly.JavaScript.INDENT + variable0 + ' = ' +
       listVar + '[' + indexVar + '];\n' + branch;
   code += 'for (var ' + indexVar + ' in ' + listVar + ') {\n' + branch + '}\n';
diff --git a/generators/javascript/math.js b/generators/javascript/math.js
index 935c2e4f5..337a01d69 100644
--- a/generators/javascript/math.js
+++ b/generators/javascript/math.js
@@ -219,7 +219,7 @@ Blockly.JavaScript['math_change'] = function(block) {
   var argument0 = Blockly.JavaScript.valueToCode(block, 'DELTA',
       Blockly.JavaScript.ORDER_ADDITION) || '0';
   var varName = Blockly.JavaScript.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   return varName + ' = (typeof ' + varName + ' == \'number\' ? ' + varName +
       ' : 0) + ' + argument0 + ';\n';
 };
diff --git a/generators/javascript/procedures.js b/generators/javascript/procedures.js
index 262c844c7..8874fcead 100644
--- a/generators/javascript/procedures.js
+++ b/generators/javascript/procedures.js
@@ -62,7 +62,7 @@ Blockly.JavaScript['procedures_defreturn'] = function(block) {
   var args = [];
   for (var i = 0; i < block.arguments_.length; i++) {
     args[i] = Blockly.JavaScript.variableDB_.getName(block.arguments_[i],
-        Blockly.Variables.NAME_TYPE);
+        Blockly.VARIABLE_CATEGORY_NAME);
   }
   var code = 'function ' + funcName + '(' + args.join(', ') + ') {\n' +
       xfix1 + loopTrap + branch + xfix2 + returnValue + '}';
diff --git a/generators/javascript/text.js b/generators/javascript/text.js
index 4e89b9591..8b1c162c5 100644
--- a/generators/javascript/text.js
+++ b/generators/javascript/text.js
@@ -92,7 +92,7 @@ Blockly.JavaScript['text_join'] = function(block) {
 Blockly.JavaScript['text_append'] = function(block) {
   // Append to a variable in place.
   var varName = Blockly.JavaScript.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var value = Blockly.JavaScript.valueToCode(block, 'TEXT',
       Blockly.JavaScript.ORDER_NONE) || '\'\'';
   return varName + ' += ' + Blockly.JavaScript.text.forceString_(value) + ';\n';
diff --git a/generators/javascript/variables.js b/generators/javascript/variables.js
index 99c63e448..df596cc29 100644
--- a/generators/javascript/variables.js
+++ b/generators/javascript/variables.js
@@ -29,7 +29,7 @@ goog.require('Blockly.JavaScript');
 Blockly.JavaScript['variables_get'] = function(block) {
   // Variable getter.
   var code = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('VAR'),
-      Blockly.Variables.NAME_TYPE);
+      Blockly.VARIABLE_CATEGORY_NAME);
   return [code, Blockly.JavaScript.ORDER_ATOMIC];
 };
 
@@ -38,6 +38,6 @@ Blockly.JavaScript['variables_set'] = function(block) {
   var argument0 = Blockly.JavaScript.valueToCode(block, 'VALUE',
       Blockly.JavaScript.ORDER_ASSIGNMENT) || '0';
   var varName = Blockly.JavaScript.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   return varName + ' = ' + argument0 + ';\n';
 };
diff --git a/generators/lua/lists.js b/generators/lua/lists.js
index 93bc1b090..24dbf2c76 100644
--- a/generators/lua/lists.js
+++ b/generators/lua/lists.js
@@ -151,7 +151,7 @@ Blockly.Lua['lists_getIndex'] = function(block) {
           Blockly.Lua.ORDER_NONE;
       var at = Blockly.Lua.valueToCode(block, 'AT', atOrder) || '1';
       var listVar = Blockly.Lua.variableDB_.getDistinctName(
-          'tmp_list', Blockly.Variables.NAME_TYPE);
+          'tmp_list', Blockly.VARIABLE_CATEGORY_NAME);
       at = getIndex_(listVar, where, at);
       var code = listVar + ' = ' + list + '\n' +
           'table.remove(' + listVar + ', ' + at + ')\n';
@@ -230,7 +230,7 @@ Blockly.Lua['lists_setIndex'] = function(block) {
     // `list` is an expression, so we may not evaluate it more than once.
     // We can use multiple statements.
     var listVar = Blockly.Lua.variableDB_.getDistinctName(
-        'tmp_list', Blockly.Variables.NAME_TYPE);
+        'tmp_list', Blockly.VARIABLE_CATEGORY_NAME);
     code = listVar + ' = ' + list + '\n';
     list = listVar;
   }
diff --git a/generators/lua/loops.js b/generators/lua/loops.js
index 58edb130b..063aa2ba0 100644
--- a/generators/lua/loops.js
+++ b/generators/lua/loops.js
@@ -72,7 +72,7 @@ Blockly.Lua['controls_repeat_ext'] = function(block) {
   branch = Blockly.Lua.addLoopTrap(branch, block);
   branch = Blockly.Lua.addContinueLabel_(branch);
   var loopVar = Blockly.Lua.variableDB_.getDistinctName(
-      'count', Blockly.Variables.NAME_TYPE);
+      'count', Blockly.VARIABLE_CATEGORY_NAME);
   var code = 'for ' + loopVar + ' = 1, ' + repeats + ' do\n' +
       branch + 'end\n';
   return code;
@@ -98,7 +98,7 @@ Blockly.Lua['controls_whileUntil'] = function(block) {
 Blockly.Lua['controls_for'] = function(block) {
   // For loop.
   var variable0 = Blockly.Lua.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var startVar = Blockly.Lua.valueToCode(block, 'FROM',
       Blockly.Lua.ORDER_NONE) || '0';
   var endVar = Blockly.Lua.valueToCode(block, 'TO',
@@ -121,7 +121,7 @@ Blockly.Lua['controls_for'] = function(block) {
     // Determine loop direction at start, in case one of the bounds
     // changes during loop execution.
     incValue = Blockly.Lua.variableDB_.getDistinctName(
-        variable0 + '_inc', Blockly.Variables.NAME_TYPE);
+        variable0 + '_inc', Blockly.VARIABLE_CATEGORY_NAME);
     code += incValue + ' = ';
     if (Blockly.isNumber(increment)) {
       code += Math.abs(increment) + '\n';
@@ -141,7 +141,7 @@ Blockly.Lua['controls_for'] = function(block) {
 Blockly.Lua['controls_forEach'] = function(block) {
   // For each loop.
   var variable0 = Blockly.Lua.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var argument0 = Blockly.Lua.valueToCode(block, 'LIST',
       Blockly.Lua.ORDER_NONE) || '{}';
   var branch = Blockly.Lua.statementToCode(block, 'DO');
diff --git a/generators/lua/math.js b/generators/lua/math.js
index 47332a88b..a61f3185b 100644
--- a/generators/lua/math.js
+++ b/generators/lua/math.js
@@ -208,7 +208,7 @@ Blockly.Lua['math_change'] = function(block) {
   var argument0 = Blockly.Lua.valueToCode(block, 'DELTA',
       Blockly.Lua.ORDER_ADDITIVE) || '0';
   var varName = Blockly.Lua.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   return varName + ' = ' + varName + ' + ' + argument0 + '\n';
 };
 
diff --git a/generators/lua/procedures.js b/generators/lua/procedures.js
index d838130c7..fd7b3b311 100644
--- a/generators/lua/procedures.js
+++ b/generators/lua/procedures.js
@@ -62,7 +62,7 @@ Blockly.Lua['procedures_defreturn'] = function(block) {
   var args = [];
   for (var i = 0; i < block.arguments_.length; i++) {
     args[i] = Blockly.Lua.variableDB_.getName(block.arguments_[i],
-        Blockly.Variables.NAME_TYPE);
+        Blockly.VARIABLE_CATEGORY_NAME);
   }
   var code = 'function ' + funcName + '(' + args.join(', ') + ')\n' +
       xfix1 + loopTrap + branch + xfix2 + returnValue + 'end\n';
diff --git a/generators/lua/text.js b/generators/lua/text.js
index 2c6bdb2e5..cb74d7cbb 100644
--- a/generators/lua/text.js
+++ b/generators/lua/text.js
@@ -68,7 +68,7 @@ Blockly.Lua['text_join'] = function(block) {
 Blockly.Lua['text_append'] = function(block) {
   // Append to a variable in place.
   var varName = Blockly.Lua.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var value = Blockly.Lua.valueToCode(block, 'TEXT',
       Blockly.Lua.ORDER_CONCATENATION) || '\'\'';
   return varName + ' = ' + varName + ' .. ' + value + '\n';
diff --git a/generators/lua/variables.js b/generators/lua/variables.js
index f08fc3621..3cb2d1888 100644
--- a/generators/lua/variables.js
+++ b/generators/lua/variables.js
@@ -29,7 +29,7 @@ goog.require('Blockly.Lua');
 Blockly.Lua['variables_get'] = function(block) {
   // Variable getter.
   var code = Blockly.Lua.variableDB_.getName(block.getFieldValue('VAR'),
-      Blockly.Variables.NAME_TYPE);
+      Blockly.VARIABLE_CATEGORY_NAME);
   return [code, Blockly.Lua.ORDER_ATOMIC];
 };
 
@@ -38,6 +38,6 @@ Blockly.Lua['variables_set'] = function(block) {
   var argument0 = Blockly.Lua.valueToCode(block, 'VALUE',
       Blockly.Lua.ORDER_NONE) || '0';
   var varName = Blockly.Lua.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   return varName + ' = ' + argument0 + '\n';
 };
diff --git a/generators/php.js b/generators/php.js
index 702eb7790..5c4ebcd3f 100644
--- a/generators/php.js
+++ b/generators/php.js
@@ -161,7 +161,7 @@ Blockly.PHP.init = function(workspace) {
   var variables = Blockly.Variables.allUsedVarModels(workspace);
   for (var i = 0, variable; variable = variables[i]; i++) {
     defvars.push(Blockly.PHP.variableDB_.getName(variable.getId(),
-        Blockly.Variables.NAME_TYPE) + ';');
+        Blockly.VARIABLE_CATEGORY_NAME) + ';');
   }
 
   // Declare all of the variables.
@@ -248,7 +248,7 @@ Blockly.PHP.scrub_ = function(block, code, opt_thisOnly) {
       if (block.inputList[i].type == Blockly.INPUT_VALUE) {
         var childBlock = block.inputList[i].connection.targetBlock();
         if (childBlock) {
-          var comment = Blockly.PHP.allNestedComments(childBlock);
+          comment = Blockly.PHP.allNestedComments(childBlock);
           if (comment) {
             commentCode += Blockly.PHP.prefixLines(comment, '// ');
           }
diff --git a/generators/php/lists.js b/generators/php/lists.js
index a1d90b59f..1facc35f5 100644
--- a/generators/php/lists.js
+++ b/generators/php/lists.js
@@ -269,7 +269,7 @@ Blockly.PHP['lists_setIndex'] = function(block) {
       return '';
     }
     var listVar = Blockly.PHP.variableDB_.getDistinctName(
-        'tmp_list', Blockly.Variables.NAME_TYPE);
+        'tmp_list', Blockly.VARIABLE_CATEGORY_NAME);
     var code = listVar + ' = &' + list + ';\n';
     list = listVar;
     return code;
@@ -340,7 +340,7 @@ Blockly.PHP['lists_setIndex'] = function(block) {
               Blockly.PHP.ORDER_REFERENCE) || 'array()';
       var code = cacheList();
       var xVar = Blockly.PHP.variableDB_.getDistinctName(
-          'tmp_x', Blockly.Variables.NAME_TYPE);
+          'tmp_x', Blockly.VARIABLE_CATEGORY_NAME);
       code += xVar + ' = rand(0, count(' + list + ')-1);\n';
       if (mode == 'SET') {
         code += list + '[' + xVar + '] = ' + value + ';\n';
diff --git a/generators/php/loops.js b/generators/php/loops.js
index f87a80813..bbd2c6695 100644
--- a/generators/php/loops.js
+++ b/generators/php/loops.js
@@ -40,11 +40,11 @@ Blockly.PHP['controls_repeat_ext'] = function(block) {
   branch = Blockly.PHP.addLoopTrap(branch, block);
   var code = '';
   var loopVar = Blockly.PHP.variableDB_.getDistinctName(
-      'count', Blockly.Variables.NAME_TYPE);
+      'count', Blockly.VARIABLE_CATEGORY_NAME);
   var endVar = repeats;
   if (!repeats.match(/^\w+$/) && !Blockly.isNumber(repeats)) {
     var endVar = Blockly.PHP.variableDB_.getDistinctName(
-        'repeat_end', Blockly.Variables.NAME_TYPE);
+        'repeat_end', Blockly.VARIABLE_CATEGORY_NAME);
     code += endVar + ' = ' + repeats + ';\n';
   }
   code += 'for (' + loopVar + ' = 0; ' +
@@ -73,7 +73,7 @@ Blockly.PHP['controls_whileUntil'] = function(block) {
 Blockly.PHP['controls_for'] = function(block) {
   // For loop.
   var variable0 = Blockly.PHP.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var argument0 = Blockly.PHP.valueToCode(block, 'FROM',
       Blockly.PHP.ORDER_ASSIGNMENT) || '0';
   var argument1 = Blockly.PHP.valueToCode(block, 'TO',
@@ -103,19 +103,19 @@ Blockly.PHP['controls_for'] = function(block) {
     var startVar = argument0;
     if (!argument0.match(/^\w+$/) && !Blockly.isNumber(argument0)) {
       startVar = Blockly.PHP.variableDB_.getDistinctName(
-          variable0 + '_start', Blockly.Variables.NAME_TYPE);
+          variable0 + '_start', Blockly.VARIABLE_CATEGORY_NAME);
       code += startVar + ' = ' + argument0 + ';\n';
     }
     var endVar = argument1;
     if (!argument1.match(/^\w+$/) && !Blockly.isNumber(argument1)) {
       var endVar = Blockly.PHP.variableDB_.getDistinctName(
-          variable0 + '_end', Blockly.Variables.NAME_TYPE);
+          variable0 + '_end', Blockly.VARIABLE_CATEGORY_NAME);
       code += endVar + ' = ' + argument1 + ';\n';
     }
     // Determine loop direction at start, in case one of the bounds
     // changes during loop execution.
     var incVar = Blockly.PHP.variableDB_.getDistinctName(
-        variable0 + '_inc', Blockly.Variables.NAME_TYPE);
+        variable0 + '_inc', Blockly.VARIABLE_CATEGORY_NAME);
     code += incVar + ' = ';
     if (Blockly.isNumber(increment)) {
       code += Math.abs(increment) + ';\n';
@@ -138,7 +138,7 @@ Blockly.PHP['controls_for'] = function(block) {
 Blockly.PHP['controls_forEach'] = function(block) {
   // For each loop.
   var variable0 = Blockly.PHP.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var argument0 = Blockly.PHP.valueToCode(block, 'LIST',
       Blockly.PHP.ORDER_ASSIGNMENT) || '[]';
   var branch = Blockly.PHP.statementToCode(block, 'DO');
diff --git a/generators/php/math.js b/generators/php/math.js
index e9b637b73..a0b36c88e 100644
--- a/generators/php/math.js
+++ b/generators/php/math.js
@@ -217,7 +217,7 @@ Blockly.PHP['math_change'] = function(block) {
   var argument0 = Blockly.PHP.valueToCode(block, 'DELTA',
       Blockly.PHP.ORDER_ADDITION) || '0';
   var varName = Blockly.PHP.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   return varName + ' += ' + argument0 + ';\n';
 };
 
diff --git a/generators/php/procedures.js b/generators/php/procedures.js
index c4b216201..be811c6df 100644
--- a/generators/php/procedures.js
+++ b/generators/php/procedures.js
@@ -37,7 +37,7 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
     varName = variable.name;
     if (block.arguments_.indexOf(varName) == -1) {
       globals.push(Blockly.PHP.variableDB_.getName(varName,
-          Blockly.Variables.NAME_TYPE));
+          Blockly.VARIABLE_CATEGORY_NAME));
     }
   }
   // Add developer variables.
@@ -81,7 +81,7 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
   var args = [];
   for (var i = 0; i < block.arguments_.length; i++) {
     args[i] = Blockly.PHP.variableDB_.getName(block.arguments_[i],
-        Blockly.Variables.NAME_TYPE);
+        Blockly.VARIABLE_CATEGORY_NAME);
   }
   var code = 'function ' + funcName + '(' + args.join(', ') + ') {\n' +
       globals + xfix1 + loopTrap + branch + xfix2 + returnValue + '}';
diff --git a/generators/php/text.js b/generators/php/text.js
index a3eb618d2..a9d08137e 100644
--- a/generators/php/text.js
+++ b/generators/php/text.js
@@ -68,7 +68,7 @@ Blockly.PHP['text_join'] = function(block) {
 Blockly.PHP['text_append'] = function(block) {
   // Append to a variable in place.
   var varName = Blockly.PHP.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var value = Blockly.PHP.valueToCode(block, 'TEXT',
       Blockly.PHP.ORDER_ASSIGNMENT) || '\'\'';
   return varName + ' .= ' + value + ';\n';
diff --git a/generators/php/variables.js b/generators/php/variables.js
index 61b162edb..5be864eea 100644
--- a/generators/php/variables.js
+++ b/generators/php/variables.js
@@ -29,7 +29,7 @@ goog.require('Blockly.PHP');
 Blockly.PHP['variables_get'] = function(block) {
     // Variable getter.
     var code = Blockly.PHP.variableDB_.getName(block.getFieldValue('VAR'),
-        Blockly.Variables.NAME_TYPE);
+        Blockly.VARIABLE_CATEGORY_NAME);
     return [code, Blockly.PHP.ORDER_ATOMIC];
 };
 
@@ -38,6 +38,6 @@ Blockly.PHP['variables_set'] = function(block) {
     var argument0 = Blockly.PHP.valueToCode(block, 'VALUE',
             Blockly.PHP.ORDER_ASSIGNMENT) || '0';
     var varName = Blockly.PHP.variableDB_.getName(
-        block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+        block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
     return varName + ' = ' + argument0 + ';\n';
 };
diff --git a/generators/python.js b/generators/python.js
index 544cd29a2..829101490 100644
--- a/generators/python.js
+++ b/generators/python.js
@@ -139,6 +139,7 @@ Blockly.Python.ORDER_OVERRIDES = [
 /**
  * Initialise the database of variable names.
  * @param {!Blockly.Workspace} workspace Workspace to generate code from.
+ * @this {Blockly.Generator}
  */
 Blockly.Python.init = function(workspace) {
   /**
@@ -172,7 +173,7 @@ Blockly.Python.init = function(workspace) {
   var variables = Blockly.Variables.allUsedVarModels(workspace);
   for (var i = 0; i < variables.length; i++) {
     defvars.push(Blockly.Python.variableDB_.getName(variables[i].getId(),
-        Blockly.Variables.NAME_TYPE) + ' = None');
+        Blockly.VARIABLE_CATEGORY_NAME) + ' = None');
   }
 
   Blockly.Python.definitions_['variables'] = defvars.join('\n');
@@ -276,7 +277,7 @@ Blockly.Python.scrub_ = function(block, code, opt_thisOnly) {
       if (block.inputList[i].type == Blockly.INPUT_VALUE) {
         var childBlock = block.inputList[i].connection.targetBlock();
         if (childBlock) {
-          var comment = Blockly.Python.allNestedComments(childBlock);
+          comment = Blockly.Python.allNestedComments(childBlock);
           if (comment) {
             commentCode += Blockly.Python.prefixLines(comment, '# ');
           }
diff --git a/generators/python/lists.js b/generators/python/lists.js
index a31ec2769..3321880c0 100644
--- a/generators/python/lists.js
+++ b/generators/python/lists.js
@@ -199,7 +199,7 @@ Blockly.Python['lists_setIndex'] = function(block) {
       return '';
     }
     var listVar = Blockly.Python.variableDB_.getDistinctName(
-        'tmp_list', Blockly.Variables.NAME_TYPE);
+        'tmp_list', Blockly.VARIABLE_CATEGORY_NAME);
     var code = listVar + ' = ' + list + '\n';
     list = listVar;
     return code;
@@ -240,7 +240,7 @@ Blockly.Python['lists_setIndex'] = function(block) {
         Blockly.Python.definitions_['import_random'] = 'import random';
         var code = cacheList();
         var xVar = Blockly.Python.variableDB_.getDistinctName(
-            'tmp_x', Blockly.Variables.NAME_TYPE);
+            'tmp_x', Blockly.VARIABLE_CATEGORY_NAME);
         code += xVar + ' = int(random.random() * len(' + list + '))\n';
         if (mode == 'SET') {
           code += list + '[' + xVar + '] = ' + value + '\n';
diff --git a/generators/python/loops.js b/generators/python/loops.js
index 21a32c4f8..71a7f304b 100644
--- a/generators/python/loops.js
+++ b/generators/python/loops.js
@@ -44,7 +44,7 @@ Blockly.Python['controls_repeat_ext'] = function(block) {
   var branch = Blockly.Python.statementToCode(block, 'DO');
   branch = Blockly.Python.addLoopTrap(branch, block) || Blockly.Python.PASS;
   var loopVar = Blockly.Python.variableDB_.getDistinctName(
-      'count', Blockly.Variables.NAME_TYPE);
+      'count', Blockly.VARIABLE_CATEGORY_NAME);
   var code = 'for ' + loopVar + ' in range(' + repeats + '):\n' + branch;
   return code;
 };
@@ -68,7 +68,7 @@ Blockly.Python['controls_whileUntil'] = function(block) {
 Blockly.Python['controls_for'] = function(block) {
   // For loop.
   var variable0 = Blockly.Python.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var argument0 = Blockly.Python.valueToCode(block, 'FROM',
       Blockly.Python.ORDER_NONE) || '0';
   var argument1 = Blockly.Python.valueToCode(block, 'TO',
@@ -155,7 +155,7 @@ Blockly.Python['controls_for'] = function(block) {
       } else {
         // It's complicated.
         var varName = Blockly.Python.variableDB_.getDistinctName(
-            variable0 + suffix, Blockly.Variables.NAME_TYPE);
+            variable0 + suffix, Blockly.VARIABLE_CATEGORY_NAME);
         code += varName + ' = float(' + arg + ')\n';
         arg = varName;
       }
@@ -183,7 +183,7 @@ Blockly.Python['controls_for'] = function(block) {
 Blockly.Python['controls_forEach'] = function(block) {
   // For each loop.
   var variable0 = Blockly.Python.variableDB_.getName(
-      block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+      block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var argument0 = Blockly.Python.valueToCode(block, 'LIST',
       Blockly.Python.ORDER_RELATIONAL) || '[]';
   var branch = Blockly.Python.statementToCode(block, 'DO');
diff --git a/generators/python/math.js b/generators/python/math.js
index 71fd50e6f..bc7b379ec 100644
--- a/generators/python/math.js
+++ b/generators/python/math.js
@@ -238,7 +238,7 @@ Blockly.Python['math_change'] = function(block) {
   var argument0 = Blockly.Python.valueToCode(block, 'DELTA',
       Blockly.Python.ORDER_ADDITIVE) || '0';
   var varName = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'),
-      Blockly.Variables.NAME_TYPE);
+      Blockly.VARIABLE_CATEGORY_NAME);
   return varName + ' = (' + varName + ' if isinstance(' + varName +
       ', Number) else 0) + ' + argument0 + '\n';
 };
diff --git a/generators/python/procedures.js b/generators/python/procedures.js
index ee4152b38..d69fae692 100644
--- a/generators/python/procedures.js
+++ b/generators/python/procedures.js
@@ -38,7 +38,7 @@ Blockly.Python['procedures_defreturn'] = function(block) {
     varName = variable.name;
     if (block.arguments_.indexOf(varName) == -1) {
       globals.push(Blockly.Python.variableDB_.getName(varName,
-          Blockly.Variables.NAME_TYPE));
+          Blockly.VARIABLE_CATEGORY_NAME));
     }
   }
   // Add developer variables.
@@ -84,7 +84,7 @@ Blockly.Python['procedures_defreturn'] = function(block) {
   var args = [];
   for (var i = 0; i < block.arguments_.length; i++) {
     args[i] = Blockly.Python.variableDB_.getName(block.arguments_[i],
-        Blockly.Variables.NAME_TYPE);
+        Blockly.VARIABLE_CATEGORY_NAME);
   }
   var code = 'def ' + funcName + '(' + args.join(', ') + '):\n' +
       globals + xfix1 + loopTrap + branch + xfix2 + returnValue;
diff --git a/generators/python/text.js b/generators/python/text.js
index 0089d5fc9..94241ed2c 100644
--- a/generators/python/text.js
+++ b/generators/python/text.js
@@ -86,7 +86,7 @@ Blockly.Python['text_join'] = function(block) {
                 Blockly.Python.ORDER_NONE) || '\'\'';
       }
       var tempVar = Blockly.Python.variableDB_.getDistinctName('x',
-          Blockly.Variables.NAME_TYPE);
+          Blockly.VARIABLE_CATEGORY_NAME);
       var code = '\'\'.join([str(' + tempVar + ') for ' + tempVar + ' in [' +
           elements.join(', ') + ']])';
       return [code, Blockly.Python.ORDER_FUNCTION_CALL];
@@ -96,7 +96,7 @@ Blockly.Python['text_join'] = function(block) {
 Blockly.Python['text_append'] = function(block) {
   // Append to a variable in place.
   var varName = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'),
-      Blockly.Variables.NAME_TYPE);
+      Blockly.VARIABLE_CATEGORY_NAME);
   var value = Blockly.Python.valueToCode(block, 'TEXT',
       Blockly.Python.ORDER_NONE) || '\'\'';
   return varName + ' = str(' + varName + ') + ' +
diff --git a/generators/python/variables.js b/generators/python/variables.js
index 3c9d7cffc..7567b29fa 100644
--- a/generators/python/variables.js
+++ b/generators/python/variables.js
@@ -29,7 +29,7 @@ goog.require('Blockly.Python');
 Blockly.Python['variables_get'] = function(block) {
   // Variable getter.
   var code = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'),
-      Blockly.Variables.NAME_TYPE);
+      Blockly.VARIABLE_CATEGORY_NAME);
   return [code, Blockly.Python.ORDER_ATOMIC];
 };
 
@@ -38,6 +38,6 @@ Blockly.Python['variables_set'] = function(block) {
   var argument0 = Blockly.Python.valueToCode(block, 'VALUE',
       Blockly.Python.ORDER_NONE) || '0';
   var varName = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'),
-      Blockly.Variables.NAME_TYPE);
+      Blockly.VARIABLE_CATEGORY_NAME);
   return varName + ' = ' + argument0 + '\n';
 };