19 files changed, 131 insertions, 130 deletions
diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl
index 8b8936733..4e89efe32 100644
--- a/templates/aggregatepost.tmpl
+++ b/templates/aggregatepost.tmpl
@@ -1,15 +1,15 @@
 <TMPL_VAR CONTENT>
-<TMPL_LOOP NAME="TAGS">
+<TMPL_LOOP TAGS>
 [[!tag <TMPL_VAR TAG>]]
 </TMPL_LOOP>
-<TMPL_IF NAME="TITLE">
-[[!meta title="<TMPL_VAR NAME="TITLE" ESCAPE=HTML>"]]
+<TMPL_IF TITLE>
+[[!meta title="<TMPL_VAR TITLE ESCAPE=HTML>"]]
 </TMPL_IF>
-<TMPL_IF NAME="PERMALINK">
-[[!meta permalink="<TMPL_VAR NAME="PERMALINK" ESCAPE=HTML>"]]
+<TMPL_IF PERMALINK>
+[[!meta permalink="<TMPL_VAR PERMALINK ESCAPE=HTML>"]]
 </TMPL_IF>
-<TMPL_IF NAME="COPYRIGHT">
-[[!meta copyright="<TMPL_VAR NAME="COPYRIGHT" ESCAPE=HTML>"]]
+<TMPL_IF COPYRIGHT>
+[[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]]
 </TMPL_IF>
-[[!meta author="<TMPL_VAR NAME="NAME" ESCAPE=HTML>"]]
-[[!meta authorurl="<TMPL_VAR NAME="URL" ESCAPE=HTML>"]]
+[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]]
+[[!meta authorurl="<TMPL_VAR URL ESCAPE=HTML>"]]
diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl
index 28800e763..93bdd9ce0 100644
--- a/templates/archivepage.tmpl
+++ b/templates/archivepage.tmpl
@@ -1,14 +1,14 @@
 <p>
-<TMPL_IF NAME="PERMALINK">
+<TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a><br />
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
 </TMPL_IF>
 <i>
 Posted <TMPL_VAR CTIME>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 by <span class="author">
-<TMPL_IF NAME="AUTHORURL">
+<TMPL_IF AUTHORURL>
 <a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
 <TMPL_VAR AUTHOR>
diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 87cbee9e0..4ed17bc62 100644
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -1,17 +1,17 @@
 <entry>
 	<title><TMPL_VAR TITLE></title>
-<TMPL_IF NAME="GUID">
+<TMPL_IF GUID>
 	<id><TMPL_VAR GUID></id>
 <TMPL_ELSE>
 	<id><TMPL_VAR URL></id>
 </TMPL_IF>
 	<link href="<TMPL_VAR PERMALINK>"/>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 	<author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
 </TMPL_IF>
-<TMPL_IF NAME="COPYRIGHT">
+<TMPL_IF COPYRIGHT>
 	<rights type="html" xml:lang="en">
-<TMPL_IF NAME="LICENSE">
+<TMPL_IF LICENSE>
 		<TMPL_VAR LICENSE ESCAPE=HTML>
 		<TMPL_VAR COPYRIGHT ESCAPE=HTML>
 <TMPL_ELSE>
@@ -19,30 +19,30 @@
 </TMPL_IF>
 	</rights>
 <TMPL_ELSE>
-<TMPL_IF NAME="LICENSE">
+<TMPL_IF LICENSE>
 	<rights type="html" xml:lang="en">
 	<TMPL_VAR LICENSE ESCAPE=HTML>
 	</rights>
 </TMPL_IF>
 </TMPL_IF>
-<TMPL_IF NAME="CATEGORIES">
-<TMPL_LOOP NAME="CATEGORIES">
+<TMPL_IF CATEGORIES>
+<TMPL_LOOP CATEGORIES>
 	<category term="<TMPL_VAR CATEGORY>" />
 </TMPL_LOOP>
 </TMPL_IF>
 	<updated><TMPL_VAR MDATE_3339></updated>
 	<published><TMPL_VAR CDATE_3339></published>
-<TMPL_IF NAME="ENCLOSURE">
+<TMPL_IF ENCLOSURE>
 	<link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
 <TMPL_ELSE>
 	<content type="html" xml:lang="en">
 	<TMPL_VAR CONTENT ESCAPE=HTML>
 	</content>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSURL">
-	<link rel="comments" href="<TMPL_VAR NAME="COMMENTSURL">" type="text/html" />
+<TMPL_IF COMMENTSURL>
+	<link rel="comments" href="<TMPL_VAR COMMENTSURL>" type="text/html" />
 </TMPL_IF>
-<TMPL_IF NAME="ATOMCOMMENTSURL">
-	<link rel="comments" href="<TMPL_VAR NAME="ATOMCOMMENTSURL">" type="application/atom+xml" />
+<TMPL_IF ATOMCOMMENTSURL>
+	<link rel="comments" href="<TMPL_VAR ATOMCOMMENTSURL>" type="application/atom+xml" />
 </TMPL_IF>
 </entry>
diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index fc0088ae8..e82b59827 100644
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -5,15 +5,15 @@
 <link href="<TMPL_VAR PAGEURL>"/>
 <link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
 <author>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 <name><TMPL_VAR AUTHOR></name>
 <TMPL_ELSE>
 <name><TMPL_VAR WIKINAME></name>
 </TMPL_IF>
 </author>
-<TMPL_IF NAME="COPYRIGHT">
+<TMPL_IF COPYRIGHT>
 <rights type="html" xml:lang="en">
-<TMPL_IF NAME="LICENSE">
+<TMPL_IF LICENSE>
 	<TMPL_VAR LICENSE>
 	<TMPL_VAR COPYRIGHT ESCAPE=HTML>
 <TMPL_ELSE>
@@ -21,13 +21,13 @@
 </TMPL_IF>
 </rights>
 <TMPL_ELSE>
-<TMPL_IF NAME="LICENSE">
+<TMPL_IF LICENSE>
 <rights type="html">
 	<TMPL_VAR LICENSE ESCAPE=HTML>
 </rights>
 </TMPL_IF>
 </TMPL_IF>
-<TMPL_IF NAME="GUID">
+<TMPL_IF GUID>
 <id><TMPL_VAR GUID></id>
 <TMPL_ELSE>
 <id><TMPL_VAR PAGEURL></id>
diff --git a/templates/blogpost.tmpl b/templates/blogpost.tmpl
index 7eeede603..5a31e3f8a 100644
--- a/templates/blogpost.tmpl
+++ b/templates/blogpost.tmpl
@@ -1,10 +1,10 @@
 <form action="<TMPL_VAR CGIURL>" method="get">
 <div id="blogform">
-<TMPL_IF NAME="RSSURL">
-<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a>
+<TMPL_IF RSSURL>
+<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR RSSURL>">RSS</a>
 </TMPL_IF>
-<TMPL_IF NAME="ATOMURL">
-<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR NAME=ATOMURL>">Atom</a>
+<TMPL_IF ATOMURL>
+<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR ATOMURL>">Atom</a>
 </TMPL_IF>
 <input type="hidden" name="do" value="blog" />
 <input type="hidden" name="from" value="<TMPL_VAR ROOTPAGE>" />
diff --git a/templates/change.tmpl b/templates/change.tmpl
index 5f277a0fb..671b9e483 100644
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -2,15 +2,15 @@
 <TMPL_IF AUTHORURL>
 [[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
 </TMPL_IF>
-[[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
+[[!meta title="""change to<TMPL_LOOP PAGES> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
 <TMPL_IF PERMALINK>
 [[!meta permalink="<TMPL_VAR PERMALINK>"]]
 </TMPL_IF>
 <div id="change-<TMPL_VAR REV>" class="metadata">
 <span class="desc"><br />Changed pages:</span>
 <span class="pagelinks">
-<TMPL_LOOP NAME="PAGES">
-<TMPL_IF NAME="DIFFURL"><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
+<TMPL_LOOP PAGES>
+<TMPL_IF DIFFURL><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
 <TMPL_ELSE>
 <TMPL_VAR LINK>
 </TMPL_IF>
@@ -18,7 +18,7 @@
 </span>
 <span class="desc"><br />Changed by:</span>
 <span class="committer">
-<TMPL_IF NAME="AUTHORURL">
+<TMPL_IF AUTHORURL>
 <a href="<TMPL_VAR AUTHORURL>" rel="nofollow"><TMPL_VAR USER></a>
 <TMPL_ELSE>
 <TMPL_VAR USER>
@@ -30,16 +30,16 @@
 <span class="changedate"><TMPL_VAR COMMITDATE></span>
 </div>
 <div class="changelog">
-<TMPL_LOOP NAME="MESSAGE">
-<TMPL_IF NAME="LINE">
-<TMPL_VAR NAME="LINE"><br />
+<TMPL_LOOP MESSAGE>
+<TMPL_IF LINE>
+<TMPL_VAR LINE><br />
 </TMPL_IF>
 </TMPL_LOOP>
 </div>
-<TMPL_IF NAME="DIFF">
+<TMPL_IF DIFF>
 <div class="diff">
 <pre>
-<TMPL_VAR NAME="DIFF">
+<TMPL_VAR DIFF>
 </pre>
 </div>
 </TMPL_IF>
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 39cba0ff9..fa90e6d26 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,5 +1,5 @@
-<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR NAME=COMMENTID>">
-<TMPL_ELSE><div class="comment" id="<TMPL_VAR NAME=COMMENTID>"></TMPL_IF>
+<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR COMMENTID>">
+<TMPL_ELSE><div class="comment" id="<TMPL_VAR COMMENTID>"></TMPL_IF>
 
 <TMPL_IF HTML5><header class="comment-subject"><TMPL_ELSE><div class="comment-subject"></TMPL_IF>
 <TMPL_IF PERMALINK>
@@ -15,40 +15,40 @@
 
 <TMPL_IF HTML5><header class="comment-header"><TMPL_ELSE><div class="comment-header"></TMPL_IF>
 Comment by
-<TMPL_IF NAME="COMMENTUSER">
-<TMPL_IF NAME="COMMENTOPENID">
+<TMPL_IF COMMENTUSER>
+<TMPL_IF COMMENTOPENID>
 <span class="author" title="OpenID">
-<a href="<TMPL_VAR NAME=COMMENTOPENID>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
+<a href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a>
 </span>
 <TMPL_ELSE>
 <span class="author" title="Signed in">
-<TMPL_IF NAME="COMMENTAUTHORURL">
-<a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
+<TMPL_IF COMMENTAUTHORURL>
+<a href="<TMPL_VAR COMMENTAUTHORURL>"><TMPL_VAR COMMENTAUTHOR></a>
 <TMPL_ELSE>
-<TMPL_VAR NAME=COMMENTAUTHOR>
+<TMPL_VAR COMMENTAUTHOR>
 </TMPL_IF>
 </span>
 </TMPL_IF>
 <TMPL_ELSE>
-<TMPL_IF NAME=COMMENTIP>
-<span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>">
+<TMPL_IF COMMENTIP>
+<span class="author" title="Unauthenticated, from <TMPL_VAR COMMENTIP>">
 <TMPL_ELSE>
 <span class="author" title="Unauthenticated, from unknown IP address">
 </TMPL_IF>
-<TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
-<TMPL_VAR NAME=AUTHOR>
+<TMPL_VAR AUTHOR>
 </TMPL_IF>
 </span>
 </TMPL_IF>
 &mdash; <TMPL_VAR CTIME>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
-<TMPL_IF NAME="HAVE_ACTIONS">
+<TMPL_IF HAVE_ACTIONS>
 <TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
-<TMPL_IF NAME="REMOVEURL">
+<TMPL_IF REMOVEURL>
 <li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
 </TMPL_IF>
 </ul>
diff --git a/templates/commentmoderation.tmpl b/templates/commentmoderation.tmpl
index 297886407..10f2b36df 100644
--- a/templates/commentmoderation.tmpl
+++ b/templates/commentmoderation.tmpl
@@ -1,4 +1,4 @@
-<TMPL_IF NAME="COMMENTS">
+<TMPL_IF COMMENTS>
 <br />
 <form action="<TMPL_VAR CGIURL>" method="post">
 <input type="hidden" name="do" value="commentmoderation" />
@@ -7,7 +7,7 @@
 <input type="checkbox" name="rejectalldefer" value="1" />
 <label for="rejectalldefer">Reject all comments marked <em>Defer</em></label>
 <br />
-<TMPL_LOOP NAME="COMMENTS">
+<TMPL_LOOP COMMENTS>
 <div>
 <div>
 <TMPL_VAR VIEW>
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index 32e8c392d..51ab10f2c 100644
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -4,11 +4,11 @@
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-PAGE>
-<TMPL_UNLESS NAME=USERNAME>
-<TMPL_IF NAME=ALLOWAUTHOR>
-Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional, or
+<TMPL_UNLESS USERNAME>
+<TMPL_IF ALLOWAUTHOR>
+Name: <TMPL_VAR FIELD-AUTHOR> (optional, or
 <a href="<TMPL_VAR SIGNINURL>">signin</a>)<br />
-Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
+Website: <TMPL_VAR FIELD-URL> (optional)<br />
 <TMPL_ELSE>
 (You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)<br />
 </TMPL_IF>
@@ -16,10 +16,10 @@ Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
 Subject: <TMPL_VAR FIELD-SUBJECT><br />
 <TMPL_VAR FIELD-EDITCONTENT><br />
 <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />
-<TMPL_VAR NAME="FORM-END">
+<TMPL_VAR FORM-END>
 <TMPL_VAR WMD_PREVIEW>
 
-<TMPL_IF NAME="PAGE_PREVIEW">
+<TMPL_IF PAGE_PREVIEW>
 <hr />
 <div class="header">
 <span>Comment preview:</span>
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index b1cf015a2..6d8a902a2 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -7,7 +7,7 @@
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
-<TMPL_IF NAME="PAGE_SELECT">
+<TMPL_IF PAGE_SELECT>
 Page location: <TMPL_VAR FIELD-PAGE>
 Page type: <TMPL_VAR FIELD-TYPE>
 <TMPL_ELSE>
@@ -16,21 +16,21 @@ Page type: <TMPL_VAR FIELD-TYPE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
 <TMPL_VAR FIELD-EDITCONTENT><br />
-<TMPL_IF NAME="CAN_COMMIT">
+<TMPL_IF CAN_COMMIT>
 Optional comment about this change:<br />
 <TMPL_VAR FIELD-COMMENTS><br />
 </TMPL_IF>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
-<TMPL_IF NAME="FIELD-ATTACHMENT">
+<TMPL_IF FIELD-ATTACHMENT>
 <a class="toggle" href="#attachments">Attachments</a>
 <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
 <table>
 <tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
-<TMPL_LOOP NAME="ATTACHMENT_LIST">
+<TMPL_LOOP ATTACHMENT_LIST>
 <tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
 </TMPL_LOOP>
-<TMPL_IF NAME="ATTACHMENT_LIST">
+<TMPL_IF ATTACHMENT_LIST>
 <tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr>
 </TMPL_IF>
 </table>
@@ -39,7 +39,7 @@ Optional comment about this change:<br />
 <TMPL_VAR FORM-END>
 <TMPL_VAR WMD_PREVIEW>
 
-<TMPL_IF NAME="PAGE_PREVIEW">
+<TMPL_IF PAGE_PREVIEW>
 <hr />
 <div class="header">
 <span>Page preview:</span>
diff --git a/templates/feedlink.tmpl b/templates/feedlink.tmpl
index 2963156c1..be8637f0f 100644
--- a/templates/feedlink.tmpl
+++ b/templates/feedlink.tmpl
@@ -1,8 +1,8 @@
 <div id="feedlink">
-<TMPL_IF NAME="RSSURL">
-<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a>
+<TMPL_IF RSSURL>
+<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR RSSURL>">RSS</a>
 </TMPL_IF>
-<TMPL_IF NAME="ATOMURL">
-<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR NAME=ATOMURL>">Atom</a>
+<TMPL_IF ATOMURL>
+<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR ATOMURL>">Atom</a>
 </TMPL_IF>
 </div>
diff --git a/templates/googleform.tmpl b/templates/googleform.tmpl
index f39b46540..9468e062a 100644
--- a/templates/googleform.tmpl
+++ b/templates/googleform.tmpl
@@ -1,3 +1,4 @@
+
 <form method="get" action="http://www.google.com/search" id="searchform">
  <div>
   <input name="sitesearch" value="<TMPL_VAR URL>" type="hidden" />
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 1e0a1674e..b0b53d041 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -1,9 +1,9 @@
 <TMPL_IF HTML5><article class="inlinepage"><TMPL_ELSE><div class="inlinepage"></TMPL_IF>
 
 <TMPL_IF HTML5><section class="inlineheader"><TMPL_ELSE><div class="inlineheader"></TMPL_IF>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 <span class="author">
-<TMPL_IF NAME="AUTHORURL">
+<TMPL_IF AUTHORURL>
 <a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
 <TMPL_VAR AUTHOR>
@@ -11,7 +11,7 @@
 </span>
 </TMPL_IF>
 <TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF>
-<TMPL_IF NAME="PERMALINK">
+<TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
@@ -29,10 +29,10 @@
 Posted <TMPL_VAR CTIME>
 </span>
 
-<TMPL_IF NAME="TAGS">
+<TMPL_IF TAGS>
 <TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF>
 Tags:
-<TMPL_LOOP NAME="TAGS">
+<TMPL_LOOP TAGS>
 <TMPL_VAR LINK>
 </TMPL_LOOP>
 <TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF>
@@ -50,16 +50,16 @@ License: <TMPL_VAR LICENSE>
 </div>
 </TMPL_IF>
 
-<TMPL_IF NAME="HAVE_ACTIONS">
+<TMPL_IF HAVE_ACTIONS>
 <TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
-<TMPL_IF NAME="EDITURL">
+<TMPL_IF EDITURL>
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSLINK">
+<TMPL_IF COMMENTSLINK>
 <li><TMPL_VAR COMMENTSLINK></li>
 <TMPL_ELSE>
-<TMPL_IF NAME="DISCUSSIONLINK">
+<TMPL_IF DISCUSSIONLINK>
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
 </TMPL_IF>
diff --git a/templates/microblog.tmpl b/templates/microblog.tmpl
index 2e84441cc..e22d65cce 100644
--- a/templates/microblog.tmpl
+++ b/templates/microblog.tmpl
@@ -6,9 +6,9 @@
 
 <div class="microblog-header">
 
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 <span class="author">
-<TMPL_IF NAME="AUTHORURL">
+<TMPL_IF AUTHORURL>
 <a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
 <TMPL_VAR AUTHOR>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index eb76cafa6..9242ddfe3 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -6,7 +6,7 @@
 </TMPL_IF>
 <head>
 <TMPL_UNLESS ISPAGE>
-<TMPL_IF NAME="FORCEBASEURL">
+<TMPL_IF FORCEBASEURL>
 <base href="<TMPL_VAR FORCEBASEURL>" />
 <TMPL_ELSE>
 <TMPL_IF BASEURL>
@@ -17,21 +17,21 @@
 <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
 <meta http-equiv="Cache-Control" content="must-revalidate" />
 <title><TMPL_VAR TITLE></title>
-<TMPL_IF NAME="FAVICON">
+<TMPL_IF FAVICON>
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 </TMPL_IF>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
-<TMPL_IF NAME="LOCAL_CSS">
+<TMPL_IF LOCAL_CSS>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
 <TMPL_ELSE>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
 </TMPL_IF>
-<TMPL_IF NAME="EDITURL">
+<TMPL_IF EDITURL>
 <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
 </TMPL_IF>
-<TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
-<TMPL_IF NAME="RELVCS"><TMPL_VAR RELVCS></TMPL_IF>
-<TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
+<TMPL_IF FEEDLINKS><TMPL_VAR FEEDLINKS></TMPL_IF>
+<TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF>
+<TMPL_IF META><TMPL_VAR META></TMPL_IF>
 </head>
 <body>
 
@@ -41,51 +41,51 @@
 <TMPL_IF HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF>
 <span>
 <span class="parentlinks">
-<TMPL_LOOP NAME="PARENTLINKS">
+<TMPL_LOOP PARENTLINKS>
 <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/ 
 </TMPL_LOOP>
 </span>
 <span class="title">
 <TMPL_VAR TITLE>
-<TMPL_IF NAME="ISTRANSLATION">
-&nbsp;(<TMPL_VAR NAME="PERCENTTRANSLATED">%)
+<TMPL_IF ISTRANSLATION>
+&nbsp;(<TMPL_VAR PERCENTTRANSLATED>%)
 </TMPL_IF>
 </span>
 </span>
 <TMPL_IF ISPAGE>
-<TMPL_IF NAME="SEARCHFORM">
+<TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
 </TMPL_IF>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
-<TMPL_IF NAME="HAVE_ACTIONS">
+<TMPL_IF HAVE_ACTIONS>
 <TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
-<TMPL_IF NAME="EDITURL">
+<TMPL_IF EDITURL>
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="RECENTCHANGESURL">
+<TMPL_IF RECENTCHANGESURL>
 <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="HISTORYURL">
+<TMPL_IF HISTORYURL>
 <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="GETSOURCEURL">
+<TMPL_IF GETSOURCEURL>
 <li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="PREFSURL">
+<TMPL_IF PREFSURL>
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="ACTIONS">
-<TMPL_LOOP NAME="ACTIONS">
+<TMPL_IF ACTIONS>
+<TMPL_LOOP ACTIONS>
 <li><TMPL_VAR ACTION></li>
 </TMPL_LOOP>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSLINK">
+<TMPL_IF COMMENTSLINK>
 <li><TMPL_VAR COMMENTSLINK></li>
 <TMPL_ELSE>
-<TMPL_IF NAME="DISCUSSIONLINK">
+<TMPL_IF DISCUSSIONLINK>
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
 </TMPL_IF>
@@ -93,16 +93,16 @@
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF NAME="OTHERLANGUAGES">
+<TMPL_IF OTHERLANGUAGES>
 <TMPL_IF HTML5><nav class="otherlanguages"><TMPL_ELSE><div class="otherlanguages"></TMPL_IF>
 <ul>
-<TMPL_LOOP NAME="OTHERLANGUAGES">
+<TMPL_LOOP OTHERLANGUAGES>
 <li>
-<a href="<TMPL_VAR NAME="URL">"><TMPL_VAR NAME="LANGUAGE"></a>
-<TMPL_IF NAME="MASTER">
+<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
+<TMPL_IF MASTER>
 (master)
 <TMPL_ELSE>
-&nbsp;(<TMPL_VAR NAME="PERCENT">%)
+&nbsp;(<TMPL_VAR PERCENT>%)
 </TMPL_IF>
 </li>
 </TMPL_LOOP>
@@ -139,25 +139,25 @@
 <TMPL_IF ISPAGE>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
-<TMPL_IF NAME="TAGS">
+<TMPL_IF TAGS>
 <TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
 Tags:
-<TMPL_LOOP NAME="TAGS">
+<TMPL_LOOP TAGS>
 <TMPL_VAR LINK>
 </TMPL_LOOP>
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF NAME="BACKLINKS">
+<TMPL_IF BACKLINKS>
 <TMPL_IF HTML5><nav id="backlinks"><TMPL_ELSE><div id="backlinks"></TMPL_IF>
 Links:
-<TMPL_LOOP NAME="BACKLINKS">
+<TMPL_LOOP BACKLINKS>
 <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
 </TMPL_LOOP>
-<TMPL_IF NAME="MORE_BACKLINKS">
+<TMPL_IF MORE_BACKLINKS>
 <span class="popup">...
 <span class="balloon">
-<TMPL_LOOP NAME="MORE_BACKLINKS">
+<TMPL_LOOP MORE_BACKLINKS>
 <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
 </TMPL_LOOP>
 </span>
diff --git a/templates/pocreatepage.tmpl b/templates/pocreatepage.tmpl
index 96c8fdd78..f22ee5092 100644
--- a/templates/pocreatepage.tmpl
+++ b/templates/pocreatepage.tmpl
@@ -1,3 +1,3 @@
 <p>
-<b>WARNING</b> this page must be written in <TMPL_VAR NAME="LANG">.
-</p>
-\ No newline at end of file
+<b>WARNING</b> this page must be written in <TMPL_VAR LANG>.
+</p>
diff --git a/templates/renamesummary.tmpl b/templates/renamesummary.tmpl
index 60f81b35b..7a8dc9229 100644
--- a/templates/renamesummary.tmpl
+++ b/templates/renamesummary.tmpl
@@ -11,14 +11,14 @@
 <TMPL_IF FIXEDLINKS>
 The following pages have been automatically modified to update their links to <TMPL_VAR DEST>:
 <ul>
-<TMPL_LOOP NAME=FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
+<TMPL_LOOP FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
 </ul>
 </TMPL_IF>
 <TMPL_IF BROKENLINKS_CHECKED>
 <TMPL_IF BROKENLINKS>
 The following pages still link to <TMPL_VAR SRC>:
 <ul>
-<TMPL_LOOP NAME=BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
+<TMPL_LOOP BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
 </ul>
 </TMPL_IF>
 </TMPL_IF>
diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 069ae1997..a64a4ebd7 100644
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,29 +1,29 @@
 <item>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 	<title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
 	<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
 <TMPL_ELSE>
 	<title><TMPL_VAR TITLE></title>
 </TMPL_IF>
-<TMPL_IF NAME="GUID">
+<TMPL_IF GUID>
 	<guid isPermaLink="no"><TMPL_VAR GUID></guid>
 <TMPL_ELSE>
 	<guid><TMPL_VAR URL></guid>
 </TMPL_IF>
 	<link><TMPL_VAR PERMALINK></link>
-<TMPL_IF NAME="CATEGORIES">
-<TMPL_LOOP NAME="CATEGORIES">
+<TMPL_IF CATEGORIES>
+<TMPL_LOOP CATEGORIES>
 	<category><TMPL_VAR CATEGORY></category>
 </TMPL_LOOP>
 </TMPL_IF>
 	<pubDate><TMPL_VAR CDATE_822></pubDate>
 	<dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
-<TMPL_IF NAME="ENCLOSURE">
+<TMPL_IF ENCLOSURE>
 	<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
 <TMPL_ELSE>
 	<description><TMPL_VAR CONTENT ESCAPE=HTML></description>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSURL">
-	<comments><TMPL_VAR NAME="COMMENTSURL"></comments>
+<TMPL_IF COMMENTSURL>
+	<comments><TMPL_VAR COMMENTSURL></comments>
 </TMPL_IF>
 </item>
diff --git a/templates/titlepage.tmpl b/templates/titlepage.tmpl
index 8a11e693e..6326bab72 100644
--- a/templates/titlepage.tmpl
+++ b/templates/titlepage.tmpl
@@ -1,5 +1,5 @@
 <p>
-<TMPL_IF NAME="PERMALINK">
+<TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>