diff --git a/blocks/variables_dynamic.js b/blocks/variables_dynamic.js
index cd5f66e05..f2dba8494 100644
--- a/blocks/variables_dynamic.js
+++ b/blocks/variables_dynamic.js
@@ -2,7 +2,7 @@
  * @license
  * Visual Blocks Editor
  *
- * Copyright 2012 Google Inc.
+ * Copyright 2017 Google Inc.
  * https://developers.google.com/blockly/
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,48 +45,48 @@ Blockly.Constants.VariablesDynamic.HUE = 310;
 Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
   // Block for variable getter.
   {
-    "type": "variables_get_dynamic",
-    "message0": "%1",
-    "args0": [{
-      "type": "field_variable",
-      "name": "VAR",
-      "variable": "%{BKY_VARIABLES_DEFAULT_NAME}"
+    'type': 'variables_get_dynamic',
+    'message0': '%1',
+    'args0': [{
+      'type': 'field_variable',
+      'name': 'VAR',
+      'variable': '%{BKY_VARIABLES_DEFAULT_NAME}'
     }],
-    "output": null,
-    "colour": "%{BKY_VARIABLES_DYNAMIC_HUE}",
-    "helpUrl": "%{BKY_VARIABLES_GET_HELPURL}",
-    "tooltip": "%{BKY_VARIABLES_GET_TOOLTIP}",
-    "extensions": ["contextMenu_variableDynamicSetterGetter"],
-    "mutator":'contextMenu_variableDynamicMutation'
+    'output': null,
+    'colour': '%{BKY_VARIABLES_DYNAMIC_HUE}',
+    'helpUrl': '%{BKY_VARIABLES_GET_HELPURL}',
+    'tooltip': '%{BKY_VARIABLES_GET_TOOLTIP}',
+    'extensions': ['contextMenu_variableDynamicSetterGetter'],
+    'mutator':'contextMenu_variableDynamicMutation'
   },
   // Block for variable setter.
   {
-    "type": "variables_set_dynamic",
-    "message0": "%{BKY_VARIABLES_SET}",
-    "args0": [{
-      "type": "field_variable",
-      "name": "VAR",
-      "variable": "%{BKY_VARIABLES_DEFAULT_NAME}"
+    'type': 'variables_set_dynamic',
+    'message0': '%{BKY_VARIABLES_SET}',
+    'args0': [{
+      'type': 'field_variable',
+      'name': 'VAR',
+      'variable': '%{BKY_VARIABLES_DEFAULT_NAME}'
     },
     {
-      "type": "input_value",
-      "name": "VALUE"
+      'type': 'input_value',
+      'name': 'VALUE'
     }
     ],
-    "previousStatement": null,
-    "nextStatement": null,
-    "colour": "%{BKY_VARIABLES_DYNAMIC_HUE}",
-    "tooltip": "%{BKY_VARIABLES_SET_TOOLTIP}",
-    "helpUrl": "%{BKY_VARIABLES_SET_HELPURL}",
-    "extensions": ["contextMenu_variableDynamicSetterGetter"],
-    "mutator":'contextMenu_variableDynamicMutation'
+    'previousStatement': null,
+    'nextStatement': null,
+    'colour': '%{BKY_VARIABLES_DYNAMIC_HUE}',
+    'tooltip': '%{BKY_VARIABLES_SET_TOOLTIP}',
+    'helpUrl': '%{BKY_VARIABLES_SET_HELPURL}',
+    'extensions': ['contextMenu_variableDynamicSetterGetter'],
+    'mutator':'contextMenu_variableDynamicMutation'
   }
 ]); // END JSON EXTRACT (Do not delete this comment.)
 
 /**
  * Mixin to add context menu items to create getter/setter blocks for this
  * setter/getter.
- * Used by blocks 'variables_set' and 'variables_get'.
+ * Used by blocks 'variables_set_dynamic' and 'variables_get_dynamic'.
  * @mixin
  * @augments Blockly.Block
  * @package
@@ -128,11 +128,11 @@ Blockly.Constants.VariablesDynamic.CUSTOM_CONTEXT_MENU_VARIABLE_GETTER_SETTER_MI
   onchange: function() {
     var name = this.getFieldValue('VAR');
     var variableModel = this.workspace.getVariable(name);
-    this.getField("VAR").variableTypes = [variableModel.type];
+    this.getField('VAR').variableTypes = [variableModel.type];
     if (this.type == 'variables_get_dynamic') {
       this.outputConnection.setCheck(variableModel.type);
     } else {
-      this.getInput("VALUE").connection.setCheck(variableModel.type);
+      this.getInput('VALUE').connection.setCheck(variableModel.type);
     }
   }
 };
@@ -150,7 +150,7 @@ Blockly.Constants.VariablesDynamic.CUSTOM_CONTEXT_MENU_VARIABLE_MUTATION = {
     if (this.type == 'variables_get_dynamic') {
       this.outputConnection.setCheck(variableModel.type);
     } else {
-      this.getInput("VALUE").connection.setCheck(variableModel.type);
+      this.getInput('VALUE').connection.setCheck(variableModel.type);
     }
     return container;
   },
diff --git a/core/constants.js b/core/constants.js
index 1a027ebb8..54ed1fb49 100644
--- a/core/constants.js
+++ b/core/constants.js
@@ -247,7 +247,7 @@ Blockly.VARIABLE_CATEGORY_NAME = 'VARIABLE';
  * variable blocks.
  * @const {string}
  */
-Blockly.VARIABLE_DYNAMIC_CATEGORY_NAME = 'VARIABLES_DYNAMIC';
+Blockly.VARIABLE_DYNAMIC_CATEGORY_NAME = 'VARIABLE_DYNAMIC';
 
 /**
  * String for use in the "custom" attribute of a category in toolbox xml.
diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index 5134b5a5d..876aeb481 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -2,7 +2,7 @@
  * @license
  * Visual Blocks Editor
  *
- * Copyright 2012 Google Inc.
+ * Copyright 2017 Google Inc.
  * https://developers.google.com/blockly/
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,9 +58,9 @@ Blockly.VariablesDynamic.onCreateVariableButtonClick = function(button) {
       Blockly.Variables.createVariable(button.getTargetWorkspace(), null, type);
     }
   });
-  // workspace.createVariable("abc", "string");
-  // workspace.createVariable("123", "number");
-  // workspace.createVariable("abcd", "string");
+  // workspace.createVariable('abc', 'string');
+  // workspace.createVariable('123', 'number');
+  // workspace.createVariable('abcd', 'string');
 };
 /**
  * Construct the elements (blocks and button) required by the flyout for the
@@ -96,11 +96,11 @@ Blockly.VariablesDynamic.flyoutCategoryBlocks = function(workspace) {
   if (variableModelList.length > 0) {
 
     var varTypes = workspace.getVariableTypes();
-    for (var i in varTypes) {
-      var varType = varTypes[i];
-      var variableModelListOfType = workspace.getVariablesOfType(varType);
-      var firstVariable = variableModelListOfType[0];
-      if (Blockly.Blocks['variables_set_dynamic']) {
+    if (Blockly.Blocks['variables_set_dynamic']) {
+      for (var i in varTypes) {
+        var varType = varTypes[i];
+        var variableModelListOfType = workspace.getVariablesOfType(varType);
+        var firstVariable = variableModelListOfType[0];
         var gap = i == varTypes.length - 1 ? 24 : 8;
         var blockText = '<xml>' +
                     '<block type="variables_set_dynamic" gap="' + gap + '">' +
@@ -111,8 +111,8 @@ Blockly.VariablesDynamic.flyoutCategoryBlocks = function(workspace) {
         xmlList.push(block);
       }
     }
-    for (var i = 0, variable; variable = variableModelList[i]; i++) {
-      if (Blockly.Blocks['variables_get_dynamic']) {
+    if (Blockly.Blocks['variables_get_dynamic']) {
+      for (var i = 0, variable; variable = variableModelList[i]; i++) {
         var blockText = '<xml>' +
                     '<block type="variables_get_dynamic" gap="8">' +
                     Blockly.Variables.generateVariableFieldXml_(variable) +