diff --git a/core/language/en-GB/Snippets/GetTiddlyWikiJS.tid b/core/language/en-GB/Snippets/GetTiddlyWikiJS.tid
index 79f7f95d8..54bc60396 100644
--- a/core/language/en-GB/Snippets/GetTiddlyWikiJS.tid
+++ b/core/language/en-GB/Snippets/GetTiddlyWikiJS.tid
@@ -8,7 +8,7 @@ In the external-js setting, you must have a copy of `twcore-TIDDLYWIKI_VERSION.j
 <$reveal state="$:/plugins/tiddlywiki/tiddlyweb!!plugin-type" type="match" text="plugin">
 
 <li>
-If you are running ~TiddlyWiki on Node.js, you can download <a class="tc-tiddlylink" href="%24%3A%2Fcore%2Ftemplates%2Ftwcore.js" download=<<jsFileName>>><<jsFileName>></a>
+If you are running ~TiddlyWiki on Node.js, you can download <a class="tc-tiddlylink" href="%24%3A%2Fcore%2Ftemplates%2Ftiddlywiki5.js" download=<<jsFileName>>><<jsFileName>></a>
 from your server. If clicking the link does not work, right-click the link and save it that way.
 </li>
 
@@ -20,7 +20,7 @@ from your server. If clicking the link does not work, right-click the link and s
 
 If this wiki's core library has not been externalized, you can click the following button to export ~TiddlyWiki's core from your own wiki:
 <div><$button style=<<cssState>> class="tc-btn-big-green" disabled=<<isButtonOff>> >
-<$action-sendmessage $message="tm-download-file" $param="$:/core/templates/twcore.js" filename=<<jsFileName>>/>
+<$action-sendmessage $message="tm-download-file" $param="$:/core/templates/tiddlywiki5.js" filename=<<jsFileName>>/>
 {{$:/core/images/download-button}} Export ~TiddlyWiki Core
 </$button></div>
 
@@ -45,7 +45,7 @@ If you have installed ~TiddlyWiki on Node.js, you can run the following command:
 
 ```
 tiddlywiki <your-wiki-folder> \
-    --render "$:/core/templates/twcore.js" \
+    --render "$:/core/templates/tiddlywiki5.js" \
     "[[twcore-]addsuffix<version>addsuffix[.js]]" \
     "text/plain"
 ```
diff --git a/core/templates/external-js/save-all-external-js.tid b/core/templates/external-js/save-all-external-js.tid
index 7ac2f317d..a41cc0682 100644
--- a/core/templates/external-js/save-all-external-js.tid
+++ b/core/templates/external-js/save-all-external-js.tid
@@ -4,5 +4,5 @@ title: $:/core/save/all-external-js
 \define saveTiddlerFilter()
 [is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
-\define coreURL() %24%3A%2Fcore%2Ftemplates%2Ftwcore.js
+\define coreURL() %24%3A%2Fcore%2Ftemplates%2Ftiddlywiki5.js
 {{$:/core/templates/tiddlywiki5-external-js.html}}
diff --git a/core/templates/external-js/tiddlywiki.js.tid b/core/templates/external-js/tiddlywiki.js.tid
index 7df79667f..a8170663f 100644
--- a/core/templates/external-js/tiddlywiki.js.tid
+++ b/core/templates/external-js/tiddlywiki.js.tid
@@ -1,4 +1,4 @@
-title: $:/core/templates/twcore.js
+title: $:/core/templates/tiddlywiki5.js
 
 \rules only filteredtranscludeinline transcludeinline codeinline
 
@@ -10,6 +10,6 @@ title: $:/core/templates/twcore.js
 <!--~~ Boot prefix ~~-->
 {{ $:/boot/bootprefix.js ||$:/core/templates/plain-text-tiddler}}
 <!--~~ Core plugin ~~-->
-{{$:/core/templates/twcore.js/tiddlers}}
+{{$:/core/templates/tiddlywiki5.js/tiddlers}}
 <!--~~ Boot kernel ~~-->
 {{ $:/boot/boot.js ||$:/core/templates/plain-text-tiddler}}
diff --git a/core/templates/external-js/tiddlywiki.js.tiddlers.tid b/core/templates/external-js/tiddlywiki.js.tiddlers.tid
index 3dd2debcb..3b5d1bfe6 100644
--- a/core/templates/external-js/tiddlywiki.js.tiddlers.tid
+++ b/core/templates/external-js/tiddlywiki.js.tiddlers.tid
@@ -1,4 +1,4 @@
-title: $:/core/templates/twcore.js/tiddlers
+title: $:/core/templates/tiddlywiki5.js/tiddlers
 
 `
 $tw.preloadTiddlerArray(`<$text text=<<jsontiddlers "[[$:/core]]">>/>`);
diff --git a/editions/server-external-js/tiddlywiki.info b/editions/server-external-js/tiddlywiki.info
index b54c9c2c8..b39df82cd 100644
--- a/editions/server-external-js/tiddlywiki.info
+++ b/editions/server-external-js/tiddlywiki.info
@@ -14,13 +14,13 @@
 			"--listen","root-tiddler=$:/core/save/all-external-js"],
 		"index": [
 			"--rendertiddler","$:/core/save/offline-external-js","index.html","text/plain",
-			"--render","$:/core/templates/twcore.js","[[twcore-]addsuffix<version>addsuffix[.js]]","text/plain"],
+			"--render","$:/core/templates/tiddlywiki5.js","[[twcore-]addsuffix<version>addsuffix[.js]]","text/plain"],
 		"static": [
 			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
 			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
 			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
 			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"],
 		"twcore": [
-			"--render","$:/core/templates/twcore.js","[[twcore-]addsuffix<version>addsuffix[.js]]","text/plain"]
+			"--render","$:/core/templates/tiddlywiki5.js","[[twcore-]addsuffix<version>addsuffix[.js]]","text/plain"]
 	}
 }
diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info
index c4ffcac36..d85dfd34a 100644
--- a/editions/tw5.com/tiddlywiki.info
+++ b/editions/tw5.com/tiddlywiki.info
@@ -53,7 +53,7 @@
 			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"],
 		"external-js": [
 			"--rendertiddler","$:/core/save/offline-external-js","index.html","text/plain",
-			"--render","$:/core/templates/twcore.js","[[twcore-]addsuffix<version>addsuffix[.js]]","text/plain"]
+			"--render","$:/core/templates/tiddlywiki5.js","[[twcore-]addsuffix<version>addsuffix[.js]]","text/plain"]
 	},
 	"config": {
 		"retain-original-tiddler-path": true