diff --git a/templates/BreadcrumbsTemplate.ss b/templates/BreadcrumbsTemplate.ss
index ae321f13..b0449e24 100644
--- a/templates/BreadcrumbsTemplate.ss
+++ b/templates/BreadcrumbsTemplate.ss
@@ -7,7 +7,7 @@
                 </a>
             </li>
             <% loop $Pages %>
-                <% if $Last %>
+                <% if $IsLast %>
                     <li class="breadcrumb-item active">$MenuTitle.XML</li>
                 <% else %>
                     <li class="breadcrumb-item"><a href="$Link">$MenuTitle.XML</a></li>
diff --git a/templates/CommentsInterface.ss b/templates/CommentsInterface.ss
index 24073895..531fce90 100644
--- a/templates/CommentsInterface.ss
+++ b/templates/CommentsInterface.ss
@@ -25,7 +25,7 @@
             <% if $PagedComments %>
                 <ul class="comments-list list-unstyled root-level">
                     <% loop $PagedComments %>
-                        <li class="comment $EvenOdd<% if FirstLast %> $FirstLast <% end_if %> $SpamClass">
+                        <li class="comment $EvenOdd<% if $FirstLast %> $FirstLast <% end_if %> $SpamClass">
                             <% include CommentsInterface_singlecomment %>
                         </li>
                     <% end_loop %>
diff --git a/templates/Includes/BlogPostMeta.ss b/templates/Includes/BlogPostMeta.ss
index fe5560d3..19858050 100644
--- a/templates/Includes/BlogPostMeta.ss
+++ b/templates/Includes/BlogPostMeta.ss
@@ -1,6 +1,6 @@
 <p class="meta-info" itemscope itemtype="http://schema.org/BlogPosting">
     <% if $Credits %>
-        <% loop $Credits %><% if not $First && not $Last %>, <% end_if %><% if not $First && $Last %><% if $TotalItems > '2' %>,<% end_if %> <%t BlogPostMeta_ss.AND "and" %> <% end_if %><% if $URLSegment %><a href="$URL">$Name.XML</a><% else %>$Name.XML<% end_if %><% end_loop %>
+        <% loop $Credits %><% if not $IsFirst && not $IsLast %>, <% end_if %><% if not $IsFirst && $IsLast %><% if $TotalItems > '2' %>,<% end_if %> <%t BlogPostMeta_ss.AND "and" %> <% end_if %><% if $URLSegment %><a href="$URL">$Name.XML</a><% else %>$Name.XML<% end_if %><% end_loop %>
     <% end_if %>
 
     <% if $PublishDate %>
diff --git a/templates/Includes/CommentReplies.ss b/templates/Includes/CommentReplies.ss
index 2908200b..cb6e933a 100644
--- a/templates/Includes/CommentReplies.ss
+++ b/templates/Includes/CommentReplies.ss
@@ -9,7 +9,7 @@
             <% if $Replies %>
                 <ul class="comments-list level-{$Depth} list-unstyled">
                     <% loop $Replies %>
-                        <li class="comment $EvenOdd<% if FirstLast %> $FirstLast <% end_if %> $SpamClass">
+                        <li class="comment $EvenOdd<% if $FirstLast %> $FirstLast <% end_if %> $SpamClass">
                             <% include CommentsInterface_singlecomment %>
                         </li>
                     <% end_loop %>
diff --git a/templates/SilverStripe/Blog/Includes/EntryMeta.ss b/templates/SilverStripe/Blog/Includes/EntryMeta.ss
index 513f1e7a..42d3fc4a 100644
--- a/templates/SilverStripe/Blog/Includes/EntryMeta.ss
+++ b/templates/SilverStripe/Blog/Includes/EntryMeta.ss
@@ -3,14 +3,14 @@
     <% if $Categories.exists %>
         <%t Blog.PostedIn "Posted in" %>
         <% loop $Categories %>
-            <a href="$Link" title="$Title">$Title</a><% if not Last %>, <% end_if %>
+            <a href="$Link" title="$Title">$Title</a><% if not $IsLast %>, <% end_if %>
         <% end_loop %>
     <% end_if %>
     <% if $Categories && $Tags %><br /><% end_if %>
     <% if $Tags.exists %>
         <%t Blog.Tagged "Tagged" %>
         <% loop $Tags %>
-            <a href="$Link" title="$Title">$Title</a><% if not Last %>, <% end_if %>
+            <a href="$Link" title="$Title">$Title</a><% if not $IsLast %>, <% end_if %>
         <% end_loop %>
     <% end_if %>
 </p>
@@ -20,7 +20,7 @@
 
     <% if $Credits %>
         <%t Blog.By "by" %>
-        <% loop $Credits %><% if not $First && not $Last %>, <% end_if %><% if not $First && $Last %> <%t Blog.AND "and" %> <% end_if %><% if $URLSegment %><a href="$URL">$Name.XML</a><% else %>$Name.XML<% end_if %><% end_loop %>
+        <% loop $Credits %><% if not $IsFirst && not $IsLast %>, <% end_if %><% if not $IsFirst && $IsLast %> <%t Blog.AND "and" %> <% end_if %><% if $URLSegment %><a href="$URL">$Name.XML</a><% else %>$Name.XML<% end_if %><% end_loop %>
     <% end_if %>
 
     <% if $Comments.exists %>
diff --git a/templates/SilverStripe/UserForms/Form/Includes/UserFormProgress.ss b/templates/SilverStripe/UserForms/Form/Includes/UserFormProgress.ss
index 008bd098..f1439416 100644
--- a/templates/SilverStripe/UserForms/Form/Includes/UserFormProgress.ss
+++ b/templates/SilverStripe/UserForms/Form/Includes/UserFormProgress.ss
@@ -7,7 +7,7 @@
         <nav aria-hidden="true">
             <ul class="step-buttons mt-4">
                 <% loop $Steps %>
-                <li class="step-button-wrapper<% if $First %> current<% end_if %>" data-for="$Name">
+                <li class="step-button-wrapper<% if $IsFirst %> current<% end_if %>" data-for="$Name">
                     <%-- Remove js-align class to remove javascript positioning --%>
                     <button class="btn btn-secondary rounded btn-md step-button-jump js-align" disabled="disabled" data-step="$Pos"><% if $Top.ButtonText %>$Top.ButtonText <% end_if %>$Pos</button>
                 </li>