diff --git a/editions/tw5.com/tiddlers/Building_classic_TiddlyWiki_with_TiddlyWiki.tid b/editions/tw5.com/tiddlers/Building_classic_TiddlyWiki_with_TiddlyWiki.tid
index 6185c084c..b6a95f578 100644
--- a/editions/tw5.com/tiddlers/Building_classic_TiddlyWiki_with_TiddlyWiki.tid
+++ b/editions/tw5.com/tiddlers/Building_classic_TiddlyWiki_with_TiddlyWiki.tid
@@ -16,7 +16,7 @@ TiddlyWikiClassic is built from the command line by running TiddlyWiki5 under no
 node ../../tiddlywiki.js \
 	--verbose \
 	--load <path_to_recipe_file> \
-	--savetiddler $:/core/templates/tiddlywiki2.template.html <path_to_write_index_file> text/plain \
+	--rendertiddler $:/core/templates/tiddlywiki2.template.html <path_to_write_index_file> text/plain \
 	|| exit 1
 ```
 
diff --git a/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Node_Edition.tid b/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Node_Edition.tid
index 4fa6f197b..e7dca363b 100644
--- a/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Node_Edition.tid
+++ b/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Node_Edition.tid
@@ -6,7 +6,7 @@ tags: docs edition
 TiddlyWiki5 can be used on the command line to perform an extensive set of operations based on tiddlers, TiddlyWikiFolders, TiddlerFiles and TiddlyWikiFiles. For example, the following command loads the tiddlers from a TiddlyWiki HTML file and then saves one of them in HTML:
 
 ```
-node tiddlywiki.js --verbose --load mywiki.html --savetiddler ReadMe ./readme.html
+node tiddlywiki.js --verbose --load mywiki.html --rendertiddler ReadMe ./readme.html
 ```
 
 In order to use TiddlyWiki5 on the command line you must first install node.js from http://nodejs.org/
diff --git a/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Static_Site_Generation.tid b/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Static_Site_Generation.tid
index e2e004a17..14730d469 100644
--- a/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Static_Site_Generation.tid
+++ b/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Static_Site_Generation.tid
@@ -10,8 +10,8 @@ You can explore a static representation of the TiddlyWiki5 site at <a href="stat
 The included `bld.sh` script includes these commands that are involved in generating the sample static version of the TiddlyWiki5 site:
 
 ```
---savetiddler $:/core/templates/static.template.html $TW5_BUILD_OUTPUT/static.html text/plain \
---savetiddler $:/core/templates/static.template.css $TW5_BUILD_OUTPUT/static/static.css text/plain \
---savetiddlers [!is[system]] $:/core/templates/static.tiddler.html $TW5_BUILD_OUTPUT/static text/plain \
+--rendertiddler $:/core/templates/static.template.html $TW5_BUILD_OUTPUT/static.html text/plain \
+--rendertiddler $:/core/templates/static.template.css $TW5_BUILD_OUTPUT/static/static.css text/plain \
+--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html $TW5_BUILD_OUTPUT/static text/plain \
 ```
-The first SaveTiddlerCommand saves the static version of the DefaulTiddlers, the second saves the stylesheet, and the final SaveTiddlersCommand generates the HTML representations of individual tiddlers.
+The first RenderTiddlerCommand saves the static version of the DefaulTiddlers, the second saves the stylesheet, and the final RenderTiddlersCommand generates the HTML representations of individual tiddlers.
diff --git a/editions/tw5.com/tiddlers/howtos/How_to_build_a_TiddlyWiki5_from_individual_tiddlers.tid b/editions/tw5.com/tiddlers/howtos/How_to_build_a_TiddlyWiki5_from_individual_tiddlers.tid
index e6b8f821f..c8e3ab8a8 100644
--- a/editions/tw5.com/tiddlers/howtos/How_to_build_a_TiddlyWiki5_from_individual_tiddlers.tid
+++ b/editions/tw5.com/tiddlers/howtos/How_to_build_a_TiddlyWiki5_from_individual_tiddlers.tid
@@ -8,4 +8,4 @@ tags: docs howto
 ##* Alternatively, just copy the `editions/empty` folder from the TiddlyWiki5 repo
 # Create individual tiddler files in the `~/MyWiki/tiddlers` directory
 # Execute the following command from the TiddlyWiki5 root directory to build a TiddlyWiki5 file from the tiddlers:
-## `node ./tiddlywiki.js ~/MyWiki --savetiddler $:/core/templates/tiddlywiki5.template.html index.html text/plain`
+## `node ./tiddlywiki.js ~/MyWiki --rendertiddler $:/core/templates/tiddlywiki5.template.html index.html text/plain`
diff --git a/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid b/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid
index 7b1933c70..e7d607da4 100644
--- a/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid	
@@ -11,7 +11,7 @@ When displaying the contents of a folder GitHub will look for a `readme.md` file
 This is done in `bld.sh` by this command:
 
 ```
---savetiddler ReadMe ./readme.md text/html
+--rendertiddler ReadMe ./readme.md text/html
 ```
 
 It saves the tiddler ReadMe to the file `./readme.md` in the `text/html` format.
diff --git a/editions/tw5.com/tiddlers/mechanisms/TestingMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/TestingMechanism.tid
index 85b07bffe..9b1a27f59 100644
--- a/editions/tw5.com/tiddlers/mechanisms/TestingMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/TestingMechanism.tid
@@ -28,7 +28,7 @@ To generate a wiki containing the browser tests load up the `test` wiki and save
 node ./tiddlywiki.js \
 	./editions/test \
 	--verbose \
-	--savetiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/test.html text/plain \
+	--rendertiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/test.html text/plain \
 ```
 
 Then, open the `test.html` file in the browser to see the test results. There is a prebuilt version of `test.html` at: