diff --git a/demos/blockfactory/block_option.js b/demos/blockfactory/block_option.js
index 8bc1a2fd4..e7cdaa6af 100644
--- a/demos/blockfactory/block_option.js
+++ b/demos/blockfactory/block_option.js
@@ -126,9 +126,9 @@ BlockOption.prototype.showPreviewBlock = function() {
   var blockOptPreviewID = this.dom.id + '_workspace';
 
   // Inject preview block.
-  var workspace = Blockly.inject(blockOptPreviewID, {readOnly:true});
-  Blockly.Xml.domToWorkspace(this.previewBlockXml, workspace);
-  this.previewWorkspace = workspace;
+  var demoWorkspace = Blockly.inject(blockOptPreviewID, {readOnly:true});
+  Blockly.Xml.domToWorkspace(this.previewBlockXml, demoWorkspace);
+  this.previewWorkspace = demoWorkspace;
 
   // Center the preview block in the workspace.
   this.centerBlock();
diff --git a/demos/custom-dialogs/index.html b/demos/custom-dialogs/index.html
index 42cba5477..ee1bc840e 100644
--- a/demos/custom-dialogs/index.html
+++ b/demos/custom-dialogs/index.html
@@ -47,7 +47,7 @@
   </xml>
 
   <script>
-    var workspace = Blockly.inject('blocklyDiv',
+    var demoWorkspace = Blockly.inject('blocklyDiv',
         {media: '../../media/',
          toolbox: document.getElementById('toolbox')});
   </script>
diff --git a/demos/fixed/index.html b/demos/fixed/index.html
index 680fa7691..346732858 100644
--- a/demos/fixed/index.html
+++ b/demos/fixed/index.html
@@ -38,7 +38,7 @@
   </xml>
 
   <script>
-    var workspace = Blockly.inject('blocklyDiv',
+    var demoWorkspace = Blockly.inject('blocklyDiv',
         {media: '../../media/',
          toolbox: document.getElementById('toolbox')});
   </script>
diff --git a/demos/generator/index.html b/demos/generator/index.html
index 7bc483855..c76e1f3e6 100644
--- a/demos/generator/index.html
+++ b/demos/generator/index.html
@@ -113,16 +113,16 @@
   </xml>
 
   <script>
-    var workspace = Blockly.inject('blocklyDiv',
+    var demoWorkspace = Blockly.inject('blocklyDiv',
         {media: '../../media/',
          toolbox: document.getElementById('toolbox')});
     Blockly.Xml.domToWorkspace(document.getElementById('startBlocks'),
-                               workspace);
+                               demoWorkspace);
 
     function showCode() {
       // Generate JavaScript code and display it.
       Blockly.JavaScript.INFINITE_LOOP_TRAP = null;
-      var code = Blockly.JavaScript.workspaceToCode(workspace);
+      var code = Blockly.JavaScript.workspaceToCode(demoWorkspace);
       alert(code);
     }
 
@@ -131,7 +131,7 @@
       window.LoopTrap = 1000;
       Blockly.JavaScript.INFINITE_LOOP_TRAP =
           'if (--window.LoopTrap == 0) throw "Infinite loop.";\n';
-      var code = Blockly.JavaScript.workspaceToCode(workspace);
+      var code = Blockly.JavaScript.workspaceToCode(demoWorkspace);
       Blockly.JavaScript.INFINITE_LOOP_TRAP = null;
       try {
         eval(code);
diff --git a/demos/headless/index.html b/demos/headless/index.html
index 62d49fdfa..4e7eedfcd 100644
--- a/demos/headless/index.html
+++ b/demos/headless/index.html
@@ -109,9 +109,9 @@
         return;
       }
       // Create a headless workspace.
-      var workspace = new Blockly.Workspace();
-      Blockly.Xml.domToWorkspace(xml, workspace);
-      var code = Blockly.Python.workspaceToCode(workspace);
+      var demoWorkspace = new Blockly.Workspace();
+      Blockly.Xml.domToWorkspace(xml, demoWorkspace);
+      var code = Blockly.Python.workspaceToCode(demoWorkspace);
       document.getElementById('code_output').value = code;
     }
   </script>
diff --git a/demos/interpreter/async-execution.html b/demos/interpreter/async-execution.html
index e68f0dc0d..11dfc5088 100644
--- a/demos/interpreter/async-execution.html
+++ b/demos/interpreter/async-execution.html
@@ -132,11 +132,11 @@
   </xml>
 
   <script>
-    var workspace = Blockly.inject('blocklyDiv',
+    var demoWorkspace = Blockly.inject('blocklyDiv',
         {media: '../../media/',
          toolbox: document.getElementById('toolbox')});
     Blockly.Xml.domToWorkspace(document.getElementById('startBlocks'),
-                               workspace);
+                               demoWorkspace);
 
     // Exit is used to signal the end of a script.
     Blockly.JavaScript.addReservedWords('exit');
@@ -179,12 +179,12 @@
     var latestCode = '';
 
     function highlightBlock(id) {
-      workspace.highlightBlock(id);
+      demoWorkspace.highlightBlock(id);
       highlightPause = true;
     }
 
     function resetStepUi(clearOutput) {
-      workspace.highlightBlock(null);
+      demoWorkspace.highlightBlock(null);
       highlightPause = false;
       runButton.disabled = '';
 
@@ -197,7 +197,7 @@
       // Generate JavaScript code and parse it.
       Blockly.JavaScript.STATEMENT_PREFIX = 'highlightBlock(%1);\n';
       Blockly.JavaScript.addReservedWords('highlightBlock');
-      latestCode = Blockly.JavaScript.workspaceToCode(workspace);
+      latestCode = Blockly.JavaScript.workspaceToCode(demoWorkspace);
 
       resetStepUi(true);
     }
@@ -250,7 +250,7 @@
 
     // Load the interpreter now, and upon future changes.
     generateCodeAndLoadIntoInterpreter();
-    workspace.addChangeListener(function(event) {
+    demoWorkspace.addChangeListener(function(event) {
       if (!(event instanceof Blockly.Events.Ui)) {
         // Something changed. Parser needs to be reloaded.
         resetInterpreter();
diff --git a/demos/interpreter/step-execution.html b/demos/interpreter/step-execution.html
index 8a8b95a6a..754f63b8e 100644
--- a/demos/interpreter/step-execution.html
+++ b/demos/interpreter/step-execution.html
@@ -134,11 +134,11 @@
   </xml>
 
   <script>
-    var workspace = Blockly.inject('blocklyDiv',
+    var demoWorkspace = Blockly.inject('blocklyDiv',
         {media: '../../media/',
          toolbox: document.getElementById('toolbox')});
     Blockly.Xml.domToWorkspace(document.getElementById('startBlocks'),
-                               workspace);
+                               demoWorkspace);
 
     var outputArea = document.getElementById('output');
     var stepButton = document.getElementById('stepButton');
@@ -173,12 +173,12 @@
     var latestCode = '';
 
     function highlightBlock(id) {
-      workspace.highlightBlock(id);
+      demoWorkspace.highlightBlock(id);
       highlightPause = true;
     }
 
     function resetStepUi(clearOutput) {
-      workspace.highlightBlock(null);
+      demoWorkspace.highlightBlock(null);
       highlightPause = false;
 
       if (clearOutput) {
@@ -190,7 +190,7 @@
       // Generate JavaScript code and parse it.
       Blockly.JavaScript.STATEMENT_PREFIX = 'highlightBlock(%1);\n';
       Blockly.JavaScript.addReservedWords('highlightBlock');
-      latestCode = Blockly.JavaScript.workspaceToCode(workspace);
+      latestCode = Blockly.JavaScript.workspaceToCode(demoWorkspace);
 
       resetStepUi(true);
     }
@@ -240,7 +240,7 @@
 
     // Load the interpreter now, and upon future changes.
     generateCodeAndLoadIntoInterpreter();
-    workspace.addChangeListener(function(event) {
+    demoWorkspace.addChangeListener(function(event) {
       if (!(event instanceof Blockly.Events.Ui)) {
         // Something changed. Parser needs to be reloaded.
         generateCodeAndLoadIntoInterpreter();
diff --git a/demos/maxBlocks/index.html b/demos/maxBlocks/index.html
index 17a967339..a4f73b1a1 100644
--- a/demos/maxBlocks/index.html
+++ b/demos/maxBlocks/index.html
@@ -80,17 +80,17 @@
   </xml>
 
   <script>
-    var workspace = Blockly.inject('blocklyDiv',
+    var demoWorkspace = Blockly.inject('blocklyDiv',
         {media: '../../media/',
          maxBlocks: 5,
          toolbox: document.getElementById('toolbox')});
 
     function onchange(event) {
       document.getElementById('capacity').textContent =
-          workspace.remainingCapacity();
+          demoWorkspace.remainingCapacity();
     }
 
-    workspace.addChangeListener(onchange);
+    demoWorkspace.addChangeListener(onchange);
     onchange();
   </script>
 
diff --git a/demos/resizable/overlay.html b/demos/resizable/overlay.html
index 2d9f41f9b..ee2600e04 100644
--- a/demos/resizable/overlay.html
+++ b/demos/resizable/overlay.html
@@ -66,7 +66,7 @@
   <script>
     var blocklyArea = document.getElementById('blocklyArea');
     var blocklyDiv = document.getElementById('blocklyDiv');
-    var workspace = Blockly.inject(blocklyDiv,
+    var demoWorkspace = Blockly.inject(blocklyDiv,
         {media: '../../media/',
          toolbox: document.getElementById('toolbox')});
     var onresize = function(e) {
@@ -87,7 +87,7 @@
     };
     window.addEventListener('resize', onresize, false);
     onresize();
-    Blockly.svgResize(workspace);
+    Blockly.svgResize(demoWorkspace);
   </script>
 </body>
 </html>
diff --git a/demos/rtl/index.html b/demos/rtl/index.html
index fd84febd2..080e9f864 100644
--- a/demos/rtl/index.html
+++ b/demos/rtl/index.html
@@ -23,12 +23,12 @@
   </style>
   <script>
     function init() {
-      var workspace = Blockly.inject('blocklyDiv',
+      var demoWorkspace = Blockly.inject('blocklyDiv',
           {media: '../../media/',
            rtl: true,
            toolbox: document.getElementById('toolbox')});
       Blockly.Xml.domToWorkspace(document.getElementById('startBlocks'),
-                                 workspace);
+                                 demoWorkspace);
       //window.onbeforeunload = function() {
       //  return 'Leaving this page will result in the loss of your work.';
       //};
diff --git a/demos/storage/index.html b/demos/storage/index.html
index 57cad3304..2c195b8e2 100644
--- a/demos/storage/index.html
+++ b/demos/storage/index.html
@@ -80,7 +80,7 @@
   </xml>
 
   <script>
-    var workspace = Blockly.inject('blocklyDiv',
+    var demoWorkspace = Blockly.inject('blocklyDiv',
         {media: '../../media/',
          toolbox: document.getElementById('toolbox')});
 
diff --git a/demos/toolbox/index.html b/demos/toolbox/index.html
index 4e81c02eb..0e3d7cd3f 100644
--- a/demos/toolbox/index.html
+++ b/demos/toolbox/index.html
@@ -334,7 +334,7 @@
   </xml>
 
   <script>
-    var workspace = Blockly.inject('blocklyDiv',
+    var demoWorkspace = Blockly.inject('blocklyDiv',
         {media: '../../media/',
          toolbox: document.getElementById('toolbox')});
   </script>
diff --git a/tests/generators/index.html b/tests/generators/index.html
index a4d39ae97..8ac8f4799 100644
--- a/tests/generators/index.html
+++ b/tests/generators/index.html
@@ -73,10 +73,10 @@
 <script>
 'use strict';
 
-var workspace = null;
+var demoWorkspace = null;
 
 function start() {
-  workspace = Blockly.inject('blocklyDiv',
+  demoWorkspace = Blockly.inject('blocklyDiv',
       {grid:
          {spacing: 25,
           length: 3,
@@ -129,14 +129,14 @@ function fromXml(xmlText) {
   output.value = xmlText;
   output.scrollTop = 0;
   output.scrollLeft = 0;
-  workspace.clear();
+  demoWorkspace.clear();
   try {
     var xmlDoc = Blockly.Xml.textToDom(xmlText);
   } catch (e) {
     alert('Error parsing XML:\n' + e);
     return;
   }
-  Blockly.Xml.domToWorkspace(xmlDoc, workspace);
+  Blockly.Xml.domToWorkspace(xmlDoc, demoWorkspace);
 }
 
 function setOutput(text) {
@@ -147,7 +147,8 @@ function setOutput(text) {
 }
 
 function toXml() {
-  var xmlDom = Blockly.Xml.workspaceToDom(workspace, /* opt_noId */ true);
+  var xmlDom = Blockly.Xml.workspaceToDom(demoWorkspace,
+    /* opt_noId */ true);
   var xmlText = Blockly.Xml.domToPrettyText(xmlDom);
   xmlText = xmlText.replace(/ id="\d+"/g, '');
   setOutput(xmlText);
@@ -155,34 +156,34 @@ function toXml() {
 
 function toJavaScript() {
   var code = '\'use strict\';\n\n'
-  code += Blockly.JavaScript.workspaceToCode(workspace);
+  code += Blockly.JavaScript.workspaceToCode(demoWorkspace);
   setOutput(code);
 }
 
 function toPython() {
-  var code = Blockly.Python.workspaceToCode(workspace);
+  var code = Blockly.Python.workspaceToCode(demoWorkspace);
   setOutput(code);
 }
 
 function toPhp() {
-  var code = Blockly.PHP.workspaceToCode(workspace);
+  var code = Blockly.PHP.workspaceToCode(demoWorkspace);
   setOutput(code);
 }
 
 function toLua() {
-  var code = Blockly.Lua.workspaceToCode(workspace);
+  var code = Blockly.Lua.workspaceToCode(demoWorkspace);
   setOutput(code);
 }
 
 function toDart() {
-  var code = Blockly.Dart.workspaceToCode(workspace);
+  var code = Blockly.Dart.workspaceToCode(demoWorkspace);
   setOutput(code);
 }
 
 function changeIndex() {
   var oneBasedIndex = document.getElementById('indexing').checked;
-  workspace.options.oneBasedIndex = oneBasedIndex;
-  workspace.toolbox_.flyout_.workspace_.options.oneBasedIndex = oneBasedIndex;
+  demoWorkspace.options.oneBasedIndex = oneBasedIndex;
+  demoWorkspace.toolbox_.flyout_.workspace_.options.oneBasedIndex = oneBasedIndex;
 }
 </script>