diff --git a/templates/Layout/BlogEntry.ss b/templates/Layout/BlogEntry.ss
index 4ebc3bb..938a577 100644
--- a/templates/Layout/BlogEntry.ss
+++ b/templates/Layout/BlogEntry.ss
@@ -8,9 +8,9 @@
 		<% if TagsCollection %>
 			<p class="tags">
 				 <% _t('TAGS', 'Tags:') %> 
-				<% control TagsCollection %>
+				<% loop TagsCollection %>
 					<a href="$Link" title="<% _t('VIEWALLPOSTTAGGED', 'View all posts tagged') %> '$Tag'" rel="tag">$Tag</a><% if not Last %>,<% end_if %>
-				<% end_control %>
+				<% end_loop %>
 			</p>
 		<% end_if %>		
 		$Content		
diff --git a/templates/Layout/BlogTree.ss b/templates/Layout/BlogTree.ss
index 528cd3c..4861a04 100644
--- a/templates/Layout/BlogTree.ss
+++ b/templates/Layout/BlogTree.ss
@@ -13,9 +13,9 @@
 	<% end_if %>
 	
 	<% if BlogEntries %>
-		<% control BlogEntries %>
+		<% loop BlogEntries %>
 			<% include BlogSummary %>
-		<% end_control %>
+		<% end_loop %>
 	<% else %>
 		<h2><% _t('NOENTRIES', 'There are no blog entries') %></h2>
 	<% end_if %>