diff --git a/core/templates/canonical-uri.tid b/core/templates/canonical-uri-external-image.tid
similarity index 81%
rename from core/templates/canonical-uri.tid
rename to core/templates/canonical-uri-external-image.tid
index 32aed449f..b1ae6dd08 100644
--- a/core/templates/canonical-uri.tid
+++ b/core/templates/canonical-uri-external-image.tid
@@ -1,4 +1,4 @@
-title: $:/core/templates/canonical-uri
+title: $:/core/templates/canonical-uri-external-image
 
 <!--
 
diff --git a/editions/tw5.com/tiddlers/concepts/ExternalImages.tid b/editions/tw5.com/tiddlers/concepts/ExternalImages.tid
index 87a952974..0e394dc91 100644
--- a/editions/tw5.com/tiddlers/concepts/ExternalImages.tid
+++ b/editions/tw5.com/tiddlers/concepts/ExternalImages.tid
@@ -31,7 +31,7 @@ For an example see the ''externalimages'' build target of the demo ''tw5.com'' w
 
 ```
 --savetiddlers [is[image]] images
---setfield [is[image]] _canonical_uri $:/core/templates/canonical-uri text/plain
+--setfield [is[image]] _canonical_uri $:/core/templates/canonical-uri-external-image text/plain
 --setfield [is[image]] text "" text/plain
 --rendertiddler $:/core/save/all externalimages.html text/plain
 ```
@@ -49,15 +49,15 @@ The following `--savetiddlers` command can be used to save the images of a wiki
 Two `--setfield` commands are used: the first sets the ''_canonical_uri'' field to a URI derived from the title of the tiddler, and the second clears the text field.
 
 ```
---setfield [is[image]] _canonical_uri $:/core/templates/canonical-uri text/plain
+--setfield [is[image]] _canonical_uri $:/core/templates/canonical-uri-external-image text/plain
 --setfield [is[image]] text "" text/plain
 ```
 
-The template tiddler [[$:/core/templates/canonical-uri]] contains:
+The template tiddler [[$:/core/templates/canonical-uri-external-image]] contains:
 
 <pre>
 
-<$view tiddler="$:/core/templates/canonical-uri" field="text" format="text"/>
+<$view tiddler="$:/core/templates/canonical-uri-external-image" field="text" format="text"/>
 
 </pre>
 
diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info
index 8cd612e84..6ab1c59c9 100644
--- a/editions/tw5.com/tiddlywiki.info
+++ b/editions/tw5.com/tiddlywiki.info
@@ -32,7 +32,7 @@
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"externalimages": [
 			"--savetiddlers","[is[image]] [type[text/html]]","images",
-			"--setfield","[is[image]] [type[text/html]]","_canonical_uri","$:/core/templates/canonical-uri","text/plain",
+			"--setfield","[is[image]] [type[text/html]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
 			"--setfield","[is[image]]","text","","text/plain",
 			"--rendertiddler","$:/core/save/all","externalimages.html","text/plain"],
 		"encrypted": [