From 489321cf54f82f710213c4033e75b83c366d0441 Mon Sep 17 00:00:00 2001
From: Patrick Steele-Idem <pnidem@gmail.com>
Date: Thu, 26 Jan 2017 17:18:12 -0700
Subject: [PATCH] Fixes #549 - Migrate from "data" to "input"

---
 compiler/ast/TemplateRoot.js                       |  8 +++++---
 .../autotests/render-deprecated/data/expected.html |  1 +
 .../render-deprecated/data/template.marko          |  1 +
 test/autotests/render-deprecated/data/test.js      |  3 +++
 .../render/attr-boolean-dynamic/template.marko     |  4 ++--
 .../render/attr-boolean-placeholder/template.marko |  4 ++--
 .../render/attr-empty-dynamic/template.marko       |  2 +-
 .../render/attr-object-dynamic/template.marko      |  2 +-
 .../template.marko                                 |  2 +-
 .../template.marko                                 |  2 +-
 .../template.marko                                 |  2 +-
 .../attr-special-object-expression/template.marko  |  2 +-
 test/autotests/render/attrs/template.marko         |  2 +-
 .../components/test-hello/template.marko           |  2 +-
 test/autotests/render/body-only-if/template.marko  |  4 ++--
 .../tags/navigation-item/template.marko            |  2 +-
 .../circular-tags-no-write-to-disk/template.marko  |  2 +-
 .../render/concise-verbose/template.marko          |  6 +++---
 test/autotests/render/concise/template.marko       |  6 +++---
 .../render/conditional-attributes/template.marko   |  2 +-
 .../tags/test-template-as-tag/template.marko       |  2 +-
 .../tags/test-tag/index.marko                      |  2 +-
 .../dynamic-attributes-string/template.marko       |  2 +-
 .../render/dynamic-tag-name-concise/template.marko |  4 ++--
 .../render/dynamic-tag-name/template.marko         |  4 ++--
 .../render/empty-close-tag/template.marko          |  2 +-
 .../error-invalid-if-else-attr/template.marko      |  2 +-
 .../render/error-invalid-if-else-attr/test.js      |  2 +-
 .../error-invalid-if-else-if-attr/template.marko   |  2 +-
 .../template.marko                                 |  4 ++--
 .../error-invalid-if-else-if-else-attr/test.js     |  2 +-
 test/autotests/render/escape-script/template.marko |  4 ++--
 .../render/for-iterator-as-target/template.marko   |  2 +-
 .../render/for-iterator-attr/template.marko        |  2 +-
 .../for-iterator-status-var-attr/template.marko    |  2 +-
 .../render/for-iterator-status-var/template.marko  |  2 +-
 test/autotests/render/for-iterator/template.marko  |  2 +-
 test/autotests/render/for-props-map/template.marko |  2 +-
 .../render/for-tag-array-expression/template.marko |  2 +-
 test/autotests/render/function-tag/template.marko  |  2 +-
 test/autotests/render/hello-dynamic/template.marko |  2 +-
 test/autotests/render/if-else-attr/template.marko  |  2 +-
 .../render/if-else-if-attr/template.marko          |  2 +-
 .../render/if-else-if-else-attr/template.marko     |  4 ++--
 .../render/include-attr/include-target.marko       |  2 +-
 .../render/include-body-empty/include-target.marko |  6 +++---
 .../render/include-body/include-target.marko       |  4 ++--
 .../render/include-component/template.marko        |  2 +-
 .../render/include-data-body/include-target.marko  |  4 ++--
 .../render/include-data/include-target.marko       |  2 +-
 .../render/include-dynamic/include-target.marko    |  2 +-
 .../render/include-dynamic/template.marko          |  2 +-
 .../include-target.marko                           |  2 +-
 .../include-hyphen-attrs/include-target.marko      |  2 +-
 .../include-layout-data-attrs/layout-default.marko | 14 +++++++-------
 .../include-layout-data/layout-default.marko       | 12 ++++++------
 .../render/include-layout/layout-default.marko     | 12 ++++++------
 .../autotests/render/include-layout/template.marko |  2 +-
 .../template.marko                                 |  2 +-
 .../include-renderBody-no-data/template.marko      |  2 +-
 .../include-renderBody-string-arg/template.marko   |  2 +-
 .../render/include-renderBody/template.marko       |  2 +-
 .../render/include-whitespace/include-target.marko |  4 ++--
 test/autotests/render/include/include-target.marko |  2 +-
 test/autotests/render/inline-script/template.marko |  4 ++--
 .../marko-body-attr-parsed-text/template.marko     |  2 +-
 .../components/test-message/template.marko         |  6 +++---
 .../components/test-message/template.marko         |  2 +-
 .../components/test-message/template.marko         |  4 ++--
 .../components/test-message/template.marko         |  4 ++--
 .../components/test-message/template.marko         |  4 ++--
 .../components/test-message/template.marko         |  4 ++--
 .../components/test-message/template.marko         |  2 +-
 .../components/test-message/template.marko         |  2 +-
 .../components/test-message/template.marko         |  4 ++--
 .../tags/test-nested-tags-tabs/template.marko      |  2 +-
 .../tags/test-nested-tags-deep/template.marko      |  2 +-
 .../tags/test-nested-tags-tabs/template.marko      |  2 +-
 .../tags/test-nested-tags-overlay/template.marko   | 12 ++++++------
 .../nested-tags-repeated-parent/template.marko     |  2 +-
 .../tags/test-nested-tags-tabs/template.marko      |  2 +-
 .../tags/test-nested-tags-tabs/template.marko      |  2 +-
 .../tags/test-nested-tags-overlay/template.marko   | 12 ++++++------
 test/autotests/render/nested-tags/template.marko   |  2 +-
 .../autotests/render/reserved-words/template.marko |  2 +-
 .../scanned-tags/tags/scanned-b/template.marko     |  2 +-
 .../scanned-tags/tags/scanned-d/template.marko     |  2 +-
 test/autotests/render/script-nonce/template.marko  |  2 +-
 .../render/script-tag-entities/template.marko      |  2 +-
 .../render/shorthand-class-merge2/template.marko   |  2 +-
 .../shorthand-classes-many-classes/template.marko  |  2 +-
 .../render/shorthand-div-id-dynamic/template.marko |  4 ++--
 .../render/shorthand-div-id/template.marko         |  2 +-
 .../render/shorthand-div.foo/template.marko        |  2 +-
 .../render/shorthand-verbose/template.marko        |  2 +-
 .../render/simple-conditionals/template.marko      |  2 +-
 test/autotests/render/simple/template.marko        |  6 +++---
 .../render/string-expressions/template.marko       |  2 +-
 .../style-attr-string-dynamic/template.marko       |  2 +-
 .../render/syntax-concise/tabs/template.marko      |  2 +-
 .../autotests/render/syntax-concise/template.marko |  4 ++--
 .../render/syntax-mixed/tabs/template.marko        |  2 +-
 test/autotests/render/syntax-mixed/template.marko  |  4 ++--
 .../render/syntax-simple-concise/template.marko    |  6 +++---
 .../render/syntax-simple-mixed/template.marko      |  6 +++---
 .../render/syntax-simple-verbose/template.marko    |  6 +++---
 .../render/syntax-verbose/tabs/template.marko      |  2 +-
 .../autotests/render/syntax-verbose/template.marko |  4 ++--
 .../tabs-tab-new/tags/test-tabs-new/template.marko |  2 +-
 test/autotests/render/tabs-tab-new/template.marko  |  2 +-
 .../render/tabs-tab/tags/test-tabs/template.marko  |  2 +-
 test/autotests/render/tabs-tab/template.marko      |  2 +-
 .../tag-code-generator-return-array/template.marko |  2 +-
 .../tag-code-generator-return-node/template.marko  |  2 +-
 .../tag-code-generator-return-self/template.marko  |  2 +-
 .../tag-code-generator-return-tree/template.marko  |  2 +-
 .../template.marko                                 |  2 +-
 .../render/text-replacement/template.marko         |  4 ++--
 test/autotests/render/toHTML/template.marko        |  2 +-
 .../transformer-dynamic-tag-name/template.marko    |  2 +-
 test/autotests/render/xml-escaping/template.marko  |  4 ++--
 .../custom-events/components/app-bar/index.marko   |  2 +-
 .../components/app-custom-events/index.marko       |  2 +-
 .../components/app-simple/index.marko              |  2 +-
 .../widgets-browser/destroy-widget/index.marko     |  2 +-
 .../dom-events-repeated-el-bubbling/index.marko    |  2 +-
 .../index.marko                                    |  2 +-
 .../index.marko                                    |  2 +-
 .../components/app-fancy-button/index.marko        |  2 +-
 .../include-preserve-old/index.marko               |  2 +-
 .../preserve-dom-body-no-id/index.marko            |  6 +++---
 .../widgets-browser/preserve-dom-body/index.marko  |  6 +++---
 .../widgets-browser/preserve-dom-no-id/index.marko |  6 +++---
 .../widgets-browser/preserve-dom/index.marko       |  6 +++---
 .../widgets-browser/rerender-same-id/index.marko   |  2 +-
 .../sanity-check-template-entry-split/index.marko  |  2 +-
 .../transclusion-body-slot-attr/index.marko        |  2 +-
 .../index.marko                                    |  2 +-
 .../transclusion-body-slot-tag/index.marko         |  2 +-
 .../transclusion-include-from-state/index.marko    |  2 +-
 .../components/app-button/index.marko              |  2 +-
 .../transclusion-include-not-in-state/index.marko  |  2 +-
 .../update-manager-batch-updates/index.marko       |  2 +-
 .../update-manager-next-tick/index.marko           |  2 +-
 .../components/app-bar/index.marko                 |  2 +-
 .../components/app-custom-events/index.marko       |  2 +-
 .../components/app-bar/index.marko                 |  2 +-
 .../components/app-custom-events/index.marko       |  2 +-
 .../components/app-legacy-button/index.marko       |  2 +-
 .../components/app-custom-events/index.marko       |  2 +-
 .../components/app-legacy-button/index.marko       |  2 +-
 .../widget-dynamic-tag-name/index.marko            |  2 +-
 .../components/app-bar/index.marko                 |  2 +-
 .../widget-include-ref-dynamic/index.marko         |  2 +-
 .../components/app-bar/index.marko                 |  2 +-
 .../widgets-browser/widget-include-ref/index.marko |  2 +-
 .../index.marko                                    |  2 +-
 .../widget-lifecycle-events-stateful/index.marko   |  6 +++---
 .../widget-lifecycle-events-stateless/index.marko  |  2 +-
 .../widget-no-update-attrs-dynamic/index.marko     |  2 +-
 .../index.marko                                    |  8 ++++----
 .../index.marko                                    |  8 ++++----
 .../widget-preserve-dom-attrs-dynamic/index.marko  |  2 +-
 .../widget-preserve-dom-attrs/index.marko          |  4 ++--
 .../components/app-stateful-rerender/index.marko   |  8 ++++----
 .../widget-preserve-dom-if/index.marko             | 12 ++++++------
 .../widget-preserve-dom-root/index.marko           |  2 +-
 .../components/app-simple/index.marko              |  2 +-
 .../widget-repeated-id-widgetless/index.marko      |  2 +-
 .../app-rerender-init-order-child/index.marko      |  2 +-
 .../widget-rerender-init-order/index.marko         |  4 ++--
 .../widget-rerender-reuse-stateful/index.marko     |  2 +-
 .../index.marko                                    |  2 +-
 .../widget-setStateDirty/index.marko               |  2 +-
 .../components/app-stateful-button/index.marko     |  2 +-
 .../widget-stateful-reuse-widgets/index.marko      |  2 +-
 .../widget-stateful-update/index.marko             |  2 +-
 test/browser-tests-runner/page-template.marko.js   |  4 +++-
 178 files changed, 277 insertions(+), 268 deletions(-)
 create mode 100644 test/autotests/render-deprecated/data/expected.html
 create mode 100644 test/autotests/render-deprecated/data/template.marko
 create mode 100644 test/autotests/render-deprecated/data/test.js

diff --git a/compiler/ast/TemplateRoot.js b/compiler/ast/TemplateRoot.js
index 81b9d8d63..153212259 100644
--- a/compiler/ast/TemplateRoot.js
+++ b/compiler/ast/TemplateRoot.js
@@ -38,7 +38,9 @@ class TemplateRoot extends Node {
 
         var builder = codegen.builder;
 
-        let renderStatements = [];
+        let renderStatements = [
+            builder.var('data', builder.identifier('input'))
+        ];
         var vars = createVarsArray(context.getVars());
         if (vars.length) {
             renderStatements.push(builder.vars(vars));
@@ -56,7 +58,7 @@ class TemplateRoot extends Node {
                     builder.functionDeclaration(
                         null,
                         [
-                            builder.identifier('data'),
+                            builder.identifier('input'),
                             builder.identifierOut()
                         ],
                         renderStatements)
@@ -89,7 +91,7 @@ class TemplateRoot extends Node {
                 body = body.concat(staticNodes);
             }
 
-            var renderParams = [builder.identifier('data'), builder.identifierOut()];
+            var renderParams = [builder.identifier('input'), builder.identifierOut()];
             if (this.extraRenderParams) {
                 renderParams = renderParams.concat(this.extraRenderParams);
             }
diff --git a/test/autotests/render-deprecated/data/expected.html b/test/autotests/render-deprecated/data/expected.html
new file mode 100644
index 000000000..24a5b0935
--- /dev/null
+++ b/test/autotests/render-deprecated/data/expected.html
@@ -0,0 +1 @@
+Hello Frank! data===input ? true
\ No newline at end of file
diff --git a/test/autotests/render-deprecated/data/template.marko b/test/autotests/render-deprecated/data/template.marko
new file mode 100644
index 000000000..d488b7a77
--- /dev/null
+++ b/test/autotests/render-deprecated/data/template.marko
@@ -0,0 +1 @@
+-- Hello ${data.name}! data===input ? ${data === input}
\ No newline at end of file
diff --git a/test/autotests/render-deprecated/data/test.js b/test/autotests/render-deprecated/data/test.js
new file mode 100644
index 000000000..0266cde02
--- /dev/null
+++ b/test/autotests/render-deprecated/data/test.js
@@ -0,0 +1,3 @@
+exports.templateData = {
+    name: 'Frank'
+};
diff --git a/test/autotests/render/attr-boolean-dynamic/template.marko b/test/autotests/render/attr-boolean-dynamic/template.marko
index 1ff03738c..5fc74c4d4 100644
--- a/test/autotests/render/attr-boolean-dynamic/template.marko
+++ b/test/autotests/render/attr-boolean-dynamic/template.marko
@@ -1,5 +1,5 @@
 <select multiple>
     <option value="red">Red</option>
-    <option value="green" selected=(data.isGreenSelected)>Green</option>
-    <option value="blue" selected=(data.isBlueSelected)>Blue</option>
+    <option value="green" selected=(input.isGreenSelected)>Green</option>
+    <option value="blue" selected=(input.isBlueSelected)>Blue</option>
 </select>
\ No newline at end of file
diff --git a/test/autotests/render/attr-boolean-placeholder/template.marko b/test/autotests/render/attr-boolean-placeholder/template.marko
index 1d2864d69..a88abd18f 100644
--- a/test/autotests/render/attr-boolean-placeholder/template.marko
+++ b/test/autotests/render/attr-boolean-placeholder/template.marko
@@ -1,11 +1,11 @@
-<input type="checkbox" checked=data.checked>
+<input type="checkbox" checked=input.checked>
 
 <button disabled>Button</button>
 
 <select>
     <option value="${option.value}"
         selected=option.selected
-        for(option in data.options)>
+        for(option in input.options)>
 
         ${option.value}
 
diff --git a/test/autotests/render/attr-empty-dynamic/template.marko b/test/autotests/render/attr-empty-dynamic/template.marko
index 1aeb1e782..8e4ffdd70 100644
--- a/test/autotests/render/attr-empty-dynamic/template.marko
+++ b/test/autotests/render/attr-empty-dynamic/template.marko
@@ -1 +1 @@
-<img alt=(data.myAlt || true)>
+<img alt=(input.myAlt || true)>
diff --git a/test/autotests/render/attr-object-dynamic/template.marko b/test/autotests/render/attr-object-dynamic/template.marko
index ad44b1901..61ff69388 100644
--- a/test/autotests/render/attr-object-dynamic/template.marko
+++ b/test/autotests/render/attr-object-dynamic/template.marko
@@ -1 +1 @@
-<div value=data.myObject/>
\ No newline at end of file
+<div value=input.myObject/>
\ No newline at end of file
diff --git a/test/autotests/render/attr-placeholder-escaped-undefined/template.marko b/test/autotests/render/attr-placeholder-escaped-undefined/template.marko
index f78abeb50..e07452122 100644
--- a/test/autotests/render/attr-placeholder-escaped-undefined/template.marko
+++ b/test/autotests/render/attr-placeholder-escaped-undefined/template.marko
@@ -1,3 +1,3 @@
-<div foo='Hello ${data.foo || ''}'>
+<div foo='Hello ${input.foo || ''}'>
     Hello World!
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/attr-placeholder-unescaped-undefined/template.marko b/test/autotests/render/attr-placeholder-unescaped-undefined/template.marko
index 56d0379e4..984e3ba99 100644
--- a/test/autotests/render/attr-placeholder-unescaped-undefined/template.marko
+++ b/test/autotests/render/attr-placeholder-unescaped-undefined/template.marko
@@ -1,3 +1,3 @@
-<div foo='Hello $!{data.foo || ''}'>
+<div foo='Hello $!{input.foo || ''}'>
     Hello World!
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/attr-special-object-expression-circular/template.marko b/test/autotests/render/attr-special-object-expression-circular/template.marko
index d2ca0117a..7adaf32f3 100644
--- a/test/autotests/render/attr-special-object-expression-circular/template.marko
+++ b/test/autotests/render/attr-special-object-expression-circular/template.marko
@@ -1 +1 @@
-<div data-_onclick=data.parent/>
\ No newline at end of file
+<div data-_onclick=input.parent/>
\ No newline at end of file
diff --git a/test/autotests/render/attr-special-object-expression/template.marko b/test/autotests/render/attr-special-object-expression/template.marko
index b37cc2f26..4681abcef 100644
--- a/test/autotests/render/attr-special-object-expression/template.marko
+++ b/test/autotests/render/attr-special-object-expression/template.marko
@@ -1 +1 @@
-<div data-_onclick=data.specialData/>
\ No newline at end of file
+<div data-_onclick=input.specialData/>
\ No newline at end of file
diff --git a/test/autotests/render/attrs/template.marko b/test/autotests/render/attrs/template.marko
index 70f4e51ca..a7c2a641b 100644
--- a/test/autotests/render/attrs/template.marko
+++ b/test/autotests/render/attrs/template.marko
@@ -1,3 +1,3 @@
-<div ${data.myAttrs} data-encoding='"hello"'>
+<div ${input.myAttrs} data-encoding='"hello"'>
     Hello World!
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/body-only-if-custom-tag/components/test-hello/template.marko b/test/autotests/render/body-only-if-custom-tag/components/test-hello/template.marko
index 6073c758c..083132e8a 100644
--- a/test/autotests/render/body-only-if-custom-tag/components/test-hello/template.marko
+++ b/test/autotests/render/body-only-if-custom-tag/components/test-hello/template.marko
@@ -1,6 +1,6 @@
 <div class="hello">
     <h1>test-hello</h1>
     <div class="body">
-        <invoke data.renderBody(out) />
+        <invoke input.renderBody(out) />
     </div>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/body-only-if/template.marko b/test/autotests/render/body-only-if/template.marko
index a3d888dac..6d9f0479c 100644
--- a/test/autotests/render/body-only-if/template.marko
+++ b/test/autotests/render/body-only-if/template.marko
@@ -1,6 +1,6 @@
-<a href=data.url body-only-if(!data.url)>
+<a href=input.url body-only-if(!input.url)>
     Some Link
 </a>
-<a href=data.invalidUrl body-only-if(!data.invalidUrl)>
+<a href=input.invalidUrl body-only-if(!input.invalidUrl)>
     Another Link
 </a>
\ No newline at end of file
diff --git a/test/autotests/render/circular-tags-no-write-to-disk/tags/navigation-item/template.marko b/test/autotests/render/circular-tags-no-write-to-disk/tags/navigation-item/template.marko
index 9ce9a3e67..800410803 100644
--- a/test/autotests/render/circular-tags-no-write-to-disk/tags/navigation-item/template.marko
+++ b/test/autotests/render/circular-tags-no-write-to-disk/tags/navigation-item/template.marko
@@ -1,5 +1,5 @@
 <ul>
-    <li for(item in data.items)>
+    <li for(item in input.items)>
         <b>${item.label}</b>
         <navigation-item items=item.children if(item.children)/>
     </li>
diff --git a/test/autotests/render/circular-tags-no-write-to-disk/template.marko b/test/autotests/render/circular-tags-no-write-to-disk/template.marko
index 7cfddcf1d..755a73505 100644
--- a/test/autotests/render/circular-tags-no-write-to-disk/template.marko
+++ b/test/autotests/render/circular-tags-no-write-to-disk/template.marko
@@ -1 +1 @@
-<navigation-item items=data.items/>
\ No newline at end of file
+<navigation-item items=input.items/>
\ No newline at end of file
diff --git a/test/autotests/render/concise-verbose/template.marko b/test/autotests/render/concise-verbose/template.marko
index 92431a059..bb13bf31d 100644
--- a/test/autotests/render/concise-verbose/template.marko
+++ b/test/autotests/render/concise-verbose/template.marko
@@ -1,6 +1,6 @@
-div -- Hello ${data.name}
-    <span if(data.name)>
-        ${data.name}
+div -- Hello ${input.name}
+    <span if(input.name)>
+        ${input.name}
     </span>
     <p else>
         No name!
diff --git a/test/autotests/render/concise/template.marko b/test/autotests/render/concise/template.marko
index 2b503c91d..6d4e8a435 100644
--- a/test/autotests/render/concise/template.marko
+++ b/test/autotests/render/concise/template.marko
@@ -1,4 +1,4 @@
-div -- Hello ${data.name}
-    span if(data.name)
-        -- ${data.name}
+div -- Hello ${input.name}
+    span if(input.name)
+        -- ${input.name}
     p else -- No name!
diff --git a/test/autotests/render/conditional-attributes/template.marko b/test/autotests/render/conditional-attributes/template.marko
index 11070b3c1..877cf3947 100644
--- a/test/autotests/render/conditional-attributes/template.marko
+++ b/test/autotests/render/conditional-attributes/template.marko
@@ -1,3 +1,3 @@
 <div class=( false ? 'some-class' : undefined )></div>
 <div class=( true ? 'some-class' : false )></div>
-<div class=data.name></div>
\ No newline at end of file
+<div class=input.name></div>
\ No newline at end of file
diff --git a/test/autotests/render/custom-tag-as-template/tags/test-template-as-tag/template.marko b/test/autotests/render/custom-tag-as-template/tags/test-template-as-tag/template.marko
index 4a37c01d7..18b7d607f 100644
--- a/test/autotests/render/custom-tag-as-template/tags/test-template-as-tag/template.marko
+++ b/test/autotests/render/custom-tag-as-template/tags/test-template-as-tag/template.marko
@@ -1,3 +1,3 @@
 ---
-Hello ${data.name}!
+Hello ${input.name}!
 ---
\ No newline at end of file
diff --git a/test/autotests/render/custom-tag-template-index/tags/test-tag/index.marko b/test/autotests/render/custom-tag-template-index/tags/test-tag/index.marko
index 4a37c01d7..18b7d607f 100644
--- a/test/autotests/render/custom-tag-template-index/tags/test-tag/index.marko
+++ b/test/autotests/render/custom-tag-template-index/tags/test-tag/index.marko
@@ -1,3 +1,3 @@
 ---
-Hello ${data.name}!
+Hello ${input.name}!
 ---
\ No newline at end of file
diff --git a/test/autotests/render/dynamic-attributes-string/template.marko b/test/autotests/render/dynamic-attributes-string/template.marko
index a2657c859..32339a9b2 100644
--- a/test/autotests/render/dynamic-attributes-string/template.marko
+++ b/test/autotests/render/dynamic-attributes-string/template.marko
@@ -1 +1 @@
-<div ${data.attrs}>Hello World</div>
\ No newline at end of file
+<div ${input.attrs}>Hello World</div>
\ No newline at end of file
diff --git a/test/autotests/render/dynamic-tag-name-concise/template.marko b/test/autotests/render/dynamic-tag-name-concise/template.marko
index a0f44a9c3..9961d7697 100644
--- a/test/autotests/render/dynamic-tag-name-concise/template.marko
+++ b/test/autotests/render/dynamic-tag-name-concise/template.marko
@@ -1,5 +1,5 @@
-hello-${data.myTagName} class="my-class" foo="bar"
+hello-${input.myTagName} class="my-class" foo="bar"
     -- My nested content
 
-${data.foo ? 'foo' : 'bar'} class="my-class" foo="bar"
+${input.foo ? 'foo' : 'bar'} class="my-class" foo="bar"
     -- My nested content
\ No newline at end of file
diff --git a/test/autotests/render/dynamic-tag-name/template.marko b/test/autotests/render/dynamic-tag-name/template.marko
index a3d47637e..b629b9f70 100644
--- a/test/autotests/render/dynamic-tag-name/template.marko
+++ b/test/autotests/render/dynamic-tag-name/template.marko
@@ -1,7 +1,7 @@
-<hello-${data.myTagName} class="my-class" foo="bar">
+<hello-${input.myTagName} class="my-class" foo="bar">
     My nested content
 </>
 
-<${data.foo ? 'foo' : 'bar'} class="my-class" foo="bar">
+<${input.foo ? 'foo' : 'bar'} class="my-class" foo="bar">
     My nested content
 </>
\ No newline at end of file
diff --git a/test/autotests/render/empty-close-tag/template.marko b/test/autotests/render/empty-close-tag/template.marko
index 850714957..d4fb7ac3c 100644
--- a/test/autotests/render/empty-close-tag/template.marko
+++ b/test/autotests/render/empty-close-tag/template.marko
@@ -1,6 +1,6 @@
 p
     <span>
         <a>
-            Hello ${data.name}!
+            Hello ${input.name}!
         </>
     </>
\ No newline at end of file
diff --git a/test/autotests/render/error-invalid-if-else-attr/template.marko b/test/autotests/render/error-invalid-if-else-attr/template.marko
index fca19f9b5..998a742ca 100644
--- a/test/autotests/render/error-invalid-if-else-attr/template.marko
+++ b/test/autotests/render/error-invalid-if-else-attr/template.marko
@@ -1,4 +1,4 @@
-<div if(data.foo === dasda 0)>
+<div if(input.foo === dasda 0)>
     A
 </div>
 <div else>
diff --git a/test/autotests/render/error-invalid-if-else-attr/test.js b/test/autotests/render/error-invalid-if-else-attr/test.js
index 927428a60..09e28b6c2 100644
--- a/test/autotests/render/error-invalid-if-else-attr/test.js
+++ b/test/autotests/render/error-invalid-if-else-attr/test.js
@@ -5,5 +5,5 @@ exports.templateData = {};
 exports.checkError = function(e) {
     var message = e.toString();
     // expect(message).to.contain('Error: Unable to compile template at path');
-    expect(message).to.contain('Unexpected number: (data.foo === dasda 0)');
+    expect(message).to.contain('Unexpected number: (input.foo === dasda 0)');
 };
diff --git a/test/autotests/render/error-invalid-if-else-if-attr/template.marko b/test/autotests/render/error-invalid-if-else-if-attr/template.marko
index 47c8f5334..c114b2680 100644
--- a/test/autotests/render/error-invalid-if-else-if-attr/template.marko
+++ b/test/autotests/render/error-invalid-if-else-if-attr/template.marko
@@ -1,4 +1,4 @@
-<div if(data.foo === 0)>
+<div if(input.foo === 0)>
     A
 </div>
 <div else-if(true sds)>
diff --git a/test/autotests/render/error-invalid-if-else-if-else-attr/template.marko b/test/autotests/render/error-invalid-if-else-if-else-attr/template.marko
index 7743f1526..d9f815c2a 100644
--- a/test/autotests/render/error-invalid-if-else-if-else-attr/template.marko
+++ b/test/autotests/render/error-invalid-if-else-if-else-attr/template.marko
@@ -1,7 +1,7 @@
-<div if(data.foo === 0)>
+<div if(input.foo === 0)>
     A
 </div>
-<div else-if(data.foo ==== 1)>
+<div else-if(input.foo ==== 1)>
     B
 </div>
 <div else foo asasa sasa>
diff --git a/test/autotests/render/error-invalid-if-else-if-else-attr/test.js b/test/autotests/render/error-invalid-if-else-if-else-attr/test.js
index 3dae0a287..31ba771c4 100644
--- a/test/autotests/render/error-invalid-if-else-if-else-attr/test.js
+++ b/test/autotests/render/error-invalid-if-else-if-else-attr/test.js
@@ -4,5 +4,5 @@ exports.templateData = {};
 
 exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('Unexpected token =: (data.foo ==== 1)');
+    expect(message).to.contain('Unexpected token =: (input.foo ==== 1)');
 };
diff --git a/test/autotests/render/escape-script/template.marko b/test/autotests/render/escape-script/template.marko
index f12f01aad..4ff4986f7 100644
--- a/test/autotests/render/escape-script/template.marko
+++ b/test/autotests/render/escape-script/template.marko
@@ -1,4 +1,4 @@
 <script>
-    var foo = ${JSON.stringify(data.foo)};
+    var foo = ${JSON.stringify(input.foo)};
 </script>
-<pre>${JSON.stringify(data.foo)}</pre>
\ No newline at end of file
+<pre>${JSON.stringify(input.foo)}</pre>
\ No newline at end of file
diff --git a/test/autotests/render/for-iterator-as-target/template.marko b/test/autotests/render/for-iterator-as-target/template.marko
index 238861b1f..120ea1099 100644
--- a/test/autotests/render/for-iterator-as-target/template.marko
+++ b/test/autotests/render/for-iterator-as-target/template.marko
@@ -1,3 +1,3 @@
-<for(item in data.myIterator)>
+<for(item in input.myIterator)>
     ${item}
 </for>
\ No newline at end of file
diff --git a/test/autotests/render/for-iterator-attr/template.marko b/test/autotests/render/for-iterator-attr/template.marko
index 2ead1c6a8..10f774bd7 100644
--- a/test/autotests/render/for-iterator-attr/template.marko
+++ b/test/autotests/render/for-iterator-attr/template.marko
@@ -1,3 +1,3 @@
-<div for(item in ['a', 'b', 'c'] | iterator=data.reverseIterator)>
+<div for(item in ['a', 'b', 'c'] | iterator=input.reverseIterator)>
     ${item}
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/for-iterator-status-var-attr/template.marko b/test/autotests/render/for-iterator-status-var-attr/template.marko
index 669e2ee46..c8a94b5a4 100644
--- a/test/autotests/render/for-iterator-status-var-attr/template.marko
+++ b/test/autotests/render/for-iterator-status-var-attr/template.marko
@@ -1,3 +1,3 @@
-<div for(item in ['a', 'b', 'c'] | iterator=data.reverseIterator  status-var=status )>
+<div for(item in ['a', 'b', 'c'] | iterator=input.reverseIterator  status-var=status )>
     ${status.index}-${item}
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/for-iterator-status-var/template.marko b/test/autotests/render/for-iterator-status-var/template.marko
index 4185c475c..7b137da45 100644
--- a/test/autotests/render/for-iterator-status-var/template.marko
+++ b/test/autotests/render/for-iterator-status-var/template.marko
@@ -1,3 +1,3 @@
-<for (item in ['a', 'b', 'c'] | iterator=data.reverseIterator status-var=status )>
+<for (item in ['a', 'b', 'c'] | iterator=input.reverseIterator status-var=status )>
     ${status.index}-${item}
 </for>
\ No newline at end of file
diff --git a/test/autotests/render/for-iterator/template.marko b/test/autotests/render/for-iterator/template.marko
index 2f5bf609a..09a518f56 100644
--- a/test/autotests/render/for-iterator/template.marko
+++ b/test/autotests/render/for-iterator/template.marko
@@ -1,3 +1,3 @@
-<for(item in ['a', 'b', 'c'] | iterator=data.reverseIterator)>
+<for(item in ['a', 'b', 'c'] | iterator=input.reverseIterator)>
     ${item}
 </for>
\ No newline at end of file
diff --git a/test/autotests/render/for-props-map/template.marko b/test/autotests/render/for-props-map/template.marko
index 143663cff..0fd11db76 100644
--- a/test/autotests/render/for-props-map/template.marko
+++ b/test/autotests/render/for-props-map/template.marko
@@ -1,3 +1,3 @@
-<for(name,value in data.myMap)>
+<for(name,value in input.myMap)>
     [${name}=${value}]
 </for>
\ No newline at end of file
diff --git a/test/autotests/render/for-tag-array-expression/template.marko b/test/autotests/render/for-tag-array-expression/template.marko
index 571aa6bac..6f9f31994 100644
--- a/test/autotests/render/for-tag-array-expression/template.marko
+++ b/test/autotests/render/for-tag-array-expression/template.marko
@@ -1,4 +1,4 @@
-<for(color in data.colors | array)>
+<for(color in input.colors | array)>
     <div>
         ${color}
     </div>
diff --git a/test/autotests/render/function-tag/template.marko b/test/autotests/render/function-tag/template.marko
index 01ceab80c..7297ad712 100644
--- a/test/autotests/render/function-tag/template.marko
+++ b/test/autotests/render/function-tag/template.marko
@@ -1,5 +1,5 @@
 function getName() {
-    return data.firstName + ' ' + data.lastName;
+    return input.firstName + ' ' + input.lastName;
 }
 
 -- Hello ${getName()}
\ No newline at end of file
diff --git a/test/autotests/render/hello-dynamic/template.marko b/test/autotests/render/hello-dynamic/template.marko
index a6b2b14e1..4b0fa8967 100644
--- a/test/autotests/render/hello-dynamic/template.marko
+++ b/test/autotests/render/hello-dynamic/template.marko
@@ -1 +1 @@
--- Hello ${data.name}! Hello $!{data.name}! Hello $!{data.missing}!
\ No newline at end of file
+-- Hello ${input.name}! Hello $!{input.name}! Hello $!{input.missing}!
\ No newline at end of file
diff --git a/test/autotests/render/if-else-attr/template.marko b/test/autotests/render/if-else-attr/template.marko
index d468a9a48..43241ae14 100644
--- a/test/autotests/render/if-else-attr/template.marko
+++ b/test/autotests/render/if-else-attr/template.marko
@@ -1,4 +1,4 @@
-<div if(data.foo === 0)>
+<div if(input.foo === 0)>
     A
 </div>
 <div else>
diff --git a/test/autotests/render/if-else-if-attr/template.marko b/test/autotests/render/if-else-if-attr/template.marko
index d5136471f..578e58d62 100644
--- a/test/autotests/render/if-else-if-attr/template.marko
+++ b/test/autotests/render/if-else-if-attr/template.marko
@@ -1,4 +1,4 @@
-<div if(data.foo === 0)>
+<div if(input.foo === 0)>
     A
 </div>
 <div else-if(true)>
diff --git a/test/autotests/render/if-else-if-else-attr/template.marko b/test/autotests/render/if-else-if-else-attr/template.marko
index 455dfbe29..7d6d400b0 100644
--- a/test/autotests/render/if-else-if-else-attr/template.marko
+++ b/test/autotests/render/if-else-if-else-attr/template.marko
@@ -1,7 +1,7 @@
-<div if(data.foo === 0)>
+<div if(input.foo === 0)>
     A
 </div>
-<div else-if(data.foo === 1)>
+<div else-if(input.foo === 1)>
     B
 </div>
 <div else>
diff --git a/test/autotests/render/include-attr/include-target.marko b/test/autotests/render/include-attr/include-target.marko
index 73606bcce..f02007816 100644
--- a/test/autotests/render/include-attr/include-target.marko
+++ b/test/autotests/render/include-attr/include-target.marko
@@ -1 +1 @@
--- Hello ${data.name}! You have ${data.count} new messages.
\ No newline at end of file
+-- Hello ${input.name}! You have ${input.count} new messages.
\ No newline at end of file
diff --git a/test/autotests/render/include-body-empty/include-target.marko b/test/autotests/render/include-body-empty/include-target.marko
index 936da5c0c..688992c27 100644
--- a/test/autotests/render/include-body-empty/include-target.marko
+++ b/test/autotests/render/include-body-empty/include-target.marko
@@ -1,9 +1,9 @@
 <div>
     <h1>
-        Hello ${data.name}! You have ${data.count} new messages.
+        Hello ${input.name}! You have ${input.count} new messages.
     </h1>
-    <p if(data.renderBody)>
-        <invoke data.renderBody(out)/>
+    <p if(input.renderBody)>
+        <invoke input.renderBody(out)/>
     </p>
     <p else>
         No body!
diff --git a/test/autotests/render/include-body/include-target.marko b/test/autotests/render/include-body/include-target.marko
index 426ae13f1..bb3e9a7ab 100644
--- a/test/autotests/render/include-body/include-target.marko
+++ b/test/autotests/render/include-body/include-target.marko
@@ -1,8 +1,8 @@
 <div>
     <h1>
-        Hello ${data.name}! You have ${data.count} new messages.
+        Hello ${input.name}! You have ${input.count} new messages.
     </h1>
     <p>
-        <invoke data.renderBody(out)/>
+        <invoke input.renderBody(out)/>
     </p>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/include-component/template.marko b/test/autotests/render/include-component/template.marko
index 3da0b99b1..638a65c0c 100644
--- a/test/autotests/render/include-component/template.marko
+++ b/test/autotests/render/include-component/template.marko
@@ -1 +1 @@
-<include(data.component, {name: 'Frank'})/>
\ No newline at end of file
+<include(input.component, {name: 'Frank'})/>
\ No newline at end of file
diff --git a/test/autotests/render/include-data-body/include-target.marko b/test/autotests/render/include-data-body/include-target.marko
index 426ae13f1..bb3e9a7ab 100644
--- a/test/autotests/render/include-data-body/include-target.marko
+++ b/test/autotests/render/include-data-body/include-target.marko
@@ -1,8 +1,8 @@
 <div>
     <h1>
-        Hello ${data.name}! You have ${data.count} new messages.
+        Hello ${input.name}! You have ${input.count} new messages.
     </h1>
     <p>
-        <invoke data.renderBody(out)/>
+        <invoke input.renderBody(out)/>
     </p>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/include-data/include-target.marko b/test/autotests/render/include-data/include-target.marko
index 73606bcce..f02007816 100644
--- a/test/autotests/render/include-data/include-target.marko
+++ b/test/autotests/render/include-data/include-target.marko
@@ -1 +1 @@
--- Hello ${data.name}! You have ${data.count} new messages.
\ No newline at end of file
+-- Hello ${input.name}! You have ${input.count} new messages.
\ No newline at end of file
diff --git a/test/autotests/render/include-dynamic/include-target.marko b/test/autotests/render/include-dynamic/include-target.marko
index 73606bcce..f02007816 100644
--- a/test/autotests/render/include-dynamic/include-target.marko
+++ b/test/autotests/render/include-dynamic/include-target.marko
@@ -1 +1 @@
--- Hello ${data.name}! You have ${data.count} new messages.
\ No newline at end of file
+-- Hello ${input.name}! You have ${input.count} new messages.
\ No newline at end of file
diff --git a/test/autotests/render/include-dynamic/template.marko b/test/autotests/render/include-dynamic/template.marko
index d3d26cdcd..da5b4ac7a 100644
--- a/test/autotests/render/include-dynamic/template.marko
+++ b/test/autotests/render/include-dynamic/template.marko
@@ -1 +1 @@
-<include(data.includeTarget) name='Frank' count=20/>
\ No newline at end of file
+<include(input.includeTarget) name='Frank' count=20/>
\ No newline at end of file
diff --git a/test/autotests/render/include-hyphen-attrs-multiple/include-target.marko b/test/autotests/render/include-hyphen-attrs-multiple/include-target.marko
index 63d3d16ac..c63f6f0d1 100644
--- a/test/autotests/render/include-hyphen-attrs-multiple/include-target.marko
+++ b/test/autotests/render/include-hyphen-attrs-multiple/include-target.marko
@@ -1 +1 @@
--- Hello ${data.firstName} ${data.lastName}!
\ No newline at end of file
+-- Hello ${input.firstName} ${input.lastName}!
\ No newline at end of file
diff --git a/test/autotests/render/include-hyphen-attrs/include-target.marko b/test/autotests/render/include-hyphen-attrs/include-target.marko
index 67645f8d2..43ab0835d 100644
--- a/test/autotests/render/include-hyphen-attrs/include-target.marko
+++ b/test/autotests/render/include-hyphen-attrs/include-target.marko
@@ -1 +1 @@
--- Hello ${data.firstName}! You have ${data.count} new messages.
\ No newline at end of file
+-- Hello ${input.firstName}! You have ${input.count} new messages.
\ No newline at end of file
diff --git a/test/autotests/render/include-layout-data-attrs/layout-default.marko b/test/autotests/render/include-layout-data-attrs/layout-default.marko
index d87d56635..4be1dea90 100644
--- a/test/autotests/render/include-layout-data-attrs/layout-default.marko
+++ b/test/autotests/render/include-layout-data-attrs/layout-default.marko
@@ -1,17 +1,17 @@
-<h1 if(data.showHeader !== false)>
-    <if(data.header)>
-        <include(data.header)/>
+<h1 if(input.showHeader !== false)>
+    <if(input.header)>
+        <include(input.header)/>
     </if>
     <else>
         DEFAULT TITLE
     </else>
 </h1>
 <div>
-    <include(data.body)/>
+    <include(input.body)/>
 </div>
-<h1 if(data.showFooter !== false)>
-    <if(data.footer)>
-        <include(data.footer)/>
+<h1 if(input.showFooter !== false)>
+    <if(input.footer)>
+        <include(input.footer)/>
     </if>
     <else>
         DEFAULT FOOTER
diff --git a/test/autotests/render/include-layout-data/layout-default.marko b/test/autotests/render/include-layout-data/layout-default.marko
index 89c77315d..254071c00 100644
--- a/test/autotests/render/include-layout-data/layout-default.marko
+++ b/test/autotests/render/include-layout-data/layout-default.marko
@@ -1,13 +1,13 @@
-<h1 if(data.showHeader !== false)>
-    <if(data.header)>
-        <include(data.header)/>
+<h1 if(input.showHeader !== false)>
+    <if(input.header)>
+        <include(input.header)/>
     </if>
     <else>
         DEFAULT TITLE
     </else>
 </h1>
 <div>
-    <include(data.body)/>
+    <include(input.body)/>
 </div>
-<include(data.footer)/>
-<include(data.empty)/>
\ No newline at end of file
+<include(input.footer)/>
+<include(input.empty)/>
\ No newline at end of file
diff --git a/test/autotests/render/include-layout/layout-default.marko b/test/autotests/render/include-layout/layout-default.marko
index 89c77315d..254071c00 100644
--- a/test/autotests/render/include-layout/layout-default.marko
+++ b/test/autotests/render/include-layout/layout-default.marko
@@ -1,13 +1,13 @@
-<h1 if(data.showHeader !== false)>
-    <if(data.header)>
-        <include(data.header)/>
+<h1 if(input.showHeader !== false)>
+    <if(input.header)>
+        <include(input.header)/>
     </if>
     <else>
         DEFAULT TITLE
     </else>
 </h1>
 <div>
-    <include(data.body)/>
+    <include(input.body)/>
 </div>
-<include(data.footer)/>
-<include(data.empty)/>
\ No newline at end of file
+<include(input.footer)/>
+<include(input.empty)/>
\ No newline at end of file
diff --git a/test/autotests/render/include-layout/template.marko b/test/autotests/render/include-layout/template.marko
index 8e60c80d7..92065c698 100644
--- a/test/autotests/render/include-layout/template.marko
+++ b/test/autotests/render/include-layout/template.marko
@@ -12,7 +12,7 @@
     <@body>BODY CONTENT</@body>
     <@footer>FOOTER CONTENT</@footer>
 </include>
-<include(data.layoutDynamic) show-header=true>
+<include(input.layoutDynamic) show-header=true>
     <@body>BODY CONTENT</@body>
     <@footer>FOOTER CONTENT</@footer>
 </include>
\ No newline at end of file
diff --git a/test/autotests/render/include-renderBody-data-and-attrs/template.marko b/test/autotests/render/include-renderBody-data-and-attrs/template.marko
index fe68e42b1..aaff90cc5 100644
--- a/test/autotests/render/include-renderBody-data-and-attrs/template.marko
+++ b/test/autotests/render/include-renderBody-data-and-attrs/template.marko
@@ -1 +1 @@
-<include(data.renderBody, {name: 'Frank'}) age=10/>
\ No newline at end of file
+<include(input.renderBody, {name: 'Frank'}) age=10/>
\ No newline at end of file
diff --git a/test/autotests/render/include-renderBody-no-data/template.marko b/test/autotests/render/include-renderBody-no-data/template.marko
index 8f4f9e3ac..9043fae83 100644
--- a/test/autotests/render/include-renderBody-no-data/template.marko
+++ b/test/autotests/render/include-renderBody-no-data/template.marko
@@ -1 +1 @@
-<include(data.renderBody)/>
\ No newline at end of file
+<include(input.renderBody)/>
\ No newline at end of file
diff --git a/test/autotests/render/include-renderBody-string-arg/template.marko b/test/autotests/render/include-renderBody-string-arg/template.marko
index 6b123054c..ee9e577d8 100644
--- a/test/autotests/render/include-renderBody-string-arg/template.marko
+++ b/test/autotests/render/include-renderBody-string-arg/template.marko
@@ -1 +1 @@
-<include(data.renderBody, 'Frank')/>
\ No newline at end of file
+<include(input.renderBody, 'Frank')/>
\ No newline at end of file
diff --git a/test/autotests/render/include-renderBody/template.marko b/test/autotests/render/include-renderBody/template.marko
index c0c3d0ad9..80776cbdb 100644
--- a/test/autotests/render/include-renderBody/template.marko
+++ b/test/autotests/render/include-renderBody/template.marko
@@ -1 +1 @@
-<include(data.renderBody, {name: 'Frank'})/>
\ No newline at end of file
+<include(input.renderBody, {name: 'Frank'})/>
\ No newline at end of file
diff --git a/test/autotests/render/include-whitespace/include-target.marko b/test/autotests/render/include-whitespace/include-target.marko
index 426ae13f1..bb3e9a7ab 100644
--- a/test/autotests/render/include-whitespace/include-target.marko
+++ b/test/autotests/render/include-whitespace/include-target.marko
@@ -1,8 +1,8 @@
 <div>
     <h1>
-        Hello ${data.name}! You have ${data.count} new messages.
+        Hello ${input.name}! You have ${input.count} new messages.
     </h1>
     <p>
-        <invoke data.renderBody(out)/>
+        <invoke input.renderBody(out)/>
     </p>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/include/include-target.marko b/test/autotests/render/include/include-target.marko
index 73606bcce..f02007816 100644
--- a/test/autotests/render/include/include-target.marko
+++ b/test/autotests/render/include/include-target.marko
@@ -1 +1 @@
--- Hello ${data.name}! You have ${data.count} new messages.
\ No newline at end of file
+-- Hello ${input.name}! You have ${input.count} new messages.
\ No newline at end of file
diff --git a/test/autotests/render/inline-script/template.marko b/test/autotests/render/inline-script/template.marko
index e7262c86c..54dfb09bb 100644
--- a/test/autotests/render/inline-script/template.marko
+++ b/test/autotests/render/inline-script/template.marko
@@ -1,4 +1,4 @@
-<var name="name" value="data.name"/>
+<var name="name" value="input.name"/>
 
 <html>
     <head>
@@ -10,7 +10,7 @@
         <script type="text/javascript">
         <div if(foo)></div>
         $(function() {
-            alert('${data.name}');
+            alert('${input.name}');
         })
         </script>
     </body>
diff --git a/test/autotests/render/marko-body-attr-parsed-text/template.marko b/test/autotests/render/marko-body-attr-parsed-text/template.marko
index 5a6364aa1..8b2bf052b 100644
--- a/test/autotests/render/marko-body-attr-parsed-text/template.marko
+++ b/test/autotests/render/marko-body-attr-parsed-text/template.marko
@@ -1,5 +1,5 @@
 <div marko-body="parsed-text">
     <span if(foo)>
-            Hello ${data.name}!
+            Hello ${input.name}!
     </span>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/nested-tag-bad/components/test-message/template.marko b/test/autotests/render/nested-tag-bad/components/test-message/template.marko
index 5517e0108..e75775539 100644
--- a/test/autotests/render/nested-tag-bad/components/test-message/template.marko
+++ b/test/autotests/render/nested-tag-bad/components/test-message/template.marko
@@ -1,11 +1,11 @@
 <div class="message">
     <h1>
-        <include(data.title)/>
+        <include(input.title)/>
     </h1>
     <div>
-        <include(data.body)/>
+        <include(input.body)/>
     </div>
     <div>
-        <include(data.renderBody)/>
+        <include(input.renderBody)/>
     </div>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/nested-tag-shorthand-complex-logic-repeated/components/test-message/template.marko b/test/autotests/render/nested-tag-shorthand-complex-logic-repeated/components/test-message/template.marko
index 6ce32031a..786a3e6b2 100644
--- a/test/autotests/render/nested-tag-shorthand-complex-logic-repeated/components/test-message/template.marko
+++ b/test/autotests/render/nested-tag-shorthand-complex-logic-repeated/components/test-message/template.marko
@@ -1,5 +1,5 @@
 <ul>
-    <li for(item in data.items)>
+    <li for(item in input.items)>
         <h1>${item.title}</h1>
         <include(item.renderBody)/>
     </li>
diff --git a/test/autotests/render/nested-tag-shorthand-complex-logic/components/test-message/template.marko b/test/autotests/render/nested-tag-shorthand-complex-logic/components/test-message/template.marko
index 07c8c89c9..70b2f57b0 100644
--- a/test/autotests/render/nested-tag-shorthand-complex-logic/components/test-message/template.marko
+++ b/test/autotests/render/nested-tag-shorthand-complex-logic/components/test-message/template.marko
@@ -1,8 +1,8 @@
 <div class="message">
     <h1>
-        <include(data.title)/>
+        <include(input.title)/>
     </h1>
     <div>
-        <include(data.body)/>
+        <include(input.body)/>
     </div>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/nested-tag-shorthand-simple-conditional/components/test-message/template.marko b/test/autotests/render/nested-tag-shorthand-simple-conditional/components/test-message/template.marko
index 07c8c89c9..70b2f57b0 100644
--- a/test/autotests/render/nested-tag-shorthand-simple-conditional/components/test-message/template.marko
+++ b/test/autotests/render/nested-tag-shorthand-simple-conditional/components/test-message/template.marko
@@ -1,8 +1,8 @@
 <div class="message">
     <h1>
-        <include(data.title)/>
+        <include(input.title)/>
     </h1>
     <div>
-        <include(data.body)/>
+        <include(input.body)/>
     </div>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/nested-tag-shorthand-simple-declared-invalid-attribute/components/test-message/template.marko b/test/autotests/render/nested-tag-shorthand-simple-declared-invalid-attribute/components/test-message/template.marko
index 9c2ca8f13..cc371c967 100644
--- a/test/autotests/render/nested-tag-shorthand-simple-declared-invalid-attribute/components/test-message/template.marko
+++ b/test/autotests/render/nested-tag-shorthand-simple-declared-invalid-attribute/components/test-message/template.marko
@@ -1,8 +1,8 @@
 <div class="message">
     <h1>
-        <b>${data.header.label}:</b> <include(data.header)/>
+        <b>${input.header.label}:</b> <include(input.header)/>
     </h1>
     <div>
-        <b>${data.body.label}:</b> <include(data.body)/>
+        <b>${input.body.label}:</b> <include(input.body)/>
     </div>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/nested-tag-shorthand-simple-declared/components/test-message/template.marko b/test/autotests/render/nested-tag-shorthand-simple-declared/components/test-message/template.marko
index 9c2ca8f13..cc371c967 100644
--- a/test/autotests/render/nested-tag-shorthand-simple-declared/components/test-message/template.marko
+++ b/test/autotests/render/nested-tag-shorthand-simple-declared/components/test-message/template.marko
@@ -1,8 +1,8 @@
 <div class="message">
     <h1>
-        <b>${data.header.label}:</b> <include(data.header)/>
+        <b>${input.header.label}:</b> <include(input.header)/>
     </h1>
     <div>
-        <b>${data.body.label}:</b> <include(data.body)/>
+        <b>${input.body.label}:</b> <include(input.body)/>
     </div>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/nested-tag-shorthand-simple-repeated-conditional/components/test-message/template.marko b/test/autotests/render/nested-tag-shorthand-simple-repeated-conditional/components/test-message/template.marko
index 6ce32031a..786a3e6b2 100644
--- a/test/autotests/render/nested-tag-shorthand-simple-repeated-conditional/components/test-message/template.marko
+++ b/test/autotests/render/nested-tag-shorthand-simple-repeated-conditional/components/test-message/template.marko
@@ -1,5 +1,5 @@
 <ul>
-    <li for(item in data.items)>
+    <li for(item in input.items)>
         <h1>${item.title}</h1>
         <include(item.renderBody)/>
     </li>
diff --git a/test/autotests/render/nested-tag-shorthand-simple-repeated/components/test-message/template.marko b/test/autotests/render/nested-tag-shorthand-simple-repeated/components/test-message/template.marko
index 6ce32031a..786a3e6b2 100644
--- a/test/autotests/render/nested-tag-shorthand-simple-repeated/components/test-message/template.marko
+++ b/test/autotests/render/nested-tag-shorthand-simple-repeated/components/test-message/template.marko
@@ -1,5 +1,5 @@
 <ul>
-    <li for(item in data.items)>
+    <li for(item in input.items)>
         <h1>${item.title}</h1>
         <include(item.renderBody)/>
     </li>
diff --git a/test/autotests/render/nested-tag-shorthand-simple/components/test-message/template.marko b/test/autotests/render/nested-tag-shorthand-simple/components/test-message/template.marko
index 84e6fd4f6..8d5b3e884 100644
--- a/test/autotests/render/nested-tag-shorthand-simple/components/test-message/template.marko
+++ b/test/autotests/render/nested-tag-shorthand-simple/components/test-message/template.marko
@@ -1,8 +1,8 @@
 <div class="message">
     <h1>
-        ${data.title.label}: <include(data.title)/>
+        ${input.title.label}: <include(input.title)/>
     </h1>
     <div>
-        ${data.body.label}: <include(data.body)/>
+        ${input.body.label}: <include(input.body)/>
     </div>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/nested-tags-concise/tags/test-nested-tags-tabs/template.marko b/test/autotests/render/nested-tags-concise/tags/test-nested-tags-tabs/template.marko
index 0fd426ed6..e103df398 100644
--- a/test/autotests/render/nested-tags-concise/tags/test-nested-tags-tabs/template.marko
+++ b/test/autotests/render/nested-tags-concise/tags/test-nested-tags-tabs/template.marko
@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul>
diff --git a/test/autotests/render/nested-tags-deep/tags/test-nested-tags-deep/template.marko b/test/autotests/render/nested-tags-deep/tags/test-nested-tags-deep/template.marko
index 991f326d5..17be755fa 100644
--- a/test/autotests/render/nested-tags-deep/tags/test-nested-tags-deep/template.marko
+++ b/test/autotests/render/nested-tags-deep/tags/test-nested-tags-deep/template.marko
@@ -1,4 +1,4 @@
-<div for(item in data.items)>
+<div for(item in input.items)>
     Foo: ${item.foo}
     Body: <invoke item.body.renderBody(out) if(item.body)/>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/nested-tags-empty-body/tags/test-nested-tags-tabs/template.marko b/test/autotests/render/nested-tags-empty-body/tags/test-nested-tags-tabs/template.marko
index 0fd426ed6..e103df398 100644
--- a/test/autotests/render/nested-tags-empty-body/tags/test-nested-tags-tabs/template.marko
+++ b/test/autotests/render/nested-tags-empty-body/tags/test-nested-tags-tabs/template.marko
@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul>
diff --git a/test/autotests/render/nested-tags-repeated-parent/tags/test-nested-tags-overlay/template.marko b/test/autotests/render/nested-tags-repeated-parent/tags/test-nested-tags-overlay/template.marko
index 2bfa2303f..883020b5c 100644
--- a/test/autotests/render/nested-tags-repeated-parent/tags/test-nested-tags-overlay/template.marko
+++ b/test/autotests/render/nested-tags-repeated-parent/tags/test-nested-tags-overlay/template.marko
@@ -1,13 +1,13 @@
 <div class="overlay">
-    <div class="overlay-header ${data.header.className || ''}" if(data.header)>
-        <invoke data.header.renderBody(out)/>
+    <div class="overlay-header ${input.header.className || ''}" if(input.header)>
+        <invoke input.header.renderBody(out)/>
     </div>
 
-    <div class="overlay-body ${data.body.className}" if(data.body)>
-        <invoke data.body.renderBody(out)/>
+    <div class="overlay-body ${input.body.className}" if(input.body)>
+        <invoke input.body.renderBody(out)/>
     </div>
 
-    <div class="overlay-footer ${data.footer.className}" if(data.footer)>
-        <invoke data.footer.renderBody(out)/>
+    <div class="overlay-footer ${input.footer.className}" if(input.footer)>
+        <invoke input.footer.renderBody(out)/>
     </div>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/nested-tags-repeated-parent/template.marko b/test/autotests/render/nested-tags-repeated-parent/template.marko
index d832f99d2..61dc3a5db 100644
--- a/test/autotests/render/nested-tags-repeated-parent/template.marko
+++ b/test/autotests/render/nested-tags-repeated-parent/template.marko
@@ -1,4 +1,4 @@
-<test-nested-tags-overlay header=data.header>
+<test-nested-tags-overlay header=input.header>
 
     <test-nested-tags-overlay:body class="my-body">
         Body content
diff --git a/test/autotests/render/nested-tags-repeated/tags/test-nested-tags-tabs/template.marko b/test/autotests/render/nested-tags-repeated/tags/test-nested-tags-tabs/template.marko
index 0fd426ed6..e103df398 100644
--- a/test/autotests/render/nested-tags-repeated/tags/test-nested-tags-tabs/template.marko
+++ b/test/autotests/render/nested-tags-repeated/tags/test-nested-tags-tabs/template.marko
@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul>
diff --git a/test/autotests/render/nested-tags-self-closing/tags/test-nested-tags-tabs/template.marko b/test/autotests/render/nested-tags-self-closing/tags/test-nested-tags-tabs/template.marko
index 0fd426ed6..e103df398 100644
--- a/test/autotests/render/nested-tags-self-closing/tags/test-nested-tags-tabs/template.marko
+++ b/test/autotests/render/nested-tags-self-closing/tags/test-nested-tags-tabs/template.marko
@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul>
diff --git a/test/autotests/render/nested-tags/tags/test-nested-tags-overlay/template.marko b/test/autotests/render/nested-tags/tags/test-nested-tags-overlay/template.marko
index 7e8bc7795..ef7968c44 100644
--- a/test/autotests/render/nested-tags/tags/test-nested-tags-overlay/template.marko
+++ b/test/autotests/render/nested-tags/tags/test-nested-tags-overlay/template.marko
@@ -1,13 +1,13 @@
 <div class="overlay">
-    <div class="overlay-header" if(data.header)>
-        <invoke data.header.renderBody(out)/>
+    <div class="overlay-header" if(input.header)>
+        <invoke input.header.renderBody(out)/>
     </div>
 
-    <div class="overlay-body ${data.body.className}" if(data.body)>
-        <invoke data.body.renderBody(out)/>
+    <div class="overlay-body ${input.body.className}" if(input.body)>
+        <invoke input.body.renderBody(out)/>
     </div>
 
-    <div class="overlay-footer ${data.footer.className}" if(data.footer)>
-        <invoke data.footer.renderBody(out)/>
+    <div class="overlay-footer ${input.footer.className}" if(input.footer)>
+        <invoke input.footer.renderBody(out)/>
     </div>
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/nested-tags/template.marko b/test/autotests/render/nested-tags/template.marko
index d484664b9..1abb3d3ff 100644
--- a/test/autotests/render/nested-tags/template.marko
+++ b/test/autotests/render/nested-tags/template.marko
@@ -1,4 +1,4 @@
-<test-nested-tags-overlay header=data.header>
+<test-nested-tags-overlay header=input.header>
 
     <test-nested-tags-overlay:body class="my-body">
         Body content
diff --git a/test/autotests/render/reserved-words/template.marko b/test/autotests/render/reserved-words/template.marko
index 69964300e..a7cad1d64 100644
--- a/test/autotests/render/reserved-words/template.marko
+++ b/test/autotests/render/reserved-words/template.marko
@@ -1,3 +1,3 @@
 <my-custom-tag short="World"/>
 
--- Hello ${data.short}
\ No newline at end of file
+-- Hello ${input.short}
\ No newline at end of file
diff --git a/test/autotests/render/scanned-tags/tags/scanned-b/template.marko b/test/autotests/render/scanned-tags/tags/scanned-b/template.marko
index 4a90a9116..45ae34e2d 100644
--- a/test/autotests/render/scanned-tags/tags/scanned-b/template.marko
+++ b/test/autotests/render/scanned-tags/tags/scanned-b/template.marko
@@ -1,3 +1,3 @@
 ---
-scanned-b: Hello ${data.name}
+scanned-b: Hello ${input.name}
 ---
\ No newline at end of file
diff --git a/test/autotests/render/scanned-tags/tags/scanned-d/template.marko b/test/autotests/render/scanned-tags/tags/scanned-d/template.marko
index 222778e72..33a049ae8 100644
--- a/test/autotests/render/scanned-tags/tags/scanned-d/template.marko
+++ b/test/autotests/render/scanned-tags/tags/scanned-d/template.marko
@@ -9,5 +9,5 @@ TAG = {
 }
 -->
 ---
-scanned-d: Hello ${data.NAME}
+scanned-d: Hello ${input.NAME}
 ---
\ No newline at end of file
diff --git a/test/autotests/render/script-nonce/template.marko b/test/autotests/render/script-nonce/template.marko
index 9609c961b..7da452290 100644
--- a/test/autotests/render/script-nonce/template.marko
+++ b/test/autotests/render/script-nonce/template.marko
@@ -1,3 +1,3 @@
-<script foo="bar" ${data.myAttrs} csp-nonce>
+<script foo="bar" ${input.myAttrs} csp-nonce>
 console.log('foo')
 </script>
\ No newline at end of file
diff --git a/test/autotests/render/script-tag-entities/template.marko b/test/autotests/render/script-tag-entities/template.marko
index b8720ac74..52a668ef8 100644
--- a/test/autotests/render/script-tag-entities/template.marko
+++ b/test/autotests/render/script-tag-entities/template.marko
@@ -1 +1 @@
-<script>document.write('<div>Hello ${data.name}</div>');</script>
\ No newline at end of file
+<script>document.write('<div>Hello ${input.name}</div>');</script>
\ No newline at end of file
diff --git a/test/autotests/render/shorthand-class-merge2/template.marko b/test/autotests/render/shorthand-class-merge2/template.marko
index 0d9142c65..de2617187 100644
--- a/test/autotests/render/shorthand-class-merge2/template.marko
+++ b/test/autotests/render/shorthand-class-merge2/template.marko
@@ -1 +1 @@
-div.foo.${data.missing} class="baz"
\ No newline at end of file
+div.foo.${input.missing} class="baz"
\ No newline at end of file
diff --git a/test/autotests/render/shorthand-classes-many-classes/template.marko b/test/autotests/render/shorthand-classes-many-classes/template.marko
index 0549b2d59..f98c8e97d 100644
--- a/test/autotests/render/shorthand-classes-many-classes/template.marko
+++ b/test/autotests/render/shorthand-classes-many-classes/template.marko
@@ -1,3 +1,3 @@
 .foo.bar.baz.bat
-.foo.bar.${data.cls}.baz
+.foo.bar.${input.cls}.baz
 .foo.bar.baz class="test"
\ No newline at end of file
diff --git a/test/autotests/render/shorthand-div-id-dynamic/template.marko b/test/autotests/render/shorthand-div-id-dynamic/template.marko
index 7dbc5efa4..f485ac337 100644
--- a/test/autotests/render/shorthand-div-id-dynamic/template.marko
+++ b/test/autotests/render/shorthand-div-id-dynamic/template.marko
@@ -1,2 +1,2 @@
-div#foo-${data.name} style="color: red;"
-    -- Hello ${data.name}!
\ No newline at end of file
+div#foo-${input.name} style="color: red;"
+    -- Hello ${input.name}!
\ No newline at end of file
diff --git a/test/autotests/render/shorthand-div-id/template.marko b/test/autotests/render/shorthand-div-id/template.marko
index 5347018b9..591ab1e5c 100644
--- a/test/autotests/render/shorthand-div-id/template.marko
+++ b/test/autotests/render/shorthand-div-id/template.marko
@@ -1,2 +1,2 @@
 div#foo style="color: red;"
-    -- Hello ${data.name}!
\ No newline at end of file
+    -- Hello ${input.name}!
\ No newline at end of file
diff --git a/test/autotests/render/shorthand-div.foo/template.marko b/test/autotests/render/shorthand-div.foo/template.marko
index d269b5682..ff26aba71 100644
--- a/test/autotests/render/shorthand-div.foo/template.marko
+++ b/test/autotests/render/shorthand-div.foo/template.marko
@@ -1,2 +1,2 @@
 div.foo style="color: red;"
-    -- Hello ${data.name}!
\ No newline at end of file
+    -- Hello ${input.name}!
\ No newline at end of file
diff --git a/test/autotests/render/shorthand-verbose/template.marko b/test/autotests/render/shorthand-verbose/template.marko
index 1bffc930b..d40181ed9 100644
--- a/test/autotests/render/shorthand-verbose/template.marko
+++ b/test/autotests/render/shorthand-verbose/template.marko
@@ -1,3 +1,3 @@
 <#foo.bar.baz>
-    Hello ${data.name}!
+    Hello ${input.name}!
 </>
\ No newline at end of file
diff --git a/test/autotests/render/simple-conditionals/template.marko b/test/autotests/render/simple-conditionals/template.marko
index fb053c474..2de4043ef 100644
--- a/test/autotests/render/simple-conditionals/template.marko
+++ b/test/autotests/render/simple-conditionals/template.marko
@@ -1,4 +1,4 @@
-<var name=data.name count=data.count/>
+<var name=input.name count=input.count/>
 
 <div class=( count>50 ? 'over-50' : null)></div>
 <div class=( count<50 ? 'under-50' : null)></div>
diff --git a/test/autotests/render/simple/template.marko b/test/autotests/render/simple/template.marko
index 88e4980a0..5a3c213e2 100644
--- a/test/autotests/render/simple/template.marko
+++ b/test/autotests/render/simple/template.marko
@@ -1,6 +1,6 @@
-<var rootClass=data.rootClass
-     colors=data.colors
-     message=data.message />
+<var rootClass=input.rootClass
+     colors=input.colors
+     message=input.message />
 
 <div class="hello-world ${rootClass}">
     ${message}
diff --git a/test/autotests/render/string-expressions/template.marko b/test/autotests/render/string-expressions/template.marko
index 05bb8bf31..00a89d4df 100644
--- a/test/autotests/render/string-expressions/template.marko
+++ b/test/autotests/render/string-expressions/template.marko
@@ -1,2 +1,2 @@
-<var name=data.name count=data.count/>
+<var name=input.name count=input.count/>
 -- ${name != null ? "Hello ${name.toUpperCase()}! You have ${count} new messages." : null}
\ No newline at end of file
diff --git a/test/autotests/render/style-attr-string-dynamic/template.marko b/test/autotests/render/style-attr-string-dynamic/template.marko
index 2191218ce..0b8d9bafe 100644
--- a/test/autotests/render/style-attr-string-dynamic/template.marko
+++ b/test/autotests/render/style-attr-string-dynamic/template.marko
@@ -1 +1 @@
-div style=data.style
\ No newline at end of file
+div style=input.style
\ No newline at end of file
diff --git a/test/autotests/render/syntax-concise/tabs/template.marko b/test/autotests/render/syntax-concise/tabs/template.marko
index 0fd426ed6..e103df398 100644
--- a/test/autotests/render/syntax-concise/tabs/template.marko
+++ b/test/autotests/render/syntax-concise/tabs/template.marko
@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul>
diff --git a/test/autotests/render/syntax-concise/template.marko b/test/autotests/render/syntax-concise/template.marko
index 1925819dd..c93344dc4 100644
--- a/test/autotests/render/syntax-concise/template.marko
+++ b/test/autotests/render/syntax-concise/template.marko
@@ -20,8 +20,8 @@ html lang="en"
             li for(feature in ['async', 'streaming', 'custom-tags', 'readable', 'modules'])
                 -- ${feature}
 
-        ul if(data.colors && data.colors.length)
-            li for(color in data.colors) -- ${color}
+        ul if(input.colors && input.colors.length)
+            li for(color in input.colors) -- ${color}
         div else
             -- No colors!
 
diff --git a/test/autotests/render/syntax-mixed/tabs/template.marko b/test/autotests/render/syntax-mixed/tabs/template.marko
index 0fd426ed6..e103df398 100644
--- a/test/autotests/render/syntax-mixed/tabs/template.marko
+++ b/test/autotests/render/syntax-mixed/tabs/template.marko
@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul>
diff --git a/test/autotests/render/syntax-mixed/template.marko b/test/autotests/render/syntax-mixed/template.marko
index 420503cfb..ed624af61 100644
--- a/test/autotests/render/syntax-mixed/template.marko
+++ b/test/autotests/render/syntax-mixed/template.marko
@@ -20,8 +20,8 @@ html lang="en"
             li for(feature in ['async', 'streaming', 'custom-tags', 'readable', 'modules'])
                 -- ${feature}
 
-        ul if(data.colors && data.colors.length)
-            li for(color in data.colors) -- ${color}
+        ul if(input.colors && input.colors.length)
+            li for(color in input.colors) -- ${color}
         div else
             -- No colors!
 
diff --git a/test/autotests/render/syntax-simple-concise/template.marko b/test/autotests/render/syntax-simple-concise/template.marko
index a079686d8..d4c972947 100644
--- a/test/autotests/render/syntax-simple-concise/template.marko
+++ b/test/autotests/render/syntax-simple-concise/template.marko
@@ -3,9 +3,9 @@ html lang="en"
     head
         title -- Marko Templating Engine
     body
-        h1 -- Hello ${data.name}!
-        ul if(data.colors.length)
-            li for(color in data.colors)
+        h1 -- Hello ${input.name}!
+        ul if(input.colors.length)
+            li for(color in input.colors)
                 -- ${color}
         div else
             -- No colors!
\ No newline at end of file
diff --git a/test/autotests/render/syntax-simple-mixed/template.marko b/test/autotests/render/syntax-simple-mixed/template.marko
index 8e258016f..37e4e895a 100644
--- a/test/autotests/render/syntax-simple-mixed/template.marko
+++ b/test/autotests/render/syntax-simple-mixed/template.marko
@@ -4,10 +4,10 @@ html lang="en"
         title -- Marko Templating Engine
     body
         <h1>
-            Hello ${data.name}!
+            Hello ${input.name}!
         </h1>
-        ul if(data.colors.length)
-            li for(color in data.colors)
+        ul if(input.colors.length)
+            li for(color in input.colors)
                 -- ${color}
         div else
             -- No colors!
\ No newline at end of file
diff --git a/test/autotests/render/syntax-simple-verbose/template.marko b/test/autotests/render/syntax-simple-verbose/template.marko
index 99d7a8abf..55e2bd7fa 100644
--- a/test/autotests/render/syntax-simple-verbose/template.marko
+++ b/test/autotests/render/syntax-simple-verbose/template.marko
@@ -5,11 +5,11 @@
     </head>
     <body>
         <h1>
-            Hello ${data.name}!
+            Hello ${input.name}!
         </h1>
 
-        <ul if(data.colors.length)>
-            <li for(color in data.colors)>
+        <ul if(input.colors.length)>
+            <li for(color in input.colors)>
                 ${color}
             </li>
         </ul>
diff --git a/test/autotests/render/syntax-verbose/tabs/template.marko b/test/autotests/render/syntax-verbose/tabs/template.marko
index 0fd426ed6..e103df398 100644
--- a/test/autotests/render/syntax-verbose/tabs/template.marko
+++ b/test/autotests/render/syntax-verbose/tabs/template.marko
@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul>
diff --git a/test/autotests/render/syntax-verbose/template.marko b/test/autotests/render/syntax-verbose/template.marko
index cd36f19d7..48e0b9e18 100644
--- a/test/autotests/render/syntax-verbose/template.marko
+++ b/test/autotests/render/syntax-verbose/template.marko
@@ -22,8 +22,8 @@
             </li>
         </>
 
-        <ul if(data.colors && data.colors.length)>
-            <li for(color in data.colors)>${color}</li>
+        <ul if(input.colors && input.colors.length)>
+            <li for(color in input.colors)>${color}</li>
         </ul>
         <div else>
             No colors!
diff --git a/test/autotests/render/tabs-tab-new/tags/test-tabs-new/template.marko b/test/autotests/render/tabs-tab-new/tags/test-tabs-new/template.marko
index 2937d20c5..e965ff314 100644
--- a/test/autotests/render/tabs-tab-new/tags/test-tabs-new/template.marko
+++ b/test/autotests/render/tabs-tab-new/tags/test-tabs-new/template.marko
@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul class="nav nav-tabs">
diff --git a/test/autotests/render/tabs-tab-new/template.marko b/test/autotests/render/tabs-tab-new/template.marko
index 928e96afc..1eb5ac0bb 100644
--- a/test/autotests/render/tabs-tab-new/template.marko
+++ b/test/autotests/render/tabs-tab-new/template.marko
@@ -1,4 +1,4 @@
-<var showConditionalTab=data.showConditionalTab/>
+<var showConditionalTab=input.showConditionalTab/>
 
 <test-tabs-new>
     <test-tab-new title="Tab 1">
diff --git a/test/autotests/render/tabs-tab/tags/test-tabs/template.marko b/test/autotests/render/tabs-tab/tags/test-tabs/template.marko
index 50e2020f5..64dab9326 100644
--- a/test/autotests/render/tabs-tab/tags/test-tabs/template.marko
+++ b/test/autotests/render/tabs-tab/tags/test-tabs/template.marko
@@ -1,4 +1,4 @@
-<var tabs=data.tabs/>
+<var tabs=input.tabs/>
 
 <div class="tabs">
     <ul class="nav nav-tabs">
diff --git a/test/autotests/render/tabs-tab/template.marko b/test/autotests/render/tabs-tab/template.marko
index 605e74ff8..a248a1d21 100644
--- a/test/autotests/render/tabs-tab/template.marko
+++ b/test/autotests/render/tabs-tab/template.marko
@@ -1,4 +1,4 @@
-<var showConditionalTab=data.showConditionalTab/>
+<var showConditionalTab=input.showConditionalTab/>
 
 <test-tabs>
     <test-tab title="Tab 1">
diff --git a/test/autotests/render/tag-code-generator-return-array/template.marko b/test/autotests/render/tag-code-generator-return-array/template.marko
index 064f3a339..1403d7d0c 100644
--- a/test/autotests/render/tag-code-generator-return-array/template.marko
+++ b/test/autotests/render/tag-code-generator-return-array/template.marko
@@ -1,2 +1,2 @@
 <test-tag-code-generator-return-array name="Frank"/>
-<test-tag-code-generator-return-array name=data.name/>
\ No newline at end of file
+<test-tag-code-generator-return-array name=input.name/>
\ No newline at end of file
diff --git a/test/autotests/render/tag-code-generator-return-node/template.marko b/test/autotests/render/tag-code-generator-return-node/template.marko
index e1aea3e63..50e6add6e 100644
--- a/test/autotests/render/tag-code-generator-return-node/template.marko
+++ b/test/autotests/render/tag-code-generator-return-node/template.marko
@@ -1,2 +1,2 @@
 <test-tag-code-generator-return-node name="Frank"/>
-<test-tag-code-generator-return-node name=data.name/>
\ No newline at end of file
+<test-tag-code-generator-return-node name=input.name/>
\ No newline at end of file
diff --git a/test/autotests/render/tag-code-generator-return-self/template.marko b/test/autotests/render/tag-code-generator-return-self/template.marko
index 66b20d004..b970b5a1b 100644
--- a/test/autotests/render/tag-code-generator-return-self/template.marko
+++ b/test/autotests/render/tag-code-generator-return-self/template.marko
@@ -1,2 +1,2 @@
 <test-tag-code-generator-return-self name="Frank"/>
-<test-tag-code-generator-return-self name=data.name/>
\ No newline at end of file
+<test-tag-code-generator-return-self name=input.name/>
\ No newline at end of file
diff --git a/test/autotests/render/tag-code-generator-return-tree/template.marko b/test/autotests/render/tag-code-generator-return-tree/template.marko
index ee156107f..801930c2f 100644
--- a/test/autotests/render/tag-code-generator-return-tree/template.marko
+++ b/test/autotests/render/tag-code-generator-return-tree/template.marko
@@ -1,2 +1,2 @@
 <test-tag-code-generator-return-tree name="Frank"/>
-<test-tag-code-generator-return-tree name=data.name/>
\ No newline at end of file
+<test-tag-code-generator-return-tree name=input.name/>
\ No newline at end of file
diff --git a/test/autotests/render/template-tag-dynamic-attributes/tags/test-template-tag-dynamic-attributes/template.marko b/test/autotests/render/template-tag-dynamic-attributes/tags/test-template-tag-dynamic-attributes/template.marko
index 4a37c01d7..18b7d607f 100644
--- a/test/autotests/render/template-tag-dynamic-attributes/tags/test-template-tag-dynamic-attributes/template.marko
+++ b/test/autotests/render/template-tag-dynamic-attributes/tags/test-template-tag-dynamic-attributes/template.marko
@@ -1,3 +1,3 @@
 ---
-Hello ${data.name}!
+Hello ${input.name}!
 ---
\ No newline at end of file
diff --git a/test/autotests/render/text-replacement/template.marko b/test/autotests/render/text-replacement/template.marko
index 453486856..e36135d0a 100644
--- a/test/autotests/render/text-replacement/template.marko
+++ b/test/autotests/render/text-replacement/template.marko
@@ -1,5 +1,5 @@
 ---
-<var person=data.person/>
+<var person=input.person/>
 
-Hello ${person.name}. You are from ${person.address.city}, ${person.address.state} Zero: ${data.zero}
+Hello ${person.name}. You are from ${person.address.city}, ${person.address.state} Zero: ${input.zero}
 ---
\ No newline at end of file
diff --git a/test/autotests/render/toHTML/template.marko b/test/autotests/render/toHTML/template.marko
index 016b8f3a5..a6c01dd42 100644
--- a/test/autotests/render/toHTML/template.marko
+++ b/test/autotests/render/toHTML/template.marko
@@ -1,3 +1,3 @@
 <div>
-    ${data.message}
+    ${input.message}
 </div>
\ No newline at end of file
diff --git a/test/autotests/render/transformer-dynamic-tag-name/template.marko b/test/autotests/render/transformer-dynamic-tag-name/template.marko
index 4765fa510..ab87a0510 100644
--- a/test/autotests/render/transformer-dynamic-tag-name/template.marko
+++ b/test/autotests/render/transformer-dynamic-tag-name/template.marko
@@ -1 +1 @@
-<${data.tagName} foo="abc">Dynamic tag name</>
\ No newline at end of file
+<${input.tagName} foo="abc">Dynamic tag name</>
\ No newline at end of file
diff --git a/test/autotests/render/xml-escaping/template.marko b/test/autotests/render/xml-escaping/template.marko
index cbfbc49b4..1d5ca8a47 100644
--- a/test/autotests/render/xml-escaping/template.marko
+++ b/test/autotests/render/xml-escaping/template.marko
@@ -1,2 +1,2 @@
--- $!{data.welcome}
--- ${data.name}
\ No newline at end of file
+-- $!{input.welcome}
+-- ${input.name}
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/custom-events/components/app-bar/index.marko b/test/autotests/widgets-browser/custom-events/components/app-bar/index.marko
index 9ed5b76fa..55b0e9dad 100644
--- a/test/autotests/widgets-browser/custom-events/components/app-bar/index.marko
+++ b/test/autotests/widgets-browser/custom-events/components/app-bar/index.marko
@@ -1,3 +1,3 @@
 <div class="bar">
-    ${data.label}
+    ${input.label}
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/custom-events/components/app-custom-events/index.marko b/test/autotests/widgets-browser/custom-events/components/app-custom-events/index.marko
index 9ed5b76fa..55b0e9dad 100644
--- a/test/autotests/widgets-browser/custom-events/components/app-custom-events/index.marko
+++ b/test/autotests/widgets-browser/custom-events/components/app-custom-events/index.marko
@@ -1,3 +1,3 @@
 <div class="bar">
-    ${data.label}
+    ${input.label}
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/destroy-widget/components/app-simple/index.marko b/test/autotests/widgets-browser/destroy-widget/components/app-simple/index.marko
index 21076ceb5..44200c89c 100644
--- a/test/autotests/widgets-browser/destroy-widget/components/app-simple/index.marko
+++ b/test/autotests/widgets-browser/destroy-widget/components/app-simple/index.marko
@@ -1,4 +1,4 @@
 <div>
-	Hello ${data.name}! You have ${data.messageCount} new messages.
+	Hello ${input.name}! You have ${input.messageCount} new messages.
 	<div ref="foo">foo</div>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/destroy-widget/index.marko b/test/autotests/widgets-browser/destroy-widget/index.marko
index 70d50ca3c..994004e2d 100644
--- a/test/autotests/widgets-browser/destroy-widget/index.marko
+++ b/test/autotests/widgets-browser/destroy-widget/index.marko
@@ -1,4 +1,4 @@
-var showSimple=(data.showSimple == null ? true : data.showSimple)
+var showSimple=(input.showSimple == null ? true : input.showSimple)
 
 <div class="app-discard">
 	[app-discard]
diff --git a/test/autotests/widgets-browser/dom-events-repeated-el-bubbling/index.marko b/test/autotests/widgets-browser/dom-events-repeated-el-bubbling/index.marko
index 001b15473..5d347e4cc 100644
--- a/test/autotests/widgets-browser/dom-events-repeated-el-bubbling/index.marko
+++ b/test/autotests/widgets-browser/dom-events-repeated-el-bubbling/index.marko
@@ -1,6 +1,6 @@
 <div>
     <ul>
-        <li for(color in data.colors) onClick("handleColorClick", color)>
+        <li for(color in input.colors) onClick("handleColorClick", color)>
 			${color}
 		</li>
     </ul>
diff --git a/test/autotests/widgets-browser/dom-events-repeated-el-non-bubbling-multiple/index.marko b/test/autotests/widgets-browser/dom-events-repeated-el-non-bubbling-multiple/index.marko
index 09ad9fdcf..176e70f21 100644
--- a/test/autotests/widgets-browser/dom-events-repeated-el-non-bubbling-multiple/index.marko
+++ b/test/autotests/widgets-browser/dom-events-repeated-el-non-bubbling-multiple/index.marko
@@ -11,7 +11,7 @@
 </script>
 <div>
     <ul>
-        <li for(color in data.colors) onMouseOver("handleColorMouseOver", color) onMouseOut("handleColorMouseOut", color)>
+        <li for(color in input.colors) onMouseOver("handleColorMouseOver", color) onMouseOut("handleColorMouseOut", color)>
             ${color}
         </li>
     </ul>
diff --git a/test/autotests/widgets-browser/dom-events-repeated-el-non-bubbling/index.marko b/test/autotests/widgets-browser/dom-events-repeated-el-non-bubbling/index.marko
index bb55a5d32..4d5f34f72 100644
--- a/test/autotests/widgets-browser/dom-events-repeated-el-non-bubbling/index.marko
+++ b/test/autotests/widgets-browser/dom-events-repeated-el-non-bubbling/index.marko
@@ -1,6 +1,6 @@
 <div>
     <ul>
-        <li for(color in data.colors) onMouseOver("handleColorMouseOver", color)>
+        <li for(color in input.colors) onMouseOver("handleColorMouseOver", color)>
             ${color}
         </li>
     </ul>
diff --git a/test/autotests/widgets-browser/event-handler-custom-args/components/app-fancy-button/index.marko b/test/autotests/widgets-browser/event-handler-custom-args/components/app-fancy-button/index.marko
index 593df8576..de3661a04 100644
--- a/test/autotests/widgets-browser/event-handler-custom-args/components/app-fancy-button/index.marko
+++ b/test/autotests/widgets-browser/event-handler-custom-args/components/app-fancy-button/index.marko
@@ -1,3 +1,3 @@
 <button.fancy-button type="button">
-    ${data.label}
+    ${input.label}
 </button>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/include-preserve-old/index.marko b/test/autotests/widgets-browser/include-preserve-old/index.marko
index 05c19a752..65b461a88 100644
--- a/test/autotests/widgets-browser/include-preserve-old/index.marko
+++ b/test/autotests/widgets-browser/include-preserve-old/index.marko
@@ -8,6 +8,6 @@
 
 <div.root>
     <app-foo name="Frank" ref="foo">
-        Current index: ${data.index}
+        Current index: ${input.index}
     </app-foo>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/preserve-dom-body-no-id/index.marko b/test/autotests/widgets-browser/preserve-dom-body-no-id/index.marko
index 0a803edf4..4c093b917 100644
--- a/test/autotests/widgets-browser/preserve-dom-body-no-id/index.marko
+++ b/test/autotests/widgets-browser/preserve-dom-body-no-id/index.marko
@@ -1,6 +1,6 @@
 <div>
-    <div.unpreserved-counter>${data.counter}</div>
-    <span class="preserve" data-counter=data.counter no-update-body>
-        <div.preserved-counter>${data.counter}</div>
+    <div.unpreserved-counter>${input.counter}</div>
+    <span class="preserve" data-counter=input.counter no-update-body>
+        <div.preserved-counter>${input.counter}</div>
     </span>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/preserve-dom-body/index.marko b/test/autotests/widgets-browser/preserve-dom-body/index.marko
index 5ed764d5a..fb2aec73f 100644
--- a/test/autotests/widgets-browser/preserve-dom-body/index.marko
+++ b/test/autotests/widgets-browser/preserve-dom-body/index.marko
@@ -1,6 +1,6 @@
 <div>
-    <div.unpreserved-counter>${data.counter}</div>
-    <span ref="preserve" data-counter=data.counter no-update-body>
-        <div.preserved-counter>${data.counter}</div>
+    <div.unpreserved-counter>${input.counter}</div>
+    <span ref="preserve" data-counter=input.counter no-update-body>
+        <div.preserved-counter>${input.counter}</div>
     </span>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/preserve-dom-no-id/index.marko b/test/autotests/widgets-browser/preserve-dom-no-id/index.marko
index 960db8d70..355a64ee1 100644
--- a/test/autotests/widgets-browser/preserve-dom-no-id/index.marko
+++ b/test/autotests/widgets-browser/preserve-dom-no-id/index.marko
@@ -1,6 +1,6 @@
 <div>
-    <div.unpreserved-counter>${data.counter}</div>
-    <span class="preserve" data-counter=data.counter no-update>
-        <div.preserved-counter>${data.counter}</div>
+    <div.unpreserved-counter>${input.counter}</div>
+    <span class="preserve" data-counter=input.counter no-update>
+        <div.preserved-counter>${input.counter}</div>
     </span>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/preserve-dom/index.marko b/test/autotests/widgets-browser/preserve-dom/index.marko
index 402e60864..c8f6e811a 100644
--- a/test/autotests/widgets-browser/preserve-dom/index.marko
+++ b/test/autotests/widgets-browser/preserve-dom/index.marko
@@ -1,6 +1,6 @@
 <div>
-    <div.unpreserved-counter>${data.counter}</div>
-    <span ref="preserve" data-counter=data.counter no-update>
-        <div.preserved-counter>${data.counter}</div>
+    <div.unpreserved-counter>${input.counter}</div>
+    <span ref="preserve" data-counter=input.counter no-update>
+        <div.preserved-counter>${input.counter}</div>
     </span>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/rerender-same-id/index.marko b/test/autotests/widgets-browser/rerender-same-id/index.marko
index c95b63684..aae6c994d 100644
--- a/test/autotests/widgets-browser/rerender-same-id/index.marko
+++ b/test/autotests/widgets-browser/rerender-same-id/index.marko
@@ -1,3 +1,3 @@
 <div class="app-rerender">
-    ${data.label}
+    ${input.label}
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/sanity-check-template-entry-split/index.marko b/test/autotests/widgets-browser/sanity-check-template-entry-split/index.marko
index d523f780b..0673a949c 100644
--- a/test/autotests/widgets-browser/sanity-check-template-entry-split/index.marko
+++ b/test/autotests/widgets-browser/sanity-check-template-entry-split/index.marko
@@ -1,3 +1,3 @@
 <div>
-    Hello <span ref="name">${data.name}</span>!
+    Hello <span ref="name">${input.name}</span>!
 </div>
diff --git a/test/autotests/widgets-browser/transclusion-body-slot-attr/index.marko b/test/autotests/widgets-browser/transclusion-body-slot-attr/index.marko
index 50bba4ff6..510a96e7c 100644
--- a/test/autotests/widgets-browser/transclusion-body-slot-attr/index.marko
+++ b/test/autotests/widgets-browser/transclusion-body-slot-attr/index.marko
@@ -6,6 +6,6 @@
 
 <div>
     <app-button size="small" variant="primary" ref="button">
-        <b>${data.name}</b>
+        <b>${input.name}</b>
     </app-button>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/transclusion-body-slot-default-to-renderBody/index.marko b/test/autotests/widgets-browser/transclusion-body-slot-default-to-renderBody/index.marko
index 50bba4ff6..510a96e7c 100644
--- a/test/autotests/widgets-browser/transclusion-body-slot-default-to-renderBody/index.marko
+++ b/test/autotests/widgets-browser/transclusion-body-slot-default-to-renderBody/index.marko
@@ -6,6 +6,6 @@
 
 <div>
     <app-button size="small" variant="primary" ref="button">
-        <b>${data.name}</b>
+        <b>${input.name}</b>
     </app-button>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/transclusion-body-slot-tag/index.marko b/test/autotests/widgets-browser/transclusion-body-slot-tag/index.marko
index 50bba4ff6..510a96e7c 100644
--- a/test/autotests/widgets-browser/transclusion-body-slot-tag/index.marko
+++ b/test/autotests/widgets-browser/transclusion-body-slot-tag/index.marko
@@ -6,6 +6,6 @@
 
 <div>
     <app-button size="small" variant="primary" ref="button">
-        <b>${data.name}</b>
+        <b>${input.name}</b>
     </app-button>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/transclusion-include-from-state/index.marko b/test/autotests/widgets-browser/transclusion-include-from-state/index.marko
index 50bba4ff6..510a96e7c 100644
--- a/test/autotests/widgets-browser/transclusion-include-from-state/index.marko
+++ b/test/autotests/widgets-browser/transclusion-include-from-state/index.marko
@@ -6,6 +6,6 @@
 
 <div>
     <app-button size="small" variant="primary" ref="button">
-        <b>${data.name}</b>
+        <b>${input.name}</b>
     </app-button>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/transclusion-include-not-in-state/components/app-button/index.marko b/test/autotests/widgets-browser/transclusion-include-not-in-state/components/app-button/index.marko
index be451b9fe..7eb936d65 100644
--- a/test/autotests/widgets-browser/transclusion-include-not-in-state/components/app-button/index.marko
+++ b/test/autotests/widgets-browser/transclusion-include-not-in-state/components/app-button/index.marko
@@ -26,5 +26,5 @@ var variantClassName=(state.variant !== 'primary' && 'app-button-' + state.varia
 var sizeClassName=(state.size !== 'normal' && 'app-button-' + state.size)
 
 <button class=['app-button', variantClassName, sizeClassName]>
-    <span include(data.renderBody)/>
+    <span include(input.renderBody)/>
 </button>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/transclusion-include-not-in-state/index.marko b/test/autotests/widgets-browser/transclusion-include-not-in-state/index.marko
index 50bba4ff6..510a96e7c 100644
--- a/test/autotests/widgets-browser/transclusion-include-not-in-state/index.marko
+++ b/test/autotests/widgets-browser/transclusion-include-not-in-state/index.marko
@@ -6,6 +6,6 @@
 
 <div>
     <app-button size="small" variant="primary" ref="button">
-        <b>${data.name}</b>
+        <b>${input.name}</b>
     </app-button>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/update-manager-batch-updates/index.marko b/test/autotests/widgets-browser/update-manager-batch-updates/index.marko
index a261166fa..75fce933a 100644
--- a/test/autotests/widgets-browser/update-manager-batch-updates/index.marko
+++ b/test/autotests/widgets-browser/update-manager-batch-updates/index.marko
@@ -1,4 +1,4 @@
-<button ${data.rootAttrs}
+<button ${input.rootAttrs}
     onClick("handleClick")>
     <include(state.body)/>
 </button>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/update-manager-next-tick/index.marko b/test/autotests/widgets-browser/update-manager-next-tick/index.marko
index 8bf89b2c2..432a3d6a6 100644
--- a/test/autotests/widgets-browser/update-manager-next-tick/index.marko
+++ b/test/autotests/widgets-browser/update-manager-next-tick/index.marko
@@ -1,3 +1,3 @@
-<button ${data.rootAttrs} onClick("handleClick")>
+<button ${input.rootAttrs} onClick("handleClick")>
     <include(state.body)/>
 </button>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/index.marko b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/index.marko
index 9ed5b76fa..55b0e9dad 100644
--- a/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/index.marko
+++ b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-bar/index.marko
@@ -1,3 +1,3 @@
 <div class="bar">
-    ${data.label}
+    ${input.label}
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/index.marko b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/index.marko
index 9ed5b76fa..55b0e9dad 100644
--- a/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/index.marko
+++ b/test/autotests/widgets-browser/widget-custom-events-declarative/components/app-custom-events/index.marko
@@ -1,3 +1,3 @@
 <div class="bar">
-    ${data.label}
+    ${input.label}
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/index.marko b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/index.marko
index cc35c0284..326c8973e 100644
--- a/test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/index.marko
+++ b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-bar/index.marko
@@ -1,4 +1,4 @@
-var label=(data.label || 'BAR')
+var label=(input.label || 'BAR')
 
 <div class="bar">
     ${label}
diff --git a/test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/index.marko b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/index.marko
index 9ed5b76fa..55b0e9dad 100644
--- a/test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/index.marko
+++ b/test/autotests/widgets-browser/widget-destroy-legacy/components/app-custom-events/index.marko
@@ -1,3 +1,3 @@
 <div class="bar">
-    ${data.label}
+    ${input.label}
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-destroy-ref/components/app-legacy-button/index.marko b/test/autotests/widgets-browser/widget-destroy-ref/components/app-legacy-button/index.marko
index 8d4d72ba4..d2953d544 100644
--- a/test/autotests/widgets-browser/widget-destroy-ref/components/app-legacy-button/index.marko
+++ b/test/autotests/widgets-browser/widget-destroy-ref/components/app-legacy-button/index.marko
@@ -1,4 +1,4 @@
 <button type="button" class="app-legacy-button"
     onMousedown("handleRootMouseDown")>
-    <include(data.renderBody)/>
+    <include(input.renderBody)/>
 </button>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.marko b/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.marko
index 9ed5b76fa..55b0e9dad 100644
--- a/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.marko
+++ b/test/autotests/widgets-browser/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.marko
@@ -1,3 +1,3 @@
 <div class="bar">
-    ${data.label}
+    ${input.label}
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-dom-events/components/app-legacy-button/index.marko b/test/autotests/widgets-browser/widget-dom-events/components/app-legacy-button/index.marko
index 4a424a41c..574b2f9a5 100644
--- a/test/autotests/widgets-browser/widget-dom-events/components/app-legacy-button/index.marko
+++ b/test/autotests/widgets-browser/widget-dom-events/components/app-legacy-button/index.marko
@@ -1,5 +1,5 @@
 <button type="button" class="app-legacy-button"
 
     onMousedown("handleRootMouseDown")>
-    <include(data.renderBody)/>
+    <include(input.renderBody)/>
 </button>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-dynamic-tag-name/index.marko b/test/autotests/widgets-browser/widget-dynamic-tag-name/index.marko
index 3bc8ccf30..89fd9e5ba 100644
--- a/test/autotests/widgets-browser/widget-dynamic-tag-name/index.marko
+++ b/test/autotests/widgets-browser/widget-dynamic-tag-name/index.marko
@@ -1 +1 @@
-<${data.rootTagName} class="foo"></>
\ No newline at end of file
+<${input.rootTagName} class="foo"></>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-include-ref-dynamic/components/app-bar/index.marko b/test/autotests/widgets-browser/widget-include-ref-dynamic/components/app-bar/index.marko
index cc35c0284..326c8973e 100644
--- a/test/autotests/widgets-browser/widget-include-ref-dynamic/components/app-bar/index.marko
+++ b/test/autotests/widgets-browser/widget-include-ref-dynamic/components/app-bar/index.marko
@@ -1,4 +1,4 @@
-var label=(data.label || 'BAR')
+var label=(input.label || 'BAR')
 
 <div class="bar">
     ${label}
diff --git a/test/autotests/widgets-browser/widget-include-ref-dynamic/index.marko b/test/autotests/widgets-browser/widget-include-ref-dynamic/index.marko
index 6d22f35da..7698b56a7 100644
--- a/test/autotests/widgets-browser/widget-include-ref-dynamic/index.marko
+++ b/test/autotests/widgets-browser/widget-include-ref-dynamic/index.marko
@@ -1,3 +1,3 @@
 <div class="app-invoke-widget-id">
-    <include(data.barComponent, {}) ref=data.barWidgetRef />
+    <include(input.barComponent, {}) ref=input.barWidgetRef />
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-include-ref/components/app-bar/index.marko b/test/autotests/widgets-browser/widget-include-ref/components/app-bar/index.marko
index cc35c0284..326c8973e 100644
--- a/test/autotests/widgets-browser/widget-include-ref/components/app-bar/index.marko
+++ b/test/autotests/widgets-browser/widget-include-ref/components/app-bar/index.marko
@@ -1,4 +1,4 @@
-var label=(data.label || 'BAR')
+var label=(input.label || 'BAR')
 
 <div class="bar">
     ${label}
diff --git a/test/autotests/widgets-browser/widget-include-ref/index.marko b/test/autotests/widgets-browser/widget-include-ref/index.marko
index 00fb8a92c..8488f181d 100644
--- a/test/autotests/widgets-browser/widget-include-ref/index.marko
+++ b/test/autotests/widgets-browser/widget-include-ref/index.marko
@@ -1,3 +1,3 @@
 <div class="app-invoke-widget-id">
-    <include(data.barComponent) ref="barTest"/>
+    <include(input.barComponent) ref="barTest"/>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.marko b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.marko
index 61ef847e7..402932781 100644
--- a/test/autotests/widgets-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.marko
+++ b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.marko
@@ -1,3 +1,3 @@
 <div>
-	You have <span ref="messageCount">${data.messageCount}</span> new messages.
+	You have <span ref="messageCount">${input.messageCount}</span> new messages.
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-lifecycle-events-stateful/index.marko b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/index.marko
index 5289aaf32..e5dbc2155 100644
--- a/test/autotests/widgets-browser/widget-lifecycle-events-stateful/index.marko
+++ b/test/autotests/widgets-browser/widget-lifecycle-events-stateful/index.marko
@@ -1,6 +1,6 @@
 <div>
-	Hello ${data.name}!
+	Hello ${input.name}!
 
-	<app-stateful-lifecycle-events-nested ref="nestedStateful" message-count=data.messageCount/>
-	<app-stateful-lifecycle-events-nested name="foo" message-count=data.messageCount/>
+	<app-stateful-lifecycle-events-nested ref="nestedStateful" message-count=input.messageCount/>
+	<app-stateful-lifecycle-events-nested name="foo" message-count=input.messageCount/>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-lifecycle-events-stateless/index.marko b/test/autotests/widgets-browser/widget-lifecycle-events-stateless/index.marko
index d1527d12a..5eac0ab32 100644
--- a/test/autotests/widgets-browser/widget-lifecycle-events-stateless/index.marko
+++ b/test/autotests/widgets-browser/widget-lifecycle-events-stateless/index.marko
@@ -1,3 +1,3 @@
 <div>
-	Hello ${data.name}! You have ${data.messageCount} new messages.
+	Hello ${input.name}! You have ${input.messageCount} new messages.
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-no-update-attrs-dynamic/index.marko b/test/autotests/widgets-browser/widget-no-update-attrs-dynamic/index.marko
index 9fc3570da..1596bf03c 100644
--- a/test/autotests/widgets-browser/widget-no-update-attrs-dynamic/index.marko
+++ b/test/autotests/widgets-browser/widget-no-update-attrs-dynamic/index.marko
@@ -1,4 +1,4 @@
 <div>
-    <span class:no-update=data.className>
+    <span class:no-update=input.className>
     </span>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered-setTimeout/index.marko b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered-setTimeout/index.marko
index b7e5b32a4..0a4da2b3b 100644
--- a/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered-setTimeout/index.marko
+++ b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered-setTimeout/index.marko
@@ -1,11 +1,11 @@
-<div class=["app-stateful-rerender", data.className]>
-    Hello ${data.name}! You have ${data.count} new messages.
+<div class=["app-stateful-rerender", input.className]>
+    Hello ${input.name}! You have ${input.count} new messages.
     <ul>
         <li>
-            foo: ${data.foo}
+            foo: ${input.foo}
         </li>
         <li>
-            hello: ${data.hello}
+            hello: ${input.hello}
         </li>
     </ul>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered/index.marko b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered/index.marko
index b7e5b32a4..0a4da2b3b 100644
--- a/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered/index.marko
+++ b/test/autotests/widgets-browser/widget-preserve-all-state-when-rerendered/index.marko
@@ -1,11 +1,11 @@
-<div class=["app-stateful-rerender", data.className]>
-    Hello ${data.name}! You have ${data.count} new messages.
+<div class=["app-stateful-rerender", input.className]>
+    Hello ${input.name}! You have ${input.count} new messages.
     <ul>
         <li>
-            foo: ${data.foo}
+            foo: ${input.foo}
         </li>
         <li>
-            hello: ${data.hello}
+            hello: ${input.hello}
         </li>
     </ul>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-preserve-dom-attrs-dynamic/index.marko b/test/autotests/widgets-browser/widget-preserve-dom-attrs-dynamic/index.marko
index 5e1d3de8c..e412a298c 100644
--- a/test/autotests/widgets-browser/widget-preserve-dom-attrs-dynamic/index.marko
+++ b/test/autotests/widgets-browser/widget-preserve-dom-attrs-dynamic/index.marko
@@ -1,4 +1,4 @@
 <div>
-    <span class=data.className w-preserve-attrs="class">
+    <span class=input.className w-preserve-attrs="class">
     </span>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-preserve-dom-attrs/index.marko b/test/autotests/widgets-browser/widget-preserve-dom-attrs/index.marko
index 64634631f..c475da5ca 100644
--- a/test/autotests/widgets-browser/widget-preserve-dom-attrs/index.marko
+++ b/test/autotests/widgets-browser/widget-preserve-dom-attrs/index.marko
@@ -2,6 +2,6 @@
     <a no-update:href="http://www.ebay.com">
         eBay
     </a>
-    <span ref="hello">Hello ${data.name}!</span>
-    <span ref="hello2" class:no-update="foo">Hello ${data.name}!</span>
+    <span ref="hello">Hello ${input.name}!</span>
+    <span ref="hello2" class:no-update="foo">Hello ${input.name}!</span>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-preserve-dom-if/components/app-stateful-rerender/index.marko b/test/autotests/widgets-browser/widget-preserve-dom-if/components/app-stateful-rerender/index.marko
index b7e5b32a4..0a4da2b3b 100644
--- a/test/autotests/widgets-browser/widget-preserve-dom-if/components/app-stateful-rerender/index.marko
+++ b/test/autotests/widgets-browser/widget-preserve-dom-if/components/app-stateful-rerender/index.marko
@@ -1,11 +1,11 @@
-<div class=["app-stateful-rerender", data.className]>
-    Hello ${data.name}! You have ${data.count} new messages.
+<div class=["app-stateful-rerender", input.className]>
+    Hello ${input.name}! You have ${input.count} new messages.
     <ul>
         <li>
-            foo: ${data.foo}
+            foo: ${input.foo}
         </li>
         <li>
-            hello: ${data.hello}
+            hello: ${input.hello}
         </li>
     </ul>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-preserve-dom-if/index.marko b/test/autotests/widgets-browser/widget-preserve-dom-if/index.marko
index 1686dc840..667c03566 100644
--- a/test/autotests/widgets-browser/widget-preserve-dom-if/index.marko
+++ b/test/autotests/widgets-browser/widget-preserve-dom-if/index.marko
@@ -1,18 +1,18 @@
 <div>
     <h1>Preserve Begin</h1>
-    <span ref="preserve" no-update-if(data.preserveCondition) data-renderId=data.renderId>${data.renderId}</span>
+    <span ref="preserve" no-update-if(input.preserveCondition) data-renderId=input.renderId>${input.renderId}</span>
 
-    <span ref="preserveBody" no-update-body-if(data.preserveCondition) data-renderId=data.renderId>${data.renderId}</span>
+    <span ref="preserveBody" no-update-body-if(input.preserveCondition) data-renderId=input.renderId>${input.renderId}</span>
 
-    <app-stateful-rerender ref="widget" name=(data.renderId.toString()) no-update-if(data.preserveCondition) />
+    <app-stateful-rerender ref="widget" name=(input.renderId.toString()) no-update-if(input.preserveCondition) />
 
     <!-- Test without an ID -->
 
-    <span class="preserve" no-update-if(data.preserveCondition) data-renderId=data.renderId>${data.renderId}</span>
+    <span class="preserve" no-update-if(input.preserveCondition) data-renderId=input.renderId>${input.renderId}</span>
 
-    <span class="preserve-body" no-update-body-if(data.preserveCondition) data-renderId=data.renderId>${data.renderId}</span>
+    <span class="preserve-body" no-update-body-if(input.preserveCondition) data-renderId=input.renderId>${input.renderId}</span>
 
-    <app-stateful-rerender class="widget-no-id" name=(data.renderId.toString()) no-update-if(data.preserveCondition) data-renderId=data.renderId/>
+    <app-stateful-rerender class="widget-no-id" name=(input.renderId.toString()) no-update-if(input.preserveCondition) data-renderId=input.renderId/>
 
     <h1>Preserve End</h1>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-preserve-dom-root/index.marko b/test/autotests/widgets-browser/widget-preserve-dom-root/index.marko
index ca4464cf4..2dce587e0 100644
--- a/test/autotests/widgets-browser/widget-preserve-dom-root/index.marko
+++ b/test/autotests/widgets-browser/widget-preserve-dom-root/index.marko
@@ -1,3 +1,3 @@
 <div no-update>
-	Hello ${data.name}! You have ${data.messageCount} new messages.
+	Hello ${input.name}! You have ${input.messageCount} new messages.
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-simple/index.marko b/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-simple/index.marko
index 21076ceb5..44200c89c 100644
--- a/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-simple/index.marko
+++ b/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-simple/index.marko
@@ -1,4 +1,4 @@
 <div>
-	Hello ${data.name}! You have ${data.messageCount} new messages.
+	Hello ${input.name}! You have ${input.messageCount} new messages.
 	<div ref="foo">foo</div>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-repeated-id-widgetless/index.marko b/test/autotests/widgets-browser/widget-repeated-id-widgetless/index.marko
index b4ef7d05f..f7f3ba782 100644
--- a/test/autotests/widgets-browser/widget-repeated-id-widgetless/index.marko
+++ b/test/autotests/widgets-browser/widget-repeated-id-widgetless/index.marko
@@ -1,5 +1,5 @@
 <div class="app-repeated-id-widgetless">
-    <for(component in data.components)>
+    <for(component in input.components)>
         <include(component) ref="childWidget[]" />
     </for>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-rerender-init-order/components/app-rerender-init-order-child/index.marko b/test/autotests/widgets-browser/widget-rerender-init-order/components/app-rerender-init-order-child/index.marko
index df2be3673..1d115aa35 100644
--- a/test/autotests/widgets-browser/widget-rerender-init-order/components/app-rerender-init-order-child/index.marko
+++ b/test/autotests/widgets-browser/widget-rerender-init-order/components/app-rerender-init-order-child/index.marko
@@ -1,3 +1,3 @@
 <div>
-    [app-rerender-init-order-child] ${data.id}
+    [app-rerender-init-order-child] ${input.id}
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-rerender-init-order/index.marko b/test/autotests/widgets-browser/widget-rerender-init-order/index.marko
index 3f10fd1f2..2029e39f2 100644
--- a/test/autotests/widgets-browser/widget-rerender-init-order/index.marko
+++ b/test/autotests/widgets-browser/widget-rerender-init-order/index.marko
@@ -1,5 +1,5 @@
 <div>
     [app-rerender-init-order]
-    <app-rerender-init-order-child ref="childA" id="childA" version=data.version/>
-    <app-rerender-init-order-child ref="childB" id="childB" version=data.version/>
+    <app-rerender-init-order-child ref="childA" id="childA" version=input.version/>
+    <app-rerender-init-order-child ref="childB" id="childB" version=input.version/>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-rerender-reuse-stateful/index.marko b/test/autotests/widgets-browser/widget-rerender-reuse-stateful/index.marko
index e05129b4c..11858ca20 100644
--- a/test/autotests/widgets-browser/widget-rerender-reuse-stateful/index.marko
+++ b/test/autotests/widgets-browser/widget-rerender-reuse-stateful/index.marko
@@ -1,4 +1,4 @@
 <div class="app-stateful-reuse-widgets">
-    <app-stateful-button size=data.buttonSize ref="button1">${data.buttonSize}</app-stateful-button>
+    <app-stateful-button size=input.buttonSize ref="button1">${input.buttonSize}</app-stateful-button>
     <app-stateful-button size="large" ref="button2">button2</app-stateful-button>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-rerender-stateless-new-props/index.marko b/test/autotests/widgets-browser/widget-rerender-stateless-new-props/index.marko
index 21076ceb5..44200c89c 100644
--- a/test/autotests/widgets-browser/widget-rerender-stateless-new-props/index.marko
+++ b/test/autotests/widgets-browser/widget-rerender-stateless-new-props/index.marko
@@ -1,4 +1,4 @@
 <div>
-	Hello ${data.name}! You have ${data.messageCount} new messages.
+	Hello ${input.name}! You have ${input.messageCount} new messages.
 	<div ref="foo">foo</div>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-setStateDirty/index.marko b/test/autotests/widgets-browser/widget-setStateDirty/index.marko
index b82634f16..bd2753618 100644
--- a/test/autotests/widgets-browser/widget-setStateDirty/index.marko
+++ b/test/autotests/widgets-browser/widget-setStateDirty/index.marko
@@ -1,5 +1,5 @@
 <ul>
-    <li for(color in data.colors)>
+    <li for(color in input.colors)>
         ${color}
     </li>
 </ul>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-split-into-multiple-templates/components/app-stateful-button/index.marko b/test/autotests/widgets-browser/widget-split-into-multiple-templates/components/app-stateful-button/index.marko
index 0ace7b774..d80ab45a9 100644
--- a/test/autotests/widgets-browser/widget-split-into-multiple-templates/components/app-stateful-button/index.marko
+++ b/test/autotests/widgets-browser/widget-split-into-multiple-templates/components/app-stateful-button/index.marko
@@ -1,4 +1,4 @@
-<button ${data.rootAttrs}
+<button ${input.rootAttrs}
     onClick("handleClick")>
     <body-slot/>
 </button>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-stateful-reuse-widgets/index.marko b/test/autotests/widgets-browser/widget-stateful-reuse-widgets/index.marko
index e05129b4c..11858ca20 100644
--- a/test/autotests/widgets-browser/widget-stateful-reuse-widgets/index.marko
+++ b/test/autotests/widgets-browser/widget-stateful-reuse-widgets/index.marko
@@ -1,4 +1,4 @@
 <div class="app-stateful-reuse-widgets">
-    <app-stateful-button size=data.buttonSize ref="button1">${data.buttonSize}</app-stateful-button>
+    <app-stateful-button size=input.buttonSize ref="button1">${input.buttonSize}</app-stateful-button>
     <app-stateful-button size="large" ref="button2">button2</app-stateful-button>
 </div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-stateful-update/index.marko b/test/autotests/widgets-browser/widget-stateful-update/index.marko
index a261166fa..75fce933a 100644
--- a/test/autotests/widgets-browser/widget-stateful-update/index.marko
+++ b/test/autotests/widgets-browser/widget-stateful-update/index.marko
@@ -1,4 +1,4 @@
-<button ${data.rootAttrs}
+<button ${input.rootAttrs}
     onClick("handleClick")>
     <include(state.body)/>
 </button>
\ No newline at end of file
diff --git a/test/browser-tests-runner/page-template.marko.js b/test/browser-tests-runner/page-template.marko.js
index be39bc906..bf15828cc 100644
--- a/test/browser-tests-runner/page-template.marko.js
+++ b/test/browser-tests-runner/page-template.marko.js
@@ -9,7 +9,9 @@ var marko_template = module.exports = require("marko/html").t(__filename),
     browser_refresh_tag = marko_loadTag(require("browser-refresh-taglib/refresh-tag")),
     await_reorderer_tag = marko_loadTag(require("marko/taglibs/async/await-reorderer-tag"));
 
-function render(data, out) {
+function render(input, out) {
+  var data = input;
+
   lasso_page_tag({
       dependencies: data.browserDependencies,
       lasso: data.lasso,