diff --git a/core/modules/macros/story/story.js b/core/modules/macros/story/story.js
index 409edf316..1f2ca1562 100644
--- a/core/modules/macros/story/story.js
+++ b/core/modules/macros/story/story.js
@@ -41,7 +41,7 @@ exports.eventMap = {};
 
 // Navigate to a specified tiddler
 exports.eventMap["tw-navigate"] = function(event) {
-	var template = this.params.defaultViewTemplate || "ViewTemplate",
+	var template = this.params.defaultViewTemplate || "$:/templates/ViewTemplate",
 		storyTiddler = this.wiki.getTiddler(this.params.story),
 		story = {tiddlers: []},
 		navTiddler,t,tiddler;
@@ -75,7 +75,7 @@ exports.eventMap["tw-navigate"] = function(event) {
 exports.eventMap["tw-EditTiddler"] = function(event) {
 	var template, storyTiddler, story, storyRecord, tiddler, t;
 	// Put the specified tiddler into edit mode
-	template = this.params.defaultEditTemplate || "EditTemplate";
+	template = this.params.defaultEditTemplate || "$:/templates/EditTemplate";
 	storyTiddler = this.wiki.getTiddler(this.params.story);
 	story = {tiddlers: []};
 	if(storyTiddler && $tw.utils.hop(storyTiddler.fields,"text")) {
@@ -107,7 +107,7 @@ exports.eventMap["tw-EditTiddler"] = function(event) {
 // Take a tiddler out of edit mode, saving the changes
 exports.eventMap["tw-SaveTiddler"] = function(event) {
 	var template, storyTiddler, story, storyRecord, tiddler, storyTiddlerModified, t;
-	template = this.params.defaultEditTemplate || "ViewTemplate";
+	template = this.params.defaultEditTemplate || "$:/templates/ViewTemplate";
 	storyTiddler = this.wiki.getTiddler(this.params.story);
 	story = {tiddlers: []};
 	storyTiddlerModified = false;
diff --git a/core/modules/startup.js b/core/modules/startup.js
index 6f5da5df1..037dac2e5 100644
--- a/core/modules/startup.js
+++ b/core/modules/startup.js
@@ -52,8 +52,9 @@ exports.startup = function() {
 	// Host-specific startup
 	if($tw.browser) {
 		// Display the PageTemplate
-		var renderer = $tw.wiki.parseTiddler("PageTemplate");
-		renderer.execute([],"PageTemplate");
+		var template = "$:/templates/PageTemplate",
+			renderer = $tw.wiki.parseTiddler(template);
+		renderer.execute([],template);
 		renderer.renderInDom(document.body);
 		$tw.wiki.addEventListener("",function(changes) {
 			renderer.refreshInDom(changes);
diff --git a/core/templates/EditTemplate.tid b/core/templates/EditTemplate.tid
index 83acf56e1..69b3d88b8 100644
--- a/core/templates/EditTemplate.tid
+++ b/core/templates/EditTemplate.tid
@@ -1,4 +1,4 @@
-title: EditTemplate
+title: $:/templates/EditTemplate
 modifier: JeremyRuston
 
 <<view title>> <<button SaveTiddler label:"done" class:"btn btn-mini btn-success">>
diff --git a/core/templates/PageTemplate.tid b/core/templates/PageTemplate.tid
index 76a0e9efa..e0dd7a22d 100644
--- a/core/templates/PageTemplate.tid
+++ b/core/templates/PageTemplate.tid
@@ -1,6 +1,6 @@
-title: PageTemplate
+title: $:/templates/PageTemplate
 
 {{navigation-panel{<<chooser>>}}}{{zoomer-panel{<<zoomer>>}}}
 {{container-fluid{
-<<story story:StoryTiddlers storyview:scroller>>
-}}}
\ No newline at end of file
+<<story story:"$:/StoryTiddlers" storyview:scroller>>
+}}}
diff --git a/core/templates/ViewTemplate.tid b/core/templates/ViewTemplate.tid
index b2fde11f3..48ffb5ac9 100644
--- a/core/templates/ViewTemplate.tid
+++ b/core/templates/ViewTemplate.tid
@@ -1,4 +1,4 @@
-title: ViewTemplate
+title: $:/templates/ViewTemplate
 modifier: JeremyRuston
 
 {{title{
diff --git a/tw5.com/shadows/StoryTiddlers.tid b/tw5.com/shadows/StoryTiddlers.tid
index 8e9825055..5d25868de 100644
--- a/tw5.com/shadows/StoryTiddlers.tid
+++ b/tw5.com/shadows/StoryTiddlers.tid
@@ -1,10 +1,10 @@
-title: StoryTiddlers
+title: $:/StoryTiddlers
 type: application/json
 
 {
 	"tiddlers": [
-		{"title": "HelloThere", "template": "ViewTemplate"},
-		{"title": "Introduction", "template": "ViewTemplate"},
-		{"title": "NewWikiTextFeatures", "template": "ViewTemplate"}
+		{"title": "HelloThere", "template": "$:/templates/ViewTemplate"},
+		{"title": "Introduction", "template": "$:/templates/ViewTemplate"},
+		{"title": "NewWikiTextFeatures", "template": "$:/templates/ViewTemplate"}
 	]
 }
\ No newline at end of file