diff --git a/generators/dart/procedures.js b/generators/dart/procedures.js
index b9c628607..84fe8f759 100644
--- a/generators/dart/procedures.js
+++ b/generators/dart/procedures.js
@@ -29,7 +29,7 @@ goog.require('Blockly.Dart');
 Blockly.Dart['procedures_defreturn'] = function(block) {
   // Define a procedure with a return value.
   var funcName = Blockly.Dart.variableDB_.getName(block.getFieldValue('NAME'),
-      Blockly.Procedures.NAME_TYPE);
+      Blockly.PROCEDURE_CATEGORY_NAME);
   var xfix1 = '';
   if (Blockly.Dart.STATEMENT_PREFIX) {
     xfix1 += Blockly.Dart.injectId(Blockly.Dart.STATEMENT_PREFIX, block);
@@ -78,7 +78,7 @@ Blockly.Dart['procedures_defnoreturn'] = Blockly.Dart['procedures_defreturn'];
 Blockly.Dart['procedures_callreturn'] = function(block) {
   // Call a procedure with a return value.
   var funcName = Blockly.Dart.variableDB_.getName(block.getFieldValue('NAME'),
-      Blockly.Procedures.NAME_TYPE);
+      Blockly.PROCEDURE_CATEGORY_NAME);
   var args = [];
   for (var i = 0; i < block.arguments_.length; i++) {
     args[i] = Blockly.Dart.valueToCode(block, 'ARG' + i,
diff --git a/generators/javascript/procedures.js b/generators/javascript/procedures.js
index 6225f14c3..262c844c7 100644
--- a/generators/javascript/procedures.js
+++ b/generators/javascript/procedures.js
@@ -29,7 +29,7 @@ goog.require('Blockly.JavaScript');
 Blockly.JavaScript['procedures_defreturn'] = function(block) {
   // Define a procedure with a return value.
   var funcName = Blockly.JavaScript.variableDB_.getName(
-      block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
+      block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
   var xfix1 = '';
   if (Blockly.JavaScript.STATEMENT_PREFIX) {
     xfix1 += Blockly.JavaScript.injectId(Blockly.JavaScript.STATEMENT_PREFIX,
@@ -80,7 +80,7 @@ Blockly.JavaScript['procedures_defnoreturn'] =
 Blockly.JavaScript['procedures_callreturn'] = function(block) {
   // Call a procedure with a return value.
   var funcName = Blockly.JavaScript.variableDB_.getName(
-      block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
+      block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
   var args = [];
   for (var i = 0; i < block.arguments_.length; i++) {
     args[i] = Blockly.JavaScript.valueToCode(block, 'ARG' + i,
diff --git a/generators/lua/procedures.js b/generators/lua/procedures.js
index 3bf01e07f..d838130c7 100644
--- a/generators/lua/procedures.js
+++ b/generators/lua/procedures.js
@@ -29,7 +29,7 @@ goog.require('Blockly.Lua');
 Blockly.Lua['procedures_defreturn'] = function(block) {
   // Define a procedure with a return value.
   var funcName = Blockly.Lua.variableDB_.getName(
-      block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
+      block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
   var xfix1 = '';
   if (Blockly.Lua.STATEMENT_PREFIX) {
     xfix1 += Blockly.Lua.injectId(Blockly.Lua.STATEMENT_PREFIX, block);
@@ -80,7 +80,7 @@ Blockly.Lua['procedures_defnoreturn'] =
 Blockly.Lua['procedures_callreturn'] = function(block) {
   // Call a procedure with a return value.
   var funcName = Blockly.Lua.variableDB_.getName(
-      block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
+      block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
   var args = [];
   for (var i = 0; i < block.arguments_.length; i++) {
     args[i] = Blockly.Lua.valueToCode(block, 'ARG' + i,
diff --git a/generators/php/procedures.js b/generators/php/procedures.js
index ec70ace1a..c4b216201 100644
--- a/generators/php/procedures.js
+++ b/generators/php/procedures.js
@@ -50,7 +50,7 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
       Blockly.PHP.INDENT + 'global ' + globals.join(', ') + ';\n' : '';
 
   var funcName = Blockly.PHP.variableDB_.getName(
-      block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
+      block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
   var xfix1 = '';
   if (Blockly.PHP.STATEMENT_PREFIX) {
     xfix1 += Blockly.PHP.injectId(Blockly.PHP.STATEMENT_PREFIX, block);
@@ -99,7 +99,7 @@ Blockly.PHP['procedures_defnoreturn'] =
 Blockly.PHP['procedures_callreturn'] = function(block) {
   // Call a procedure with a return value.
   var funcName = Blockly.PHP.variableDB_.getName(
-      block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
+      block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
   var args = [];
   for (var i = 0; i < block.arguments_.length; i++) {
     args[i] = Blockly.PHP.valueToCode(block, 'ARG' + i,
diff --git a/generators/python/procedures.js b/generators/python/procedures.js
index 38559bbe9..ee4152b38 100644
--- a/generators/python/procedures.js
+++ b/generators/python/procedures.js
@@ -51,7 +51,7 @@ Blockly.Python['procedures_defreturn'] = function(block) {
   globals = globals.length ?
       Blockly.Python.INDENT + 'global ' + globals.join(', ') + '\n' : '';
   var funcName = Blockly.Python.variableDB_.getName(
-      block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
+      block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
   var xfix1 = '';
   if (Blockly.Python.STATEMENT_PREFIX) {
     xfix1 += Blockly.Python.injectId(Blockly.Python.STATEMENT_PREFIX, block);
@@ -102,7 +102,7 @@ Blockly.Python['procedures_defnoreturn'] =
 Blockly.Python['procedures_callreturn'] = function(block) {
   // Call a procedure with a return value.
   var funcName = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME'),
-      Blockly.Procedures.NAME_TYPE);
+      Blockly.PROCEDURE_CATEGORY_NAME);
   var args = [];
   for (var i = 0; i < block.arguments_.length; i++) {
     args[i] = Blockly.Python.valueToCode(block, 'ARG' + i,