diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid
index 0a9e9ee4c..4be344d07 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid	
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid	
@@ -1,11 +1,10 @@
+caption: Expandable
 created: 20150221201816000
 modified: 20150221203715000
 title: Example Table of Contents: Expandable
-caption: Expandable
-tags: table-of-contents-example
-order: 2
+type: text/vnd.tiddlywiki
 
 <$macrocall $name=".example" n="1"
 eg="""<div class="tc-table-of-contents">
-<<toc-expandable "Contents">>
+<<toc-expandable tag:"Contents">>
 </div>"""/>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example custom icons.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example custom icons.tid
index d5ade8eb8..aeaa04db3 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example custom icons.tid	
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example custom icons.tid	
@@ -11,6 +11,6 @@ type: text/vnd.tiddlywiki
 <$macrocall $name=".example" n="1"
 eg="""<$let toc-open-icon="$:/core/images/fold-button" toc-closed-icon="$:/core/images/folder">
 <div class="tc-table-of-contents">
-<<toc-selective-expandable "Contents">>
+<<toc-selective-expandable tag:"Contents">>
 </div>
 </$let>"""/>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid
index 61187ac95..c064b5dff 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid	
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid	
@@ -1,11 +1,10 @@
+caption: Selective
 created: 20150221201907000
 modified: 20150221203950000
 title: Example Table of Contents: Selectively Expandable
-caption: Selective
-tags: table-of-contents-example
-order: 4
+type: text/vnd.tiddlywiki
 
 <$macrocall $name=".example" n="1"
 eg="""<div class="tc-table-of-contents">
-<<toc-selective-expandable "Contents">>
+<<toc-selective-expandable tag:"Contents">>
 </div>"""/>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid
index 5e6ab1c53..06d21910e 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid	
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid	
@@ -1,11 +1,10 @@
+caption: Simple
 created: 20150221201838000
 modified: 20150221203742000
 title: Example Table of Contents: Simple
-caption: Simple
-tags: table-of-contents-example
-order: 1
+type: text/vnd.tiddlywiki
 
 <$macrocall $name=".example" n="1"
 eg="""<div class="tc-table-of-contents">
-<<toc "Contents">>
+<<toc tag:"Contents">>
 </div>"""/>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid
index 6ab6f877a..3a70216d9 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid	
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid	
@@ -8,5 +8,5 @@ type: text/vnd.tiddlywiki
 
 <$macrocall $name=".example" n="1"
 eg="""<div class="tc-table-of-contents">
-<<toc-selective-expandable "Contents" "!sort[title]">>
+<<toc-selective-expandable tag:"Contents" sort:"!sort[title]">>
 </div>"""/>