diff --git a/js/JavaScriptParser.js b/js/JavaScriptParser.js
index 2347f800f..d7835b3f7 100644
--- a/js/JavaScriptParser.js
+++ b/js/JavaScriptParser.js
@@ -60,7 +60,7 @@ JavaScriptParser.prototype.parse = function(type,code) {
 				classes.push("javascript-line-comment");
 				content.push(Renderer.TextNode("//"));
 			}
-			content.push.apply(content,self.store.parseText("text/x-tiddlywiki",text).tree);
+			content.push.apply(content,self.store.parseText("text/x-tiddlywiki",text).nodes);
 			if(comment.type === "Block") {
 				content.push(Renderer.TextNode("*/"));
 			} else {
diff --git a/js/Renderer.js b/js/Renderer.js
index 3b8c52e39..9c71ecef3 100644
--- a/js/Renderer.js
+++ b/js/Renderer.js
@@ -15,8 +15,8 @@ var utils = require("./Utils.js"),
 	esprima = require("esprima");
 
 // Intialise the renderer object
-var Renderer = function(tree,dependencies,store) {
-	this.tree = tree;
+var Renderer = function(nodes,dependencies,store) {
+	this.nodes = nodes;
 	this.dependencies = dependencies;
 	this.store = store;
 };
diff --git a/js/WikiTextRules.js b/js/WikiTextRules.js
index c59a893e8..ac3303daf 100755
--- a/js/WikiTextRules.js
+++ b/js/WikiTextRules.js
@@ -420,7 +420,7 @@ var rules = [
 			w.nextMatch = oldNextMatch;
 			w.children = oldChildren;
 			w.dependencies = oldDependencies;
-			w.output.push.apply(w.output,parseTree.tree);
+			w.output.push.apply(w.output,parseTree.nodes);
 			w.nextMatch = this.lookaheadRegExp.lastIndex;
 		}
 	}
diff --git a/js/macros/image.js b/js/macros/image.js
index 4cba52ee4..ebd655547 100644
--- a/js/macros/image.js
+++ b/js/macros/image.js
@@ -19,7 +19,7 @@ exports.macro = {
 	},
 	execute: function() {
 		if(this.store.tiddlerExists(this.params.src)) {
-			var imageTree = this.store.parseTiddler(this.params.src).tree,
+			var imageTree = this.store.parseTiddler(this.params.src).nodes,
 				cloneImage = [];
 			for(var t=0; t<imageTree.length; t++) {
 				cloneImage.push(imageTree[t].clone());
diff --git a/js/macros/list.js b/js/macros/list.js
index d5d9c85dd..0bbe67040 100644
--- a/js/macros/list.js
+++ b/js/macros/list.js
@@ -60,7 +60,7 @@ exports.macro = {
 		if(tiddlers.length === 0) {
 			return [Renderer.TextNode(this.params.emptyMessage || "")];
 		} else {
-			var templateTree = this.store.parseText(templateType,templateText).tree;
+			var templateTree = this.store.parseText(templateType,templateText).nodes;
 			for(t=0; t<tiddlers.length; t++) {
 				var cloneTemplate = [];
 				for(var c=0; c<templateTree.length; c++) {
diff --git a/js/macros/slider.js b/js/macros/slider.js
index 0f3bd0e27..9e53cb559 100644
--- a/js/macros/slider.js
+++ b/js/macros/slider.js
@@ -42,7 +42,7 @@ exports.macro = {
 				target = this.params.targetTiddler,
 				sliderContent;
 			if(this.params.hasOwnProperty("content")) {
-				sliderContent = this.store.parseText("text/x-tiddlywiki",this.params.content).tree;
+				sliderContent = this.store.parseText("text/x-tiddlywiki",this.params.content).nodes;
 			} else {
 				sliderContent = [Renderer.MacroNode(
 										"tiddler",
diff --git a/js/macros/tiddler.js b/js/macros/tiddler.js
index fe27063d8..89c907ed9 100644
--- a/js/macros/tiddler.js
+++ b/js/macros/tiddler.js
@@ -77,11 +77,11 @@ exports.macro = {
 					var placeholderRegExp = new RegExp("\\$"+(t+1),"mg");
 					text = text.replace(placeholderRegExp,withTokens[t]);
 				}
-				content = this.store.parseText(targetTiddler.type,text).tree;
+				content = this.store.parseText(targetTiddler.type,text).nodes;
 			} else {
 				// There's no parameterisation, so we can just render the target tiddler directly
 				var parseTree = this.store.parseTiddler(renderTemplate);
-				content = parseTree ? parseTree.tree : [];
+				content = parseTree ? parseTree.nodes : [];
 			}
 		} else {
 			content = [Renderer.ErrorNode("Tiddler recursion error in <<tiddler>> macro")];	
diff --git a/js/macros/view.js b/js/macros/view.js
index 8d7f111fc..68919984c 100644
--- a/js/macros/view.js
+++ b/js/macros/view.js
@@ -41,14 +41,14 @@ exports.macro = {
 					case "wikified":
 						if(this.params.field === "text") {
 							if(parents.indexOf(tiddler.title) === -1) {
-								content = this.store.parseTiddler(tiddler.title).tree;
+								content = this.store.parseTiddler(tiddler.title).nodes;
 							} else {
 								content = [Renderer.ErrorNode("Tiddler recursion error in <<view>> macro")];
 							}
 							parents = parents.slice(0);
 							parents.push(tiddler.title);
 						} else {
-							content = this.store.parseText("text/x-tiddlywiki",v).tree;
+							content = this.store.parseText("text/x-tiddlywiki",v).nodes;
 						}
 						for(t=0; t<content.length; t++) {
 							contentClone.push(content[t].clone());