diff --git a/demos/custom-fields/index.html b/demos/custom-fields/index.html
index 2e1270f67..b074fd71a 100644
--- a/demos/custom-fields/index.html
+++ b/demos/custom-fields/index.html
@@ -144,7 +144,7 @@
 
     </script>
 
-    <xml id="workspace-blocks" xmlns="http://www.w3.org/1999/xhtml" style="display: none">
+    <xml xmlns="https://developers.google.com/blockly/xml" id="workspace-blocks" style="display: none">
       <block type="turtle_basic"></block>
       <block type="turtle_nullifier" y="120"></block>
       <block type="turtle_changer" y="230"></block>
diff --git a/demos/minimap/minimap.js b/demos/minimap/minimap.js
index 6803d41f2..2a4b245e3 100644
--- a/demos/minimap/minimap.js
+++ b/demos/minimap/minimap.js
@@ -81,10 +81,10 @@ Minimap.init = function(workspace, minimap) {
   this.rect = document.getElementById('mapDiv').getBoundingClientRect();
 
   // Create a svg overlay on the top of mapDiv for the minimap.
-  this.svg = Blockly.utils.createSvgElement('svg', {
-    'xmlns': 'http://www.w3.org/2000/svg',
-    'xmlns:html': 'http://www.w3.org/1999/xhtml',
-    'xmlns:xlink': 'http://www.w3.org/1999/xlink',
+  this.svg = Blockly.utils.dom.createSvgElement('svg', {
+    'xmlns': Blockly.utils.dom.SVG_NS,
+    'xmlns:html': Blockly.utils.dom.HTML_NS,
+    'xmlns:xlink': Blockly.utils.dom.XLINK_NS,
     'version': '1.1',
     'height': this.rect.bottom-this.rect.top,
     'width': this.rect.right-this.rect.left,
@@ -94,7 +94,7 @@ Minimap.init = function(workspace, minimap) {
   this.svg.style.left = this.rect.left + 'px';
 
   // Creating a rectangle in the minimap that represents current view.
-  Blockly.utils.createSvgElement('rect', {
+  Blockly.utils.dom.createSvgElement('rect', {
     'width': 100,
     'height': 100,
     'class': 'mapDragger'
diff --git a/msg/messages.js b/msg/messages.js
index 2369fd9d5..b4d843952 100644
--- a/msg/messages.js
+++ b/msg/messages.js
@@ -71,8 +71,7 @@ Blockly.Msg.PROCEDURES_HUE = '290';
 /// For more context, see
 /// [[Translating:Blockly#infrequent_message_types]].\n{{Identical|Item}}
 Blockly.Msg.VARIABLES_DEFAULT_NAME = 'item';
-/// default name - A simple, default name for an unnamed function or
-// variable. Preferably indicates that the key is unnamed.
+/// default name - A simple, default name for an unnamed function or variable. Preferably indicates that the item is unnamed.
 Blockly.Msg.UNNAMED_KEY = 'unnamed';
 /// button text - Button that sets a calendar to today's date.\n{{Identical|Today}}
 Blockly.Msg.TODAY = 'Today';
diff --git a/tests/jsunit/event_test.js b/tests/jsunit/event_test.js
index c6cdc2fea..fb80b07a7 100644
--- a/tests/jsunit/event_test.js
+++ b/tests/jsunit/event_test.js
@@ -757,7 +757,7 @@ function test_events_newblock_newvar_xml() {
         var dom = Blockly.Xml.textToDom(
         '<xml xmlns="https://developers.google.com/blockly/xml">' +
         '  <block type="field_variable_test_block" id="block1">' +
-        '    <field name="VAR" id="id1" variabletype="">name1</field>' +
+        '    <field name="VAR" id="id1">name1</field>' +
         '  </block>' +
         '</xml>');
     Blockly.Xml.domToWorkspace(dom, workspace);
diff --git a/tests/jsunit/xml_test.js b/tests/jsunit/xml_test.js
index 903b3ad2e..72402bcc2 100644
--- a/tests/jsunit/xml_test.js
+++ b/tests/jsunit/xml_test.js
@@ -163,10 +163,10 @@ function test_domToWorkspace_VariablesAtTop() {
         '  <variables>' +
         '    <variable type="type1" id="id1">name1</variable>' +
         '    <variable type="type2" id="id2">name2</variable>' +
-        '    <variable type="" id="id3">name3</variable>' +
+        '    <variable id="id3">name3</variable>' +
         '  </variables>' +
         '  <block type="field_variable_test_block">' +
-        '    <field name="VAR" id="id3" variabletype="">name3</field>' +
+        '    <field name="VAR" id="id3">name3</field>' +
         '  </block>' +
         '</xml>');
     Blockly.Xml.domToWorkspace(dom, workspace);
@@ -210,7 +210,7 @@ function test_domToWorkspace_VariablesAtTop_MissingType() {
         '    <variable id="id1">name1</variable>' +
         '  </variables>' +
         '  <block type="field_variable_test_block">' +
-        '    <field name="VAR" id="id1" variabletype="">name3</field>' +
+        '    <field name="VAR" id="id1">name3</field>' +
         '  </block>' +
         '</xml>');
     Blockly.Xml.domToWorkspace(dom, workspace);
@@ -233,7 +233,7 @@ function test_domToWorkspace_VariablesAtTop_MismatchBlockType() {
         '    <variable type="type1" id="id1">name1</variable>' +
         '  </variables>' +
         '  <block type="field_variable_test_block">' +
-        '    <field name="VAR" id="id1" variabletype="">name1</field>' +
+        '    <field name="VAR" id="id1">name1</field>' +
         '  </block>' +
         '</xml>');
     Blockly.Xml.domToWorkspace(dom, workspace);
diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index 9cbe5c1f6..233801a72 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -50,11 +50,11 @@
     <script src="xml_test.js"></script>
 
     <div id="blocklyDiv"></div>
-    <xml id="toolbox-minimal" style="display: none">
+    <xml xmlns="https://developers.google.com/blockly/xml" id="toolbox-minimal" style="display: none">
       <block type="basic_block"></block>
     </xml>
 
-    <xml id="toolbox-categories" style="display: none">
+    <xml xmlns="https://developers.google.com/blockly/xml" id="toolbox-categories" style="display: none">
       <category name="First">
         <block type="basic_block">
           <field name="TEXT">First</field>
diff --git a/tests/mocha/navigation_modify_test.js b/tests/mocha/navigation_modify_test.js
index cd9a58cc6..fc11bc58b 100644
--- a/tests/mocha/navigation_modify_test.js
+++ b/tests/mocha/navigation_modify_test.js
@@ -1,6 +1,6 @@
 suite('Insert/Modify', function() {
   setup(function() {
-    var xmlText = '<xml xmlns="http://www.w3.org/1999/xhtml">' +
+    var xmlText = '<xml xmlns="https://developers.google.com/blockly/xml">' +
       '<block type="stack_block" id="stack_block_1" x="12" y="38"></block>' +
       '<block type="stack_block" id="stack_block_2" x="12" y="113"></block>' +
       '<block type="row_block" id="row_block_1" x="13" y="213"></block>' +
diff --git a/tests/playground.html b/tests/playground.html
index 1ed3bff68..32e801a7b 100644
--- a/tests/playground.html
+++ b/tests/playground.html
@@ -1304,14 +1304,14 @@ h1 {
       <block type="text_print">
         <value name="TEXT">
           <block type="variables_get">
-            <field name="VAR" id="item" variabletype="">item</field>
+            <field name="VAR" id="item">item</field>
           </block>
         </value>
         <next>
           <block type="text_print">
             <value name="TEXT">
               <block type="variables_get">
-                <field name="VAR" id="item" variabletype="">item</field>
+                <field name="VAR" id="item">item</field>
               </block>
             </value>
           </block>
diff --git a/tests/rendering/svg_paths.html b/tests/rendering/svg_paths.html
index ad1023812..7e10c3bd7 100644
--- a/tests/rendering/svg_paths.html
+++ b/tests/rendering/svg_paths.html
@@ -48,11 +48,11 @@ limitations under the License.
 var svgSpace;
 
 function addPathAt(path, x, y) {
-  var group = Blockly.utils.createSvgElement('g',
+  var group = Blockly.utils.dom.createSvgElement('g',
       {
         'transform': 'translate(' + (x + 50) + ', ' + y + ')'
       }, svgSpace);
-  Blockly.utils.createSvgElement('path', {
+  Blockly.utils.dom.createSvgElement('path', {
     'd': 'M 0,0 ' + path,
     'marker-start': 'url(#startDot)',
     'marker-end': 'url(#endDot)',
diff --git a/tests/screenshot/test_cases/colour_blend b/tests/screenshot/test_cases/colour_blend
index 081aa9cd6..872c8814b 100644
--- a/tests/screenshot/test_cases/colour_blend
+++ b/tests/screenshot/test_cases/colour_blend
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="colour_blend">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="colour_blend"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/colour_picker b/tests/screenshot/test_cases/colour_picker
index a81cdc6de..bd24b9aa8 100644
--- a/tests/screenshot/test_cases/colour_picker
+++ b/tests/screenshot/test_cases/colour_picker
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="colour_picker">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="colour_picker"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/colour_random b/tests/screenshot/test_cases/colour_random
index 53618afb5..ce294d931 100644
--- a/tests/screenshot/test_cases/colour_random
+++ b/tests/screenshot/test_cases/colour_random
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="colour_random">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="colour_random"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/colour_rgb b/tests/screenshot/test_cases/colour_rgb
index dcc201451..29b3dedcc 100644
--- a/tests/screenshot/test_cases/colour_rgb
+++ b/tests/screenshot/test_cases/colour_rgb
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="colour_rgb">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="colour_rgb"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_flow_statements b/tests/screenshot/test_cases/controls_flow_statements
index ea0c652e0..efe98837b 100644
--- a/tests/screenshot/test_cases/controls_flow_statements
+++ b/tests/screenshot/test_cases/controls_flow_statements
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="controls_flow_statements">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="controls_flow_statements"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_for b/tests/screenshot/test_cases/controls_for
index ce1024040..3604aebff 100644
--- a/tests/screenshot/test_cases/controls_for
+++ b/tests/screenshot/test_cases/controls_for
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="controls_for">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="controls_for"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_forEach b/tests/screenshot/test_cases/controls_forEach
index c12ddf210..24dc91762 100644
--- a/tests/screenshot/test_cases/controls_forEach
+++ b/tests/screenshot/test_cases/controls_forEach
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="controls_forEach">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="controls_forEach"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_if b/tests/screenshot/test_cases/controls_if
index a72414781..83e374786 100644
--- a/tests/screenshot/test_cases/controls_if
+++ b/tests/screenshot/test_cases/controls_if
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="controls_if">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="controls_if"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_if_else b/tests/screenshot/test_cases/controls_if_else
index 56e1ca070..904433868 100644
--- a/tests/screenshot/test_cases/controls_if_else
+++ b/tests/screenshot/test_cases/controls_if_else
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="controls_if_else">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="controls_if_else"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_if_elseif b/tests/screenshot/test_cases/controls_if_elseif
index c514f3c9c..d6988f20f 100644
--- a/tests/screenshot/test_cases/controls_if_elseif
+++ b/tests/screenshot/test_cases/controls_if_elseif
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="controls_if_elseif">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="controls_if_elseif"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_if_if b/tests/screenshot/test_cases/controls_if_if
index e41b9fb5d..c2977749e 100644
--- a/tests/screenshot/test_cases/controls_if_if
+++ b/tests/screenshot/test_cases/controls_if_if
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="controls_if_if">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="controls_if_if"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_ifelse b/tests/screenshot/test_cases/controls_ifelse
index f8c17725b..a648344ec 100644
--- a/tests/screenshot/test_cases/controls_ifelse
+++ b/tests/screenshot/test_cases/controls_ifelse
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="controls_ifelse">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="controls_ifelse"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_repeat b/tests/screenshot/test_cases/controls_repeat
index 4994606ac..c918fb74c 100644
--- a/tests/screenshot/test_cases/controls_repeat
+++ b/tests/screenshot/test_cases/controls_repeat
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="controls_repeat">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="controls_repeat"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_repeat_ext b/tests/screenshot/test_cases/controls_repeat_ext
index c7e4b4772..c0b57c8db 100644
--- a/tests/screenshot/test_cases/controls_repeat_ext
+++ b/tests/screenshot/test_cases/controls_repeat_ext
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="controls_repeat_ext">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="controls_repeat_ext"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_whileUntil b/tests/screenshot/test_cases/controls_whileUntil
index b61f2716e..0e3423547 100644
--- a/tests/screenshot/test_cases/controls_whileUntil
+++ b/tests/screenshot/test_cases/controls_whileUntil
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="controls_whileUntil">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="controls_whileUntil"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_create_empty b/tests/screenshot/test_cases/lists_create_empty
index 73a64dd85..fc6dcacde 100644
--- a/tests/screenshot/test_cases/lists_create_empty
+++ b/tests/screenshot/test_cases/lists_create_empty
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_create_empty">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_create_empty"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_create_with b/tests/screenshot/test_cases/lists_create_with
index 94bec7cba..7e3cb9603 100644
--- a/tests/screenshot/test_cases/lists_create_with
+++ b/tests/screenshot/test_cases/lists_create_with
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_create_with">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_create_with"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_create_with_container b/tests/screenshot/test_cases/lists_create_with_container
index 8d8c70021..b886158c0 100644
--- a/tests/screenshot/test_cases/lists_create_with_container
+++ b/tests/screenshot/test_cases/lists_create_with_container
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_create_with_container">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_create_with_container"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_create_with_item b/tests/screenshot/test_cases/lists_create_with_item
index 41b94c459..c92762fd6 100644
--- a/tests/screenshot/test_cases/lists_create_with_item
+++ b/tests/screenshot/test_cases/lists_create_with_item
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_create_with_item">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_create_with_item"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_getIndex b/tests/screenshot/test_cases/lists_getIndex
index a01732f27..d069e04ae 100644
--- a/tests/screenshot/test_cases/lists_getIndex
+++ b/tests/screenshot/test_cases/lists_getIndex
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_getIndex">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_getIndex"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_getSublist b/tests/screenshot/test_cases/lists_getSublist
index b77af38e4..f967bc911 100644
--- a/tests/screenshot/test_cases/lists_getSublist
+++ b/tests/screenshot/test_cases/lists_getSublist
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_getSublist">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_getSublist"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_indexOf b/tests/screenshot/test_cases/lists_indexOf
index f62434a16..1d3f16f7f 100644
--- a/tests/screenshot/test_cases/lists_indexOf
+++ b/tests/screenshot/test_cases/lists_indexOf
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_indexOf">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_indexOf"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_isEmpty b/tests/screenshot/test_cases/lists_isEmpty
index 13916960a..fabbd9607 100644
--- a/tests/screenshot/test_cases/lists_isEmpty
+++ b/tests/screenshot/test_cases/lists_isEmpty
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_isEmpty">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_isEmpty"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_length b/tests/screenshot/test_cases/lists_length
index 15f421d64..4c6aa2bf8 100644
--- a/tests/screenshot/test_cases/lists_length
+++ b/tests/screenshot/test_cases/lists_length
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_length">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_length"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_repeat b/tests/screenshot/test_cases/lists_repeat
index a405e5256..20db6be7a 100644
--- a/tests/screenshot/test_cases/lists_repeat
+++ b/tests/screenshot/test_cases/lists_repeat
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_repeat">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_repeat"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_reverse b/tests/screenshot/test_cases/lists_reverse
index c384c8e38..6269dc23b 100644
--- a/tests/screenshot/test_cases/lists_reverse
+++ b/tests/screenshot/test_cases/lists_reverse
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_reverse">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_reverse"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_setIndex b/tests/screenshot/test_cases/lists_setIndex
index fc6d15b0e..e50b6879c 100644
--- a/tests/screenshot/test_cases/lists_setIndex
+++ b/tests/screenshot/test_cases/lists_setIndex
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_setIndex">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_setIndex"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_sort b/tests/screenshot/test_cases/lists_sort
index 771218a36..98dd4bd55 100644
--- a/tests/screenshot/test_cases/lists_sort
+++ b/tests/screenshot/test_cases/lists_sort
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_sort">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_sort"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_split b/tests/screenshot/test_cases/lists_split
index d94d2e1f0..d1a5c9f4e 100644
--- a/tests/screenshot/test_cases/lists_split
+++ b/tests/screenshot/test_cases/lists_split
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="lists_split">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="lists_split"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/logic_boolean b/tests/screenshot/test_cases/logic_boolean
index b82aaed1e..d10c00f16 100644
--- a/tests/screenshot/test_cases/logic_boolean
+++ b/tests/screenshot/test_cases/logic_boolean
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="logic_boolean">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="logic_boolean"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/logic_compare b/tests/screenshot/test_cases/logic_compare
index c98b8a398..014b9a916 100644
--- a/tests/screenshot/test_cases/logic_compare
+++ b/tests/screenshot/test_cases/logic_compare
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="logic_compare">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="logic_compare"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/logic_negate b/tests/screenshot/test_cases/logic_negate
index a8e51a177..648885cb0 100644
--- a/tests/screenshot/test_cases/logic_negate
+++ b/tests/screenshot/test_cases/logic_negate
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="logic_negate">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="logic_negate"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/logic_null b/tests/screenshot/test_cases/logic_null
index 614c9525b..ffc322af6 100644
--- a/tests/screenshot/test_cases/logic_null
+++ b/tests/screenshot/test_cases/logic_null
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="logic_null">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="logic_null"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/logic_operation b/tests/screenshot/test_cases/logic_operation
index 1f39b2c4e..b02967d5d 100644
--- a/tests/screenshot/test_cases/logic_operation
+++ b/tests/screenshot/test_cases/logic_operation
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="logic_operation">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="logic_operation"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/logic_ternary b/tests/screenshot/test_cases/logic_ternary
index 5c05631a3..84f47e0b1 100644
--- a/tests/screenshot/test_cases/logic_ternary
+++ b/tests/screenshot/test_cases/logic_ternary
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="logic_ternary">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="logic_ternary"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_addition b/tests/screenshot/test_cases/math_addition
index 8966d7cf9..0637ea11d 100644
--- a/tests/screenshot/test_cases/math_addition
+++ b/tests/screenshot/test_cases/math_addition
@@ -1,4 +1,4 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
+<xml xmlns="https://developers.google.com/blockly/xml">
   <block type="math_arithmetic">
     <field name="OP">ADD</field>
     <value name="A">
diff --git a/tests/screenshot/test_cases/math_arithmetic b/tests/screenshot/test_cases/math_arithmetic
index 01954c240..831727763 100644
--- a/tests/screenshot/test_cases/math_arithmetic
+++ b/tests/screenshot/test_cases/math_arithmetic
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_arithmetic">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_arithmetic"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_atan2 b/tests/screenshot/test_cases/math_atan2
index 8d61b1e49..6d53e2ba0 100644
--- a/tests/screenshot/test_cases/math_atan2
+++ b/tests/screenshot/test_cases/math_atan2
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_atan2">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_atan2"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_change b/tests/screenshot/test_cases/math_change
index 891793da4..90894f95c 100644
--- a/tests/screenshot/test_cases/math_change
+++ b/tests/screenshot/test_cases/math_change
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_change">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_change"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_constant b/tests/screenshot/test_cases/math_constant
index 7999005e7..67a568754 100644
--- a/tests/screenshot/test_cases/math_constant
+++ b/tests/screenshot/test_cases/math_constant
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_constant">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_constant"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_constrain b/tests/screenshot/test_cases/math_constrain
index 3e9ab7fdf..f98273b0c 100644
--- a/tests/screenshot/test_cases/math_constrain
+++ b/tests/screenshot/test_cases/math_constrain
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_constrain">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_constrain"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_modulo b/tests/screenshot/test_cases/math_modulo
index a7cbc6a57..cbd1c5e2f 100644
--- a/tests/screenshot/test_cases/math_modulo
+++ b/tests/screenshot/test_cases/math_modulo
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_modulo">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_modulo"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_number b/tests/screenshot/test_cases/math_number
index 9024760e1..6eb9a8671 100644
--- a/tests/screenshot/test_cases/math_number
+++ b/tests/screenshot/test_cases/math_number
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_number">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_number"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_number_property b/tests/screenshot/test_cases/math_number_property
index 4334424b9..dea4718fd 100644
--- a/tests/screenshot/test_cases/math_number_property
+++ b/tests/screenshot/test_cases/math_number_property
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_number_property">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_number_property"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_on_list b/tests/screenshot/test_cases/math_on_list
index 421cddc37..ecdb664a2 100644
--- a/tests/screenshot/test_cases/math_on_list
+++ b/tests/screenshot/test_cases/math_on_list
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_on_list">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_on_list"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_random_float b/tests/screenshot/test_cases/math_random_float
index ba4c7e0da..f2ea40d93 100644
--- a/tests/screenshot/test_cases/math_random_float
+++ b/tests/screenshot/test_cases/math_random_float
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_random_float">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_random_float"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_random_int b/tests/screenshot/test_cases/math_random_int
index f60430b83..d655f9b62 100644
--- a/tests/screenshot/test_cases/math_random_int
+++ b/tests/screenshot/test_cases/math_random_int
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_random_int">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_random_int"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_round b/tests/screenshot/test_cases/math_round
index e4272b5b5..2811cc105 100644
--- a/tests/screenshot/test_cases/math_round
+++ b/tests/screenshot/test_cases/math_round
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_round">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_round"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_single b/tests/screenshot/test_cases/math_single
index 49e9d7edb..a9a4fba42 100644
--- a/tests/screenshot/test_cases/math_single
+++ b/tests/screenshot/test_cases/math_single
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_single">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_single"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_subtraction b/tests/screenshot/test_cases/math_subtraction
index f99950b95..81d331d8c 100644
--- a/tests/screenshot/test_cases/math_subtraction
+++ b/tests/screenshot/test_cases/math_subtraction
@@ -1,4 +1,4 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
+<xml xmlns="https://developers.google.com/blockly/xml">
   <block type="math_arithmetic">
     <field name="OP">MINUS</field>
     <value name="A">
diff --git a/tests/screenshot/test_cases/math_trig b/tests/screenshot/test_cases/math_trig
index 778574e40..4be7fd358 100644
--- a/tests/screenshot/test_cases/math_trig
+++ b/tests/screenshot/test_cases/math_trig
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="math_trig">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="math_trig"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/multi_block_1 b/tests/screenshot/test_cases/multi_block_1
index 54801082d..c094a75a0 100644
--- a/tests/screenshot/test_cases/multi_block_1
+++ b/tests/screenshot/test_cases/multi_block_1
@@ -1,6 +1,6 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
+<xml xmlns="https://developers.google.com/blockly/xml">
   <variables>
-    <variable type="" id=";yuq?=_C|_qk64!)f:m^">item</variable>
+    <variable id=";yuq?=_C|_qk64!)f:m^">item</variable>
   </variables>
   <block type="controls_ifelse">
     <statement name="ELSE">
@@ -50,7 +50,7 @@
         </statement>
         <statement name="ELSE">
           <block type="text_append">
-            <field name="VAR" id=";yuq?=_C|_qk64!)f:m^" variabletype="">item</field>
+            <field name="VAR" id=";yuq?=_C|_qk64!)f:m^">item</field>
             <value name="TEXT">
               <shadow type="text">
                 <field name="TEXT">f00</field>
@@ -58,7 +58,7 @@
             </value>
             <next>
               <block type="text_append">
-                <field name="VAR" id=";yuq?=_C|_qk64!)f:m^" variabletype="">item</field>
+                <field name="VAR" id=";yuq?=_C|_qk64!)f:m^">item</field>
                 <value name="TEXT">
                   <shadow type="text">
                     <field name="TEXT">bar</field>
diff --git a/tests/screenshot/test_cases/multi_block_logic b/tests/screenshot/test_cases/multi_block_logic
index 8f79bf437..89579f6ab 100644
--- a/tests/screenshot/test_cases/multi_block_logic
+++ b/tests/screenshot/test_cases/multi_block_logic
@@ -1,4 +1,4 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
+<xml xmlns="https://developers.google.com/blockly/xml">
   <block type="logic_compare">
     <field name="OP">EQ</field>
     <value name="A">
diff --git a/tests/screenshot/test_cases/multi_colour_with_external b/tests/screenshot/test_cases/multi_colour_with_external
index f76e0b4dc..58e20248f 100644
--- a/tests/screenshot/test_cases/multi_colour_with_external
+++ b/tests/screenshot/test_cases/multi_colour_with_external
@@ -1,4 +1,4 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
+<xml xmlns="https://developers.google.com/blockly/xml">
   <block type="colour_rgb">
     <value name="RED">
       <shadow type="math_number">
diff --git a/tests/screenshot/test_cases/multi_colour_with_internal b/tests/screenshot/test_cases/multi_colour_with_internal
index 67a1f0201..040128d1d 100644
--- a/tests/screenshot/test_cases/multi_colour_with_internal
+++ b/tests/screenshot/test_cases/multi_colour_with_internal
@@ -1,4 +1,4 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
+<xml xmlns="https://developers.google.com/blockly/xml">
   <block type="colour_rgb" inline="true">
     <value name="RED">
       <shadow type="math_number">
diff --git a/tests/screenshot/test_cases/multi_stack b/tests/screenshot/test_cases/multi_stack
index 733ce1f02..a56d7860f 100644
--- a/tests/screenshot/test_cases/multi_stack
+++ b/tests/screenshot/test_cases/multi_stack
@@ -1,9 +1,9 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
+<xml xmlns="https://developers.google.com/blockly/xml">
   <variables>
-    <variable type="" id="YUz?xxnE}SFx_,jmW#s;">item</variable>
+    <variable id="YUz?xxnE}SFx_,jmW#s;">item</variable>
   </variables>
   <block type="text_append">
-    <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;" variabletype="">item</field>
+    <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;">item</field>
     <value name="TEXT">
       <shadow type="text">
         <field name="TEXT">one</field>
@@ -11,7 +11,7 @@
     </value>
     <next>
       <block type="text_append">
-        <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;" variabletype="">item</field>
+        <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;">item</field>
         <value name="TEXT">
           <shadow type="text">
             <field name="TEXT">two</field>
@@ -19,7 +19,7 @@
         </value>
         <next>
           <block type="text_append">
-            <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;" variabletype="">item</field>
+            <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;">item</field>
             <value name="TEXT">
               <shadow type="text">
                 <field name="TEXT">three</field>
@@ -27,7 +27,7 @@
             </value>
             <next>
               <block type="text_append">
-                <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;" variabletype="">item</field>
+                <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;">item</field>
                 <value name="TEXT">
                   <shadow type="text">
                     <field name="TEXT">four</field>
@@ -35,7 +35,7 @@
                 </value>
                 <next>
                   <block type="text_append">
-                    <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;" variabletype="">item</field>
+                    <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;">item</field>
                     <value name="TEXT">
                       <shadow type="text">
                         <field name="TEXT">five</field>
diff --git a/tests/screenshot/test_cases/not_true b/tests/screenshot/test_cases/not_true
index 487d32041..b8955956e 100644
--- a/tests/screenshot/test_cases/not_true
+++ b/tests/screenshot/test_cases/not_true
@@ -1,4 +1,4 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
+<xml xmlns="https://developers.google.com/blockly/xml">
   <block type="logic_negate">
     <value name="BOOL">
       <block type="logic_boolean">
diff --git a/tests/screenshot/test_cases/procedures_callnoreturn b/tests/screenshot/test_cases/procedures_callnoreturn
index 6e4d9054f..4e4939e5b 100644
--- a/tests/screenshot/test_cases/procedures_callnoreturn
+++ b/tests/screenshot/test_cases/procedures_callnoreturn
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="procedures_callnoreturn">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="procedures_callnoreturn"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/procedures_callreturn b/tests/screenshot/test_cases/procedures_callreturn
index db8cc228e..f0ae0a187 100644
--- a/tests/screenshot/test_cases/procedures_callreturn
+++ b/tests/screenshot/test_cases/procedures_callreturn
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="procedures_callreturn">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="procedures_callreturn"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/procedures_defnoreturn b/tests/screenshot/test_cases/procedures_defnoreturn
index e5c7933b9..4bdfa70b9 100644
--- a/tests/screenshot/test_cases/procedures_defnoreturn
+++ b/tests/screenshot/test_cases/procedures_defnoreturn
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="procedures_defnoreturn">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="procedures_defnoreturn"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/procedures_defreturn b/tests/screenshot/test_cases/procedures_defreturn
index 12221236d..7b73e3289 100644
--- a/tests/screenshot/test_cases/procedures_defreturn
+++ b/tests/screenshot/test_cases/procedures_defreturn
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="procedures_defreturn">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="procedures_defreturn"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/procedures_ifreturn b/tests/screenshot/test_cases/procedures_ifreturn
index d5b297ab0..a2a66238f 100644
--- a/tests/screenshot/test_cases/procedures_ifreturn
+++ b/tests/screenshot/test_cases/procedures_ifreturn
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="procedures_ifreturn">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="procedures_ifreturn"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/procedures_mutatorarg b/tests/screenshot/test_cases/procedures_mutatorarg
index 2a8801b15..99252558f 100644
--- a/tests/screenshot/test_cases/procedures_mutatorarg
+++ b/tests/screenshot/test_cases/procedures_mutatorarg
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="procedures_mutatorarg">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="procedures_mutatorarg"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/procedures_mutatorcontainer b/tests/screenshot/test_cases/procedures_mutatorcontainer
index e9223d69a..9600d2006 100644
--- a/tests/screenshot/test_cases/procedures_mutatorcontainer
+++ b/tests/screenshot/test_cases/procedures_mutatorcontainer
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="procedures_mutatorcontainer">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="procedures_mutatorcontainer"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_basic_empty b/tests/screenshot/test_cases/test_basic_empty
index 0de4c13de..166f7990e 100644
--- a/tests/screenshot/test_cases/test_basic_empty
+++ b/tests/screenshot/test_cases/test_basic_empty
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_basic_empty">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_basic_empty"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_basic_empty_with_mutator b/tests/screenshot/test_cases/test_basic_empty_with_mutator
index d13ae968c..4b8293f8c 100644
--- a/tests/screenshot/test_cases/test_basic_empty_with_mutator
+++ b/tests/screenshot/test_cases/test_basic_empty_with_mutator
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_basic_empty_with_mutator">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_basic_empty_with_mutator"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_basic_limit_instances b/tests/screenshot/test_cases/test_basic_limit_instances
index cc9b6efa6..498ae9967 100644
--- a/tests/screenshot/test_cases/test_basic_limit_instances
+++ b/tests/screenshot/test_cases/test_basic_limit_instances
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_basic_limit_instances">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_basic_limit_instances"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_basic_value_to_stack b/tests/screenshot/test_cases/test_basic_value_to_stack
index f91824599..56dd4ff27 100644
--- a/tests/screenshot/test_cases/test_basic_value_to_stack
+++ b/tests/screenshot/test_cases/test_basic_value_to_stack
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_basic_value_to_stack">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_basic_value_to_stack"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_basic_value_to_statement b/tests/screenshot/test_cases/test_basic_value_to_statement
index be0c1a1cd..ac133d16f 100644
--- a/tests/screenshot/test_cases/test_basic_value_to_statement
+++ b/tests/screenshot/test_cases/test_basic_value_to_statement
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_basic_value_to_statement">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_basic_value_to_statement"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_dropdowns_dynamic b/tests/screenshot/test_cases/test_dropdowns_dynamic
index 5eaad103b..3c40077bd 100644
--- a/tests/screenshot/test_cases/test_dropdowns_dynamic
+++ b/tests/screenshot/test_cases/test_dropdowns_dynamic
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_dropdowns_dynamic">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_dropdowns_dynamic"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_dropdowns_images b/tests/screenshot/test_cases/test_dropdowns_images
index fcae217e3..496dcf96b 100644
--- a/tests/screenshot/test_cases/test_dropdowns_images
+++ b/tests/screenshot/test_cases/test_dropdowns_images
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_dropdowns_images">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_dropdowns_images"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_dropdowns_images_and_text b/tests/screenshot/test_cases/test_dropdowns_images_and_text
index 4a1a91812..1edeac8a4 100644
--- a/tests/screenshot/test_cases/test_dropdowns_images_and_text
+++ b/tests/screenshot/test_cases/test_dropdowns_images_and_text
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_dropdowns_images_and_text">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_dropdowns_images_and_text"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_dropdowns_long b/tests/screenshot/test_cases/test_dropdowns_long
index 193a97577..914c7620c 100644
--- a/tests/screenshot/test_cases/test_dropdowns_long
+++ b/tests/screenshot/test_cases/test_dropdowns_long
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_dropdowns_long">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_dropdowns_long"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_angle b/tests/screenshot/test_cases/test_fields_angle
index 522913e5d..772d6d97c 100644
--- a/tests/screenshot/test_cases/test_fields_angle
+++ b/tests/screenshot/test_cases/test_fields_angle
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_fields_angle">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_fields_angle"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_checkbox b/tests/screenshot/test_cases/test_fields_checkbox
index 4100ff157..5b440ecaf 100644
--- a/tests/screenshot/test_cases/test_fields_checkbox
+++ b/tests/screenshot/test_cases/test_fields_checkbox
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_fields_checkbox">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_fields_checkbox"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_colour b/tests/screenshot/test_cases/test_fields_colour
index 6c2d51460..72cb5c078 100644
--- a/tests/screenshot/test_cases/test_fields_colour
+++ b/tests/screenshot/test_cases/test_fields_colour
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_fields_colour">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_fields_colour"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_date b/tests/screenshot/test_cases/test_fields_date
index 2f53fd369..26f0065b2 100644
--- a/tests/screenshot/test_cases/test_fields_date
+++ b/tests/screenshot/test_cases/test_fields_date
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_fields_date">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_fields_date"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_label_serializable b/tests/screenshot/test_cases/test_fields_label_serializable
index 69965ec60..14e08f121 100644
--- a/tests/screenshot/test_cases/test_fields_label_serializable
+++ b/tests/screenshot/test_cases/test_fields_label_serializable
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_fields_label_serializable">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_fields_label_serializable"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_text_input b/tests/screenshot/test_cases/test_fields_text_input
index 120da6d43..6aeb44399 100644
--- a/tests/screenshot/test_cases/test_fields_text_input
+++ b/tests/screenshot/test_cases/test_fields_text_input
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_fields_text_input">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_fields_text_input"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_variable b/tests/screenshot/test_cases/test_fields_variable
index d02388cde..9a1bd4337 100644
--- a/tests/screenshot/test_cases/test_fields_variable
+++ b/tests/screenshot/test_cases/test_fields_variable
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_fields_variable">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_fields_variable"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_images_datauri b/tests/screenshot/test_cases/test_images_datauri
index 11e12c034..8dc9b0059 100644
--- a/tests/screenshot/test_cases/test_images_datauri
+++ b/tests/screenshot/test_cases/test_images_datauri
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_images_datauri">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_images_datauri"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_images_fliprtl b/tests/screenshot/test_cases/test_images_fliprtl
index 712481e18..e666629c8 100644
--- a/tests/screenshot/test_cases/test_images_fliprtl
+++ b/tests/screenshot/test_cases/test_images_fliprtl
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_images_fliprtl">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_images_fliprtl"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_images_large b/tests/screenshot/test_cases/test_images_large
index b3d7c475e..43da93413 100644
--- a/tests/screenshot/test_cases/test_images_large
+++ b/tests/screenshot/test_cases/test_images_large
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_images_large">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_images_large"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_images_many_icons b/tests/screenshot/test_cases/test_images_many_icons
index e50280aef..9369bd14f 100644
--- a/tests/screenshot/test_cases/test_images_many_icons
+++ b/tests/screenshot/test_cases/test_images_many_icons
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_images_many_icons">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_images_many_icons"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_images_missing b/tests/screenshot/test_cases/test_images_missing
index ac4db7535..c194b5dab 100644
--- a/tests/screenshot/test_cases/test_images_missing
+++ b/tests/screenshot/test_cases/test_images_missing
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_images_missing">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_images_missing"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_images_small b/tests/screenshot/test_cases/test_images_small
index 90b12d056..e96d5bb3c 100644
--- a/tests/screenshot/test_cases/test_images_small
+++ b/tests/screenshot/test_cases/test_images_small
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_images_small">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_images_small"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_numbers_float b/tests/screenshot/test_cases/test_numbers_float
index 8eb75f542..65bbb5933 100644
--- a/tests/screenshot/test_cases/test_numbers_float
+++ b/tests/screenshot/test_cases/test_numbers_float
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_numbers_float">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_numbers_float"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_numbers_halves b/tests/screenshot/test_cases/test_numbers_halves
index b8c1d76bb..f531b0fa5 100644
--- a/tests/screenshot/test_cases/test_numbers_halves
+++ b/tests/screenshot/test_cases/test_numbers_halves
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_numbers_halves">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_numbers_halves"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_numbers_hundredths b/tests/screenshot/test_cases/test_numbers_hundredths
index 41d220d4d..d00634857 100644
--- a/tests/screenshot/test_cases/test_numbers_hundredths
+++ b/tests/screenshot/test_cases/test_numbers_hundredths
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_numbers_hundredths">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_numbers_hundredths"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_numbers_three_halves b/tests/screenshot/test_cases/test_numbers_three_halves
index b2426742d..e5bc698c8 100644
--- a/tests/screenshot/test_cases/test_numbers_three_halves
+++ b/tests/screenshot/test_cases/test_numbers_three_halves
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_numbers_three_halves">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_numbers_three_halves"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_numbers_whole b/tests/screenshot/test_cases/test_numbers_whole
index 322668d90..156d6a14e 100644
--- a/tests/screenshot/test_cases/test_numbers_whole
+++ b/tests/screenshot/test_cases/test_numbers_whole
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_numbers_whole">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_numbers_whole"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_numbers_whole_bounded b/tests/screenshot/test_cases/test_numbers_whole_bounded
index 22daf3380..bc59763d2 100644
--- a/tests/screenshot/test_cases/test_numbers_whole_bounded
+++ b/tests/screenshot/test_cases/test_numbers_whole_bounded
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_numbers_whole_bounded">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_numbers_whole_bounded"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_emoji b/tests/screenshot/test_cases/test_style_emoji
index c9aa43bef..3e04b918e 100644
--- a/tests/screenshot/test_cases/test_style_emoji
+++ b/tests/screenshot/test_cases/test_style_emoji
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_style_emoji">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_style_emoji"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_hat b/tests/screenshot/test_cases/test_style_hat
index 8910a75dd..f00141674 100644
--- a/tests/screenshot/test_cases/test_style_hat
+++ b/tests/screenshot/test_cases/test_style_hat
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_style_hat">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_style_hat"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_hex1 b/tests/screenshot/test_cases/test_style_hex1
index 5438a7199..02838254c 100644
--- a/tests/screenshot/test_cases/test_style_hex1
+++ b/tests/screenshot/test_cases/test_style_hex1
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_style_hex1">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_style_hex1"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_hex2 b/tests/screenshot/test_cases/test_style_hex2
index 1d79dca38..2a1e8e0e9 100644
--- a/tests/screenshot/test_cases/test_style_hex2
+++ b/tests/screenshot/test_cases/test_style_hex2
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_style_hex2">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_style_hex2"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_hex3 b/tests/screenshot/test_cases/test_style_hex3
index eec05b9a1..71164a404 100644
--- a/tests/screenshot/test_cases/test_style_hex3
+++ b/tests/screenshot/test_cases/test_style_hex3
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_style_hex3">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_style_hex3"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_hex4 b/tests/screenshot/test_cases/test_style_hex4
index cff99f5f1..3f5033fba 100644
--- a/tests/screenshot/test_cases/test_style_hex4
+++ b/tests/screenshot/test_cases/test_style_hex4
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_style_hex4">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_style_hex4"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_hex5 b/tests/screenshot/test_cases/test_style_hex5
index 930efdbe5..707b7a9dd 100644
--- a/tests/screenshot/test_cases/test_style_hex5
+++ b/tests/screenshot/test_cases/test_style_hex5
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_style_hex5">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_style_hex5"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_no_colour b/tests/screenshot/test_cases/test_style_no_colour
index 15346e8c8..21d5500d3 100644
--- a/tests/screenshot/test_cases/test_style_no_colour
+++ b/tests/screenshot/test_cases/test_style_no_colour
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="test_style_no_colour">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="test_style_no_colour"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_append b/tests/screenshot/test_cases/text_append
index 2017fe20d..99644abb5 100644
--- a/tests/screenshot/test_cases/text_append
+++ b/tests/screenshot/test_cases/text_append
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_append">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_append"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_changeCase b/tests/screenshot/test_cases/text_changeCase
index 210a8eaa1..0f3f4577e 100644
--- a/tests/screenshot/test_cases/text_changeCase
+++ b/tests/screenshot/test_cases/text_changeCase
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_changeCase">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_changeCase"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_charAt b/tests/screenshot/test_cases/text_charAt
index 2c7479bca..dbe1deed6 100644
--- a/tests/screenshot/test_cases/text_charAt
+++ b/tests/screenshot/test_cases/text_charAt
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_charAt">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_charAt"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_count b/tests/screenshot/test_cases/text_count
index aad715c39..854422037 100644
--- a/tests/screenshot/test_cases/text_count
+++ b/tests/screenshot/test_cases/text_count
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_count">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_count"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_create_join_container b/tests/screenshot/test_cases/text_create_join_container
index ef36dcad2..4758b1909 100644
--- a/tests/screenshot/test_cases/text_create_join_container
+++ b/tests/screenshot/test_cases/text_create_join_container
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_create_join_container">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_create_join_container"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_create_join_item b/tests/screenshot/test_cases/text_create_join_item
index e64b9e2ff..23d853e5f 100644
--- a/tests/screenshot/test_cases/text_create_join_item
+++ b/tests/screenshot/test_cases/text_create_join_item
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_create_join_item">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_create_join_item"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_getSubstring b/tests/screenshot/test_cases/text_getSubstring
index 862a50926..20f7cff60 100644
--- a/tests/screenshot/test_cases/text_getSubstring
+++ b/tests/screenshot/test_cases/text_getSubstring
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_getSubstring">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_getSubstring"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_indexOf b/tests/screenshot/test_cases/text_indexOf
index f8aa8422d..d41f4c1c0 100644
--- a/tests/screenshot/test_cases/text_indexOf
+++ b/tests/screenshot/test_cases/text_indexOf
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_indexOf">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_indexOf"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_isEmpty b/tests/screenshot/test_cases/text_isEmpty
index 17d725a48..7b23edb2d 100644
--- a/tests/screenshot/test_cases/text_isEmpty
+++ b/tests/screenshot/test_cases/text_isEmpty
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_isEmpty">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_isEmpty"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_join b/tests/screenshot/test_cases/text_join
index 7a81e7149..46e7b47ef 100644
--- a/tests/screenshot/test_cases/text_join
+++ b/tests/screenshot/test_cases/text_join
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_join">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_join"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_length b/tests/screenshot/test_cases/text_length
index 96e9efeef..d178d3b5e 100644
--- a/tests/screenshot/test_cases/text_length
+++ b/tests/screenshot/test_cases/text_length
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_length">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_length"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_print b/tests/screenshot/test_cases/text_print
index 5d95c9fd8..6d3923dcd 100644
--- a/tests/screenshot/test_cases/text_print
+++ b/tests/screenshot/test_cases/text_print
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_print">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_print"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_prompt b/tests/screenshot/test_cases/text_prompt
index 2b83e2c64..0ec801ef9 100644
--- a/tests/screenshot/test_cases/text_prompt
+++ b/tests/screenshot/test_cases/text_prompt
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_prompt">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_prompt"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_prompt_ext b/tests/screenshot/test_cases/text_prompt_ext
index 936692483..dabe58a6a 100644
--- a/tests/screenshot/test_cases/text_prompt_ext
+++ b/tests/screenshot/test_cases/text_prompt_ext
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_prompt_ext">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_prompt_ext"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_replace b/tests/screenshot/test_cases/text_replace
index cc82f9773..a34419208 100644
--- a/tests/screenshot/test_cases/text_replace
+++ b/tests/screenshot/test_cases/text_replace
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_replace">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_replace"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_reverse b/tests/screenshot/test_cases/text_reverse
index 755e8e09d..61f53eb00 100644
--- a/tests/screenshot/test_cases/text_reverse
+++ b/tests/screenshot/test_cases/text_reverse
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_reverse">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_reverse"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_trim b/tests/screenshot/test_cases/text_trim
index c0b4b0842..b37f36705 100644
--- a/tests/screenshot/test_cases/text_trim
+++ b/tests/screenshot/test_cases/text_trim
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="text_trim">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_trim"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/variables_get b/tests/screenshot/test_cases/variables_get
index 2080aa66f..2599d1e93 100644
--- a/tests/screenshot/test_cases/variables_get
+++ b/tests/screenshot/test_cases/variables_get
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="variables_get">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="variables_get"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/variables_get_dynamic b/tests/screenshot/test_cases/variables_get_dynamic
index 1c935486c..5a9a3982e 100644
--- a/tests/screenshot/test_cases/variables_get_dynamic
+++ b/tests/screenshot/test_cases/variables_get_dynamic
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="variables_get_dynamic">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="variables_get_dynamic"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/variables_set b/tests/screenshot/test_cases/variables_set
index 8a392d22f..23bcf4097 100644
--- a/tests/screenshot/test_cases/variables_set
+++ b/tests/screenshot/test_cases/variables_set
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="variables_set">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="variables_set"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/variables_set_dynamic b/tests/screenshot/test_cases/variables_set_dynamic
index 25c949c29..9d68c5f7f 100644
--- a/tests/screenshot/test_cases/variables_set_dynamic
+++ b/tests/screenshot/test_cases/variables_set_dynamic
@@ -1,4 +1,3 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-	<block type="variables_set_dynamic">
-	</block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="variables_set_dynamic"></block>
 </xml>
\ No newline at end of file
diff --git a/tests/xml/workspace.xml b/tests/xml/workspace.xml
index 708544b92..19ae997d0 100644
--- a/tests/xml/workspace.xml
+++ b/tests/xml/workspace.xml
@@ -1,8 +1,8 @@
 <xml xmlns="https://developers.google.com/blockly/xml">
   <variables>
-    <variable type="" id="4zqCO]S-jo+2^`maCt|K">x</variable>
-    <variable type="" id="K/cNaUs{[7ol-9}CP7RL">i</variable>
-    <variable type="" id="8ZxN/~:DTP3pX4eGrv2b">text</variable>
+    <variable id="4zqCO]S-jo+2^`maCt|K">x</variable>
+    <variable id="K/cNaUs{[7ol-9}CP7RL">i</variable>
+    <variable id="8ZxN/~:DTP3pX4eGrv2b">text</variable>
   </variables>
   <comment id="TUkxWVwnVb;#]^MfteT4" x="0" y="0" h="100" w="100">This is a workspace comment.
  This is a new line on the workspace comment.
@@ -27,7 +27,7 @@
                 <field name="WHERE2">FROM_START</field>
                 <value name="STRING">
                   <block type="variables_get" id="oF,qA%c[v(h6/iLJJ0Zn">
-                    <field name="VAR" id="8ZxN/~:DTP3pX4eGrv2b" variabletype="">text</field>
+                    <field name="VAR" id="8ZxN/~:DTP3pX4eGrv2b">text</field>
                   </block>
                 </value>
               </block>
@@ -55,7 +55,7 @@
         </statement>
         <statement name="ELSE">
           <block type="math_change" id="KiMt-oQI`=,FYKY5ZK=:">
-            <field name="VAR" id="K/cNaUs{[7ol-9}CP7RL" variabletype="">i</field>
+            <field name="VAR" id="K/cNaUs{[7ol-9}CP7RL">i</field>
             <value name="DELTA">
               <shadow type="math_number" id="-O]V4./`ipovlf]!:v![">
                 <field name="NUM">1</field>