diff --git a/editions/tw5.com/tiddlers/filters/FilterOperator list.tid b/editions/tw5.com/tiddlers/filters/FilterOperator list.tid
index d5870a281..c546a3e40 100644
--- a/editions/tw5.com/tiddlers/filters/FilterOperator list.tid	
+++ b/editions/tw5.com/tiddlers/filters/FilterOperator list.tid	
@@ -5,7 +5,7 @@ caption: list
 title: FilterOperator: list
 type: text/vnd.tiddlywiki
 
-The ''list'' filter operator replaces the current list with the list contained in the [[TextReference|TextReferences]] specified in the operand. The default field for the text reference is `list`.
+The ''list'' filter operator replaces the current list with the list contained in the TextReference specified in the operand. The default field for the text reference is `list`.
 
 Preceding the operator name with `!` inverts the logic so that the filter only returns the tiddlers in the current list that are not listed in the specified list.
 
diff --git a/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid b/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid
index 4f6c50c94..ff14a4076 100644
--- a/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid
@@ -5,7 +5,7 @@ title: ChangeCountMacro
 type: text/vnd.tiddlywiki
 caption: changecount
 
-The changecount macro returns a counter maintained by the TiddlyWiki core that tracks the number of modifications made to each tiddler. The changecount macro always applies to the tiddler named in the [[currentTiddler|WidgetVariable: currentTiddler]] variable.
+The changecount macro returns a counter maintained by the TiddlyWiki core that tracks the number of modifications made to each tiddler. The changecount macro always applies to the tiddler named in the CurrentTiddler variable.
 
 For example:
 
diff --git a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid
index e6f1e198d..21b13e236 100644
--- a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid
@@ -16,7 +16,7 @@ The checkbox widget displays an HTML `<input type="checkbox">` element that is d
 The content of the `<$checkbox>` widget is displayed within an HTML `<label>` element immediately after the checkbox itself. This means that clicking on the content will toggle the checkbox.
 
 |!Attribute |!Description |
-|tiddler |Title of the tiddler to manipulate (defaults to the [[WidgetVariable: currentTiddler]]) |
+|tiddler |Title of the tiddler to manipulate (defaults to the CurrentTiddler) |
 |tag |The name of the tag to which the checkbox should be bound |
 |field |The name of the field to which the checkbox should be bound |
 |checked |The value of the field corresponding to the checkbox being checked |
diff --git a/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid b/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid
index cbd7b69d7..69080e395 100644
--- a/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid
@@ -14,7 +14,7 @@ The edit bitmap widget provides a user interface in the browser for editing bitm
 The content of the `<$edit-bitmap>` widget is ignored.
 
 |!Attribute |!Description |
-|tiddler |The tiddler to edit (defaults to the [[WidgetVariable: currentTiddler]]) |
+|tiddler |The tiddler to edit (defaults to the CurrentTiddler) |
 
 ! Configuration
 
diff --git a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
index db07d1e68..6ff14fba1 100644
--- a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
@@ -15,7 +15,7 @@ By default, the edit text widget generates a `<textarea>` as the HTML editing el
 The content of the `<$edit-text>` widget is ignored.
 
 |!Attribute |!Description |
-|tiddler |The tiddler to edit (defaults to the [[WidgetVariable: currentTiddler]]) |
+|tiddler |The tiddler to edit (defaults to the CurrentTiddler) |
 |field |The field to edit (defaults to `text`). Takes precedence over the `index` attribute |
 |index |The index to edit |
 |default |The default text to be provided when the target tiddler doesn't exist |
@@ -30,7 +30,7 @@ The content of the `<$edit-text>` widget is ignored.
 
 One trap to be aware of is that the edit text widget cannot be used to edit a field of the tiddler that contains it. Each keypress results in the tiddler being re-rendered, which loses the cursor position within the text field.
 
-Instead, place the edit text widget in a [[template|TiddlerTemplates]] that references the tiddler you want to modify.
+Instead, place the edit text widget in a [[template|TemplateTiddlers]] that references the tiddler you want to modify.
 
 For example, if you wanted to edit the value of the "myconfig" field of the tiddler "AppSettings", you might do so by creating a separate tiddler "ChangeAppSettings" that contains the following:
 
diff --git a/editions/tw5.com/tiddlers/widgets/EditWidget.tid b/editions/tw5.com/tiddlers/widgets/EditWidget.tid
index 83b648d4e..fa7422371 100644
--- a/editions/tw5.com/tiddlers/widgets/EditWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditWidget.tid
@@ -13,7 +13,7 @@ The edit widget provides a general purpose interface for editing a tiddler. It d
 The content of the `<$edit>` widget is ignored.
 
 |!Attribute |!Description |
-|tiddler |The tiddler to edit (defaults to the [[WidgetVariable: currentTiddler]]) |
+|tiddler |The tiddler to edit (defaults to the CurrentTiddler) |
 |field |The field to edit (defaults to `text`). Takes precedence over the `index` attribute |
 |index |The index to edit |
 |class |A CSS class to be added the generated editing widget |
diff --git a/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid b/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid
index 326b29ff6..a4933af80 100644
--- a/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid
@@ -20,4 +20,4 @@ The field mangler widget manipulates the fields and tags of a tiddler. It does s
 The field mangler widget displays any contained content, and responds to [[Messages]] dispatched within it.
 
 |!Attribute |!Description |
-|tiddler |Title of the tiddler to manipulate (defaults to the [[WidgetVariable: currentTiddler]]) |
+|tiddler |Title of the tiddler to manipulate (defaults to the CurrentTiddler) |
diff --git a/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid b/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid
index 9d068ce61..9e81ba094 100644
--- a/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid
@@ -22,7 +22,7 @@ The provided template is rendered with the following special substitutions:
 The content of the `<$fields>` widget is ignored.
 
 |!Attribute |!Description |
-|tiddler |Title of the tiddler from which the fields are to be displayed (defaults to the [[WidgetVariable: currentTiddler]]) |
+|tiddler |Title of the tiddler from which the fields are to be displayed (defaults to the CurrentTiddler) |
 |template |Text of the template (see above) |
 |exclude |Lists of fields to be excluded (defaults to "text") |
 |stripTitlePrefix |If set to "yes" then curly bracketed prefixes are removed from titles (for example `{prefix}HelloThere` converts to `HelloThere`) |
diff --git a/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid b/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid
index f18eea3c1..950153eb9 100644
--- a/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid
@@ -14,8 +14,8 @@ The keyboard widget allows [[Messages]] to be generated in response to key press
 The content of the `<$keyboard>` widget is rendered normally. The keyboard shortcut only takes effect within the contained content.
 
 |!Attribute |!Description |
-|message |The title of the WidgetMessage to generate |
-|param |The parameter to be passed with the WidgetMessage |
+|message |The title of the [[WidgetMessage|Messages]] to generate |
+|param |The parameter to be passed with the [[WidgetMessage|Messages]] |
 |key |Key string identifying the key to be trapped (see below) |
 |class |A CSS class to be assigned to the generated HTML DIV element |
 
diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
index 29d163acb..db885e11e 100644
--- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
@@ -9,7 +9,7 @@ The `link` widget generates links to tiddlers. (Use the HTML `<a>` element to ge
 ! Content and Attributes
 
 |!Attribute |!Description |
-|to |The title of the target tiddler for the link (defaults to the [[WidgetVariable: currentTiddler]]) |
+|to |The title of the target tiddler for the link (defaults to the CurrentTiddler) |
 |aria-label |Optional [[Accessibility]] label |
 |tooltip |Optional tooltip WikiText |
 
diff --git a/editions/tw5.com/tiddlers/widgets/ListWidget.tid b/editions/tw5.com/tiddlers/widgets/ListWidget.tid
index 6bc9aaf1d..3efd64b82 100644
--- a/editions/tw5.com/tiddlers/widgets/ListWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ListWidget.tid
@@ -20,7 +20,7 @@ The tiddlers can either be displayed by transcluding each in turn through an opt
 The content of the `<$list>` widget is an optional template to use for rendering each tiddler in the list (alternatively, the template can be specified as a tiddler title in the ``template`` attribute).
 
 |!Attribute |!Description |
-|filter |The TiddlerFilter to display |
+|filter |The [[tiddler filter|Filters]] to display |
 |template |The title of a template tiddler for rendering each tiddler in the list |
 |editTemplate |An alternative template to use for DraftTiddlers in edit mode |
 |variable |The [[widget variable|WidgetVariables]] name to be assigned the title of each tiddler in the list. Defaults to ''currentTiddler'' |
diff --git a/editions/tw5.com/tiddlers/widgets/RadioWidget.tid b/editions/tw5.com/tiddlers/widgets/RadioWidget.tid
index 2b520fbf8..a0aa5f496 100644
--- a/editions/tw5.com/tiddlers/widgets/RadioWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/RadioWidget.tid
@@ -14,7 +14,7 @@ The radio widget displays an HTML `<input type="radio">`  that reflects whether
 The content of the `<$radio>` widget is displayed within an HTML `<label>` element also containing the radio button. This means that clicking on the content will have the same effect as clicking on the button itself.
 
 |!Attribute |!Description |
-|tiddler |Title of the tiddler to manipulate (defaults to the [[WidgetVariable: currentTiddler]]) |
+|tiddler |Title of the tiddler to manipulate (defaults to the CurrentTiddler) |
 |field |The name of the field to which the radio button will be bound |
 |value |The value for the tiddler field |
 |class |CSS classes to be assigned to the label around the radio button |
diff --git a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid
index 963d0826e..e7d11bf55 100644
--- a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid
@@ -13,7 +13,7 @@ The view widget displays the contents of a tiddler field in a specified format.
 The content of the `<$view>` widget is displayed if the field or property is missing or empty.
 
 |!Attribute |!Description |
-|tiddler |The title of the tiddler (defaults to the [[WidgetVariable: currentTiddler]]) |
+|tiddler |The title of the tiddler (defaults to the CurrentTiddler) |
 |field |The name of the field to view (defaults to "text") |
 |index |The name of the index to view |
 |format |The format for displaying the field (see below) |
diff --git a/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid
index fe0df8844..9e1978996 100644
--- a/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid	
@@ -9,7 +9,7 @@ You can incorporate the content of one tiddler within another using the transclu
 
 * `{{MyTiddler}}` transcludes a single tiddler
 * `{{MyTiddler||TemplateTitle}}` displays the tiddler through a specified [[TemplateTiddler|TemplateTiddlers]]
-* `{{||TemplateTitle}}` displays the specified template tiddler without altering the [[current tiddler|WidgetVariable: currentTiddler]]
+* `{{||TemplateTitle}}` displays the specified template tiddler without altering the CurrentTiddler
 
 You can also use a TextReference instead of a tiddler title:
 
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid b/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid
index 09f887da6..3b30e2e6e 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid	
+++ b/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid	
@@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki
 
 You can use internal hyperlinks (links between tiddlers, normally displayed in blue text) to navigate between your tiddlers. Clicking on a link to any tiddler will take you to that tiddler. If the tiddler is closed, it will be opened. The wonderful thing about ~Tiddlywiki is that it has made links to tiddlers as accessible as possible. There are links everywhere! Here are the key places where you can find links to tiddlers in ~TiddlyWiki:
 
-* You can ''create a link'' to a tiddler, whether it exists yet or not, in the body of any tiddler. See [[Linking in Wikitext]] to see the various, easy ways to create links between tiddlers.
+* You can ''create a link'' to a tiddler, whether it exists yet or not, in the body of any tiddler. See [[Linking in WikiText]] to see the various, easy ways to create links between tiddlers.
 
 * Each ''tag pill'' found in your tiddler (such as the 'Working with ~TiddlyWiki' tag pill under the title of this tiddler) contains a link to that tag tiddler, as well a lists of all the tiddlers tagged with that tag. This allows you to go to any of those tiddlers.