diff --git a/editions/clientserver/tiddlers/DataTiddlers.tid b/editions/tw5.com/tiddlers/concepts/DataTiddlers.tid
similarity index 100%
rename from editions/clientserver/tiddlers/DataTiddlers.tid
rename to editions/tw5.com/tiddlers/concepts/DataTiddlers.tid
diff --git a/editions/clientserver/tiddlers/CamelCase.tid b/editions/tw5.com/tiddlers/definitions/CamelCase.tid
similarity index 100%
rename from editions/clientserver/tiddlers/CamelCase.tid
rename to editions/tw5.com/tiddlers/definitions/CamelCase.tid
diff --git a/editions/clientserver/tiddlers/ContentType.tid b/editions/tw5.com/tiddlers/definitions/ContentType.tid
similarity index 100%
rename from editions/clientserver/tiddlers/ContentType.tid
rename to editions/tw5.com/tiddlers/definitions/ContentType.tid
diff --git a/editions/clientserver/tiddlers/Jermolene.tid b/editions/tw5.com/tiddlers/definitions/Jermolene.tid
similarity index 100%
rename from editions/clientserver/tiddlers/Jermolene.tid
rename to editions/tw5.com/tiddlers/definitions/Jermolene.tid
diff --git a/readme.md b/readme.md
index 246c87058..b440d9c2b 100644
--- a/readme.md
+++ b/readme.md
@@ -175,7 +175,7 @@ Print the current core configuration </p><pre>
 RenderTiddlerCommand</a></span></h3><div>
 <div class='tw-transclude'>
 <p>
-Render an individual tiddler as a specified <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='http://five.tiddlywiki.com/static/ContentType.html'>
+Render an individual tiddler as a specified <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='http://five.tiddlywiki.com/static/ContentType.html'>
 ContentType</a>, defaults to <code>
 text/html</code> and save it to the specified filename </p><pre>
 --rendertiddler &lt;title&gt; &lt;filename&gt; [&lt;type&gt;]</pre></div></div></div></div><div class='tw-list-element'>
@@ -186,7 +186,7 @@ text/html</code> and save it to the specified filename </p><pre>
 RenderTiddlersCommand</a></span></h3><div>
 <div class='tw-transclude'>
 <p>
-Render a set of tiddlers matching a filter to separate files of a specified <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='http://five.tiddlywiki.com/static/ContentType.html'>
+Render a set of tiddlers matching a filter to separate files of a specified <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='http://five.tiddlywiki.com/static/ContentType.html'>
 ContentType</a> (defaults to <code>
 text/html</code>) and extension (defaults to <code>
 .html</code>).</p><pre>