Index: /branches/release-40/default_templates/category_archive_list.mtml
===================================================================
--- /branches/release-40/default_templates/category_archive_list.mtml (revision 2052)
+++ /branches/release-40/default_templates/category_archive_list.mtml (revision 2604)
@@ -7,9 +7,9 @@
         <ul class="widget-list">
         </mt:SubCatIsFirst>
-        <mt:IfNonZero tag="mt:CategoryCount">
-            <li class="widget-list-item"><a href="<$mt:CategoryArchiveLink$>"<mt:IfNonEmpty tag="mt:CategoryDescription"> title="<$mt:CategoryDescription$>"</mt:IfNonEmpty>><__trans phrase="[_1] ([_2])" params="<$mt:CategoryLabel$>%%<$mt:CategoryCount$>"></a>
+        <mt:If tag="CategoryCount">
+            <li class="widget-list-item"><a href="<$mt:CategoryArchiveLink$>"<mt:If tag="CategoryDescription"> title="<$mt:CategoryDescription$>"</mt:If>><__trans phrase="[_1] ([_2])" params="<$mt:CategoryLabel$>%%<$mt:CategoryCount$>"></a>
         <mt:Else>
             <li class="widget-list-item"><$mt:CategoryLabel$>
-        </mt:IfNonZero>
+        </mt:If>
         <$mt:SubCatsRecurse$>
             </li>
Index: /branches/release-40/default_templates/entry_summary.mtml
===================================================================
--- /branches/release-40/default_templates/entry_summary.mtml (revision 2603)
+++ /branches/release-40/default_templates/entry_summary.mtml (revision 2604)
@@ -5,9 +5,9 @@
         <div class="asset-meta">
             <span class="byline">
-    <mt:IfNonEmpty tag="EntryAuthorDisplayName">
+    <mt:If tag="EntryAuthorDisplayName">
                 <__trans phrase="By [_1] on [_2]" params="<span class="vcard author"><$mt:EntryAuthorLink show_hcard="1"$></span>%%<abbr class="published" title="<$mt:EntryDate format_name="iso8601"$>"><$mt:EntryDate format="%x %X"$></abbr>">
     <mt:Else>
                 <abbr class="published" title="<$mt:EntryDate format_name="iso8601"$>"><$mt:EntryDate format="%x %X"$></abbr>
-    </mt:IfNonEmpty>
+    </mt:If>
             </span>
 <mt:Unless name="hide_counts" eq="1">
@@ -18,9 +18,9 @@
     </div>
     <div class="asset-content entry-content">
-<mt:IfNonEmpty tag="EntryBody">
+<mt:If tag="EntryBody">
         <div class="asset-body">
             <$mt:EntryBody$>
         </div>
-</mt:IfNonEmpty>
+</mt:If>
 <mt:If name="entry_archive">
     <mt:EntryIfTagged>
@@ -33,9 +33,9 @@
     </mt:EntryIfTagged>
 </mt:If>
-<mt:IfNonEmpty tag="EntryMore" convert_breaks="0">
+<mt:If tag="EntryMore" convert_breaks="0">
         <div class="asset-more-link">
             <__trans phrase="Continue reading <a href="[_1]" rel="bookmark">[_2]</a>." params="<$mt:EntryPermalink$>#more%%<$mt:EntryTitle$>">
         </div>
-</mt:IfNonEmpty>
+</mt:If>
     </div>
     <div class="asset-footer"></div>
Index: /branches/release-40/default_templates/comment_response.mtml
===================================================================
--- /branches/release-40/default_templates/comment_response.mtml (revision 2603)
+++ /branches/release-40/default_templates/comment_response.mtml (revision 2604)
@@ -7,13 +7,13 @@
 <mt:If name="comment_confirmation">
     <mt:Ignore><!-- Success message when comment has been submitted --></mt:Ignore>
-    <$mt:SetVar name="page_title" value="<__trans phrase="Confirmation...">"$>
-    <$mt:SetVar name="message" value="<p><__trans phrase="Your comment has been submitted!"></p>"$>
+    <$mt:Var name="page_title" value="<__trans phrase="Confirmation...">"$>
+    <$mt:Var name="message" value="<p><__trans phrase="Your comment has been submitted!"></p>"$>
 <mt:Else name="comment_pending">
     <mt:Ignore><!-- Pending message when comment is being held for review --></mt:Ignore>
-    <$mt:SetVar name="page_title" value="<__trans phrase="Thank you for commenting.">"$>
-    <$mt:SetVar name="message" value="<p><__trans phrase="Your comment has been received and held for approval by the blog owner."></p>"$>
+    <$mt:Var name="page_title" value="<__trans phrase="Thank you for commenting.">"$>
+    <$mt:Var name="message" value="<p><__trans phrase="Your comment has been received and held for approval by the blog owner."></p>"$>
 <mt:Else name="comment_error">
     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
-    <$mt:SetVar name="page_title" value="<__trans phrase="Comment Submission Error">"$>
+    <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
     <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
 </mt:If>
Index: /branches/release-40/default_templates/new-ping.mtml
===================================================================
--- /branches/release-40/default_templates/new-ping.mtml (revision 2603)
+++ /branches/release-40/default_templates/new-ping.mtml (revision 2604)
@@ -12,7 +12,7 @@
   <<$mt:Var name="approve_url"$>>
 </mt:If></mt:If>
-<mt:If name="entry"><mt:IfNonEmpty tag="EntryPermalink"><__trans phrase="View TrackBack">: 
+<mt:If name="entry"><mt:If tag="EntryPermalink"><__trans phrase="View TrackBack">: 
   <<$mt:EntryPermalink$>>
-</mt:IfNonEmpty></mt:If>
+</mt:If></mt:If>
 <mt:If name="state_editable"><__trans phrase="Report TrackBack as spam">: 
   <<$mt:Var name="spam_url"$>>
Index: /branches/release-40/default_templates/syndication.mtml
===================================================================
--- /branches/release-40/default_templates/syndication.mtml (revision 2603)
+++ /branches/release-40/default_templates/syndication.mtml (revision 2604)
@@ -4,7 +4,7 @@
             <li class="blog feed"><img src="<$mt:StaticWebPath$>images/status_icons/feed.gif" alt="<__trans phrase="Subscribe to feed">" width="9" height="9" /> <a href="<$mt:Link template="feed_recent"$>"><__trans phrase="Subscribe to this blog's feed"></a></li>
 <mt:If name="search_results">
-    <mt:IfNonEmpty tag="mt:SearchString">
+    <mt:If tag="SearchString">
             <li class="search-results-feed"><img src="<$mt:StaticWebPath$>images/status_icons/feed.gif" alt="<__trans phrase="Subscribe to feed">" width="9" height="9" /> <a href="<$mt:CGIPath$><$mt:SearchScript$>?<mt:IfTagSearch>tag<mt:Else>search</mt:IfTagSearch>=<$mt:SearchString encode_url="1"$>&amp;Template=feed&amp;IncludeBlogs=<$mt:SearchIncludeBlogs$>&amp;limit=<$mt:SearchMaxResults$>" title="<__trans phrase="Subscribe to feed">"><__trans phrase="Search results matching &ldquo;<$mt:SearchString$>&rdquo;"></a></li>
-    </mt:IfNonEmpty>
+    </mt:If>
 </mt:If>
         </ul>
Index: /branches/release-40/default_templates/recent_comments.mtml
===================================================================
--- /branches/release-40/default_templates/recent_comments.mtml (revision 2450)
+++ /branches/release-40/default_templates/recent_comments.mtml (revision 2604)
@@ -1,3 +1,3 @@
-<mt:IfNonZero tag="mt:BlogCommentCount">
+<mt:If tag="BlogCommentCount">
     <mt:Comments lastn="10" sort_order="descend">
         <mt:CommentsHeader>
@@ -14,3 +14,3 @@
         </mt:CommentsFooter>
     </mt:Comments>
-</mt:IfNonZero>
+</mt:If>
Index: /branches/release-40/default_templates/category_entry_listing.mtml
===================================================================
--- /branches/release-40/default_templates/category_entry_listing.mtml (revision 2603)
+++ /branches/release-40/default_templates/category_entry_listing.mtml (revision 2604)
@@ -37,5 +37,5 @@
 
 <mt:Ignore><!-- Limit number of entries to the number set in Blog Entry Settings --></mt:Ignore>
-<mt:Unless name="datebased_archive"><$mt:SetVar name="limit" value="auto"$></mt:Unless>
+<mt:Unless name="datebased_archive"><$mt:Var name="limit" value="auto"$></mt:Unless>
 <mt:Entries limit="$limit">
                             <mt:Ignore><!-- Use the Entry Summary module for each entry published on this page --></mt:Ignore>
Index: /branches/release-40/default_templates/entry.mtml
===================================================================
--- /branches/release-40/default_templates/entry.mtml (revision 2603)
+++ /branches/release-40/default_templates/entry.mtml (revision 2604)
@@ -30,9 +30,9 @@
                                     <div class="asset-meta">
                                         <span class="byline">
-<mt:IfNonEmpty tag="EntryAuthorDisplayName">
+<mt:If tag="EntryAuthorDisplayName">
                                             <__trans phrase="By [_1] on [_2]" params="<span class="vcard author"><$mt:EntryAuthorLink show_hcard="1"$></span>%%<abbr class="published" title="<$mt:EntryDate format_name="iso8601"$>"><$mt:EntryDate format="%x %X"$></abbr>">
 <mt:Else>
                                             <abbr class="published" title="<$mt:EntryDate format_name="iso8601"$>"><$mt:EntryDate format="%x %X"$></abbr>
-</mt:IfNonEmpty>
+</mt:If>
                                         </span>
 <mt:IfCommentsActive>
@@ -45,18 +45,18 @@
                                 </div>
                                 <div class="asset-content entry-content">
-<mt:IfNonEmpty tag="EntryBody">
+<mt:If tag="EntryBody">
                                     <div class="asset-body">
                                         <$mt:EntryBody$>
                                     </div>
-</mt:IfNonEmpty>
-<mt:IfNonEmpty tag="EntryMore" convert_breaks="0">
+</mt:If>
+<mt:If tag="EntryMore" convert_breaks="0">
                                     <div id="more" class="asset-more">
                                         <$mt:EntryMore$>
                                     </div>
-</mt:IfNonEmpty>
+</mt:If>
                                 </div>
                                 <div class="asset-footer">
 <mt:IfArchiveTypeEnabled archive_type="Category">
-    <mt:If tag="MTEntryCategories">
+    <mt:If tag="EntryCategories">
                                     <div class="entry-categories">
                                         <h4 class="entry-categories-header"><__trans phrase="Categories"><span class="delimiter">:</span></h4>
Index: /branches/release-40/default_templates/feed_recent.mtml
===================================================================
--- /branches/release-40/default_templates/feed_recent.mtml (revision 2603)
+++ /branches/release-40/default_templates/feed_recent.mtml (revision 2604)
@@ -6,5 +6,5 @@
     <id>tag:<$mt:BlogHost exclude_port="1" encode_xml="1"$>,<$mt:TemplateCreatedOn format="%Y-%m-%d"$>:<$mt:BlogRelativeURL encode_xml="1"$>/<$mt:BlogID$></id>
     <updated><mt:Entries lastn="1"><$mt:EntryModifiedDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$></mt:Entries></updated>
-    <mt:IfNonEmpty tag="MTBlogDescription"><subtitle><$mt:BlogDescription remove_html="1" encode_xml="1"$></subtitle></mt:IfNonEmpty>
+    <mt:If tag="BlogDescription"><subtitle><$mt:BlogDescription remove_html="1" encode_xml="1"$></subtitle></mt:If>
     <generator uri="http://www.sixapart.com/movabletype/"><$mt:ProductName version="1"$></generator>
 <mt:Entries lastn="15">
@@ -20,5 +20,5 @@
     <author>
         <name><$mt:EntryAuthorDisplayName encode_xml="1"$></name>
-        <mt:IfNonEmpty tag="MTEntryAuthorURL"><uri><$mt:EntryAuthorURL encode_xml="1"$></uri></mt:IfNonEmpty>
+        <mt:If tag="EntryAuthorURL"><uri><$mt:EntryAuthorURL encode_xml="1"$></uri></mt:If>
     </author>
     <mt:EntryCategories>
Index: /branches/release-40/default_templates/archive_index.mtml
===================================================================
--- /branches/release-40/default_templates/archive_index.mtml (revision 2603)
+++ /branches/release-40/default_templates/archive_index.mtml (revision 2604)
@@ -55,9 +55,9 @@
                                     <ul class="archive-list">
         </mt:SubCatIsFirst>
-        <mt:IfNonZero tag="MTCategoryCount">
+        <mt:If tag="CategoryCount">
                                         <li class="archive-list-item"><a href="<$mt:CategoryArchiveLink$>" title="<$mt:CategoryDescription$>"><$mt:CategoryLabel$></a>
         <mt:Else>
                                         <li class="archive-list-item"><$mt:CategoryLabel$>
-        </mt:IfNonZero>
+        </mt:If>
         <$mt:SubCatsRecurse$>
                                         </li>
Index: /branches/release-40/default_templates/recent_entries.mtml
===================================================================
--- /branches/release-40/default_templates/recent_entries.mtml (revision 2052)
+++ /branches/release-40/default_templates/recent_entries.mtml (revision 2604)
@@ -1,3 +1,3 @@
-<mt:IfNonZero tag="BlogEntryCount">
+<mt:If tag="BlogEntryCount">
     <mt:Entries lastn="10">
         <mt:EntriesHeader>
@@ -14,3 +14,3 @@
         </mt:EntriesFooter>
     </mt:Entries>
-</mt:IfNonZero>
+</mt:If>
Index: /branches/release-40/default_templates/recent_assets.mtml
===================================================================
--- /branches/release-40/default_templates/recent_assets.mtml (revision 2052)
+++ /branches/release-40/default_templates/recent_assets.mtml (revision 2604)
@@ -1,3 +1,3 @@
-<mt:IfNonZero tag="AssetCount">
+<mt:If tag="AssetCount">
     <mt:Assets type="image" lastn="10">
         <mt:AssetsHeader>
@@ -14,3 +14,3 @@
         </mt:AssetsFooter>
     </mt:Assets>
-</mt:IfNonZero>
+</mt:If>
Index: /branches/release-40/default_templates/monthly_entry_listing.mtml
===================================================================
--- /branches/release-40/default_templates/monthly_entry_listing.mtml (revision 2603)
+++ /branches/release-40/default_templates/monthly_entry_listing.mtml (revision 2604)
@@ -33,5 +33,5 @@
 
 <mt:Ignore><!-- Limit number of entries to the number set in Blog Entry Settings --></mt:Ignore>
-<mt:Unless name="datebased_archive"><$mt:SetVar name="limit" value="auto"$></mt:Unless>
+<mt:Unless name="datebased_archive"><$mt:Var name="limit" value="auto"$></mt:Unless>
 <mt:Entries limit="$limit">
                             <mt:Ignore><!-- Use the Entry Summary module for each entry published on this page --></mt:Ignore>
Index: /branches/release-40/default_templates/commenter_confirm.mtml
===================================================================
--- /branches/release-40/default_templates/commenter_confirm.mtml (revision 2603)
+++ /branches/release-40/default_templates/commenter_confirm.mtml (revision 2604)
@@ -12,5 +12,5 @@
 
 <__trans phrase="Sincerely,">
-<mt:IfNonEmpty tag="AuthorDisplayName"><$mt:AuthorDisplayName$><mt:Else>Movable Type</mt:IfNonEmpty>
+<mt:If tag="AuthorDisplayName"><$mt:AuthorDisplayName$><mt:Else>Movable Type</mt:If>
 
 <$mt:Include module="<__trans phrase="Mail Footer">"$>