diff --git a/templates/BreadcrumbsTemplate.ss b/templates/BreadcrumbsTemplate.ss
index d18be08c..b4314d31 100644
--- a/templates/BreadcrumbsTemplate.ss
+++ b/templates/BreadcrumbsTemplate.ss
@@ -1,5 +1,5 @@
 <% if Pages %>
-	<% control Pages %>
+	<% loop Pages %>
 		<% if Last %>$Title.XML<% else %><a href="$Link">$MenuTitle.XML</a> &raquo;<% end_if %>
-	<% end_control %>
+	<% end_loop %>
 <% end_if %>
\ No newline at end of file
diff --git a/templates/CMSPageHistoryController_versions.ss b/templates/CMSPageHistoryController_versions.ss
index c6d9117c..b69f7935 100755
--- a/templates/CMSPageHistoryController_versions.ss
+++ b/templates/CMSPageHistoryController_versions.ss
@@ -9,15 +9,15 @@
 	</thead>
 	
 	<tbody>
-		<% control Versions %>
+		<% loop Versions %>
 		<tr id="page-$RecordID-version-$Version" class="$EvenOdd $PublishedClass<% if not WasPublished %><% if not Active %> ui-helper-hidden<% end_if %><% end_if %><% if Active %> active<% end_if %>" data-published="<% if WasPublished %>true<% else %>false<% end_if %>">
 			<td class="ui-helper-hidden"><input type="checkbox" name="Versions[]" id="cms-version-{$Version}" value="$Version"<% if Active %> checked="checked"<% end_if %> /></td>
-			<% control LastEdited %>
+			<% with LastEdited %>
 				<td class="last-edited first-column" title="$Ago - $Nice">$Nice</td>
-			<% end_control %>
+			<% end_with %>
 			<td><% if Author %>$Author.FirstName $Author.Surname.Initial<% else %><% _t('UNKNOWN','Unknown') %><% end_if %></td>
 			<td class="last-column"><% if Published %><% if Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><% _t('UNKNOWN','Unknown') %><% end_if %><% else %><% _t('NOTPUBLISHED','Not published') %><% end_if %></td>			
 		</tr>
-		<% end_control %>
+		<% end_loop %>
 	</tbody>
 </table>
\ No newline at end of file
diff --git a/templates/Includes/AssetAdmin_Content.ss b/templates/Includes/AssetAdmin_Content.ss
index efdb6aab..c4d6fb1b 100644
--- a/templates/Includes/AssetAdmin_Content.ss
+++ b/templates/Includes/AssetAdmin_Content.ss
@@ -2,27 +2,27 @@
 
 	<div class="cms-content-header north">
 		<div>
-			<% control EditForm %>
+			<% with EditForm %>
 				<% include BackLink_Button %>
 
 				<h2 id="page-title-heading">
-				<% control Controller %>
+				<% with Controller %>
 					<% include CMSSectionIcon %>
 					<% include CMSBreadcrumbs %>
-				<% end_control %>
+				<% end_with %>
 				</h2>
 				<% if Fields.hasTabset %>
 					<% with Fields.fieldByName('Root') %>
 					<div class="cms-content-header-tabs">
 						<ul>
-						<% control Tabs %>
+						<% loop Tabs %>
 							<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
-						<% end_control %>
+						<% end_loop %>
 						</ul>
 					</div>
 					<% end_with %>
 				<% end_if %>
-			<% end_control %>
+			<% end_with %>
 		
 		</div>
 	</div>
diff --git a/templates/Includes/AssetAdmin_EditForm.ss b/templates/Includes/AssetAdmin_EditForm.ss
index e72225d4..7f4c0432 100644
--- a/templates/Includes/AssetAdmin_EditForm.ss
+++ b/templates/Includes/AssetAdmin_EditForm.ss
@@ -8,17 +8,17 @@
 
 	<fieldset>
 		<% if Legend %><legend>$Legend</legend><% end_if %> 
-		<% control Fields %>
+		<% loop Fields %>
 			$FieldHolder
-		<% end_control %>
+		<% end_loop %>
 		<div class="clear"><!-- --></div>
 	</fieldset>
 
 	<% if Actions %>
 	<div class="Actions">
-		<% control Actions %>
+		<% loop Actions %>
 			$Field
-		<% end_control %>
+		<% end_loop %>
 		<% if CurrentPage.LinkPreview %>
 		<a href="$CurrentPage.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
 			<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
diff --git a/templates/Includes/CMSMain_EditForm.ss b/templates/Includes/CMSMain_EditForm.ss
index bfebbe1f..0d6d7c2f 100644
--- a/templates/Includes/CMSMain_EditForm.ss
+++ b/templates/Includes/CMSMain_EditForm.ss
@@ -9,9 +9,9 @@
 
 		<fieldset>
 			<% if Legend %><legend>$Legend</legend><% end_if %> 
-			<% control Fields %>
+			<% loop Fields %>
 				$FieldHolder
-			<% end_control %>
+			<% end_loop %>
 			<div class="clear"><!-- --></div>
 		</fieldset>
 	</div>
@@ -19,9 +19,9 @@
 	<div class="cms-content-actions south">
 		<% if Actions %>
 		<div class="Actions">
-			<% control Actions %>
+			<% loop Actions %>
 				$Field
-			<% end_control %>
+			<% end_loop %>
 			<% if Controller.LinkPreview %>
 			<a href="$Controller.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
 				<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
diff --git a/templates/Includes/CMSPageAddController_Content.ss b/templates/Includes/CMSPageAddController_Content.ss
index 11229faa..09e9560a 100644
--- a/templates/Includes/CMSPageAddController_Content.ss
+++ b/templates/Includes/CMSPageAddController_Content.ss
@@ -17,18 +17,18 @@
 
 			<fieldset>
 				<% if Legend %><legend>$Legend</legend><% end_if %> 
-				<% control Fields %>
+				<% loop Fields %>
 					$FieldHolder
-				<% end_control %>
+				<% end_loop %>
 			</fieldset>
 		</div>
 
 		<div class="cms-content-actions south">
 			<% if Actions %>
 			<div class="Actions">
-				<% control Actions %>
+				<% loop Actions %>
 					$Field
-				<% end_control %>
+				<% end_loop %>
 			</div>
 			<% end_if %>
 		</div>
diff --git a/templates/Includes/Install_deleteinstallfiles.ss b/templates/Includes/Install_deleteinstallfiles.ss
index cd1a7574..60a57244 100644
--- a/templates/Includes/Install_deleteinstallfiles.ss
+++ b/templates/Includes/Install_deleteinstallfiles.ss
@@ -4,9 +4,9 @@
 	</p>
 
 	<ul>
-		<% control UnsuccessfulFiles %>
+		<% loop UnsuccessfulFiles %>
 		<li>$File</li>
-		<% end_control %>
+		<% end_loop %>
 	</ul>
 <% else %>
 	<p style="margin: 1em 0">
diff --git a/templates/Includes/ReportAdmin_Content.ss b/templates/Includes/ReportAdmin_Content.ss
index f71516c3..04ff5800 100644
--- a/templates/Includes/ReportAdmin_Content.ss
+++ b/templates/Includes/ReportAdmin_Content.ss
@@ -2,16 +2,16 @@
 
 	<div class="cms-content-header north">
 		<div>
-			<% control EditForm %>
+			<% with EditForm %>
 				<% include BackLink_Button %>
 
 				<h2 id="page-title-heading">
-				<% control Controller %>
+				<% with Controller %>
 					<% include CMSSectionIcon %>
 					<% include CMSBreadcrumbs %>
-				<% end_control %>
+				<% end_with %>
 				</h2>
-			<% end_control %>
+			<% end_with %>
 		
 		</div>
 	</div>
diff --git a/templates/ReportAdminForm.ss b/templates/ReportAdminForm.ss
index 0466d91a..bc8e262b 100644
--- a/templates/ReportAdminForm.ss
+++ b/templates/ReportAdminForm.ss
@@ -13,11 +13,11 @@
 				<h4><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></h4>
 			
 				<div class="filters">
-					<% control FieldMap.Filters %>
-						<% control Children %>
+					<% loop FieldMap.Filters %>
+						<% loop Children %>
 							$FieldHolder
-						<% end_control %>
-					<% end_control %>
+						<% end_loop %>
+					<% end_loop %>
 				</div>
 			
 				<div id="action_updatereport">
@@ -31,7 +31,7 @@
 			
 			$FieldMap.ReportContent.FieldHolder
 			
-			<% control HiddenFields %>$Field<% end_control %>
+			<% loop HiddenFields %>$Field<% end_loop %>
 			
 			</fieldset>
 		</div>
diff --git a/templates/SSReportTableField_printable.ss b/templates/SSReportTableField_printable.ss
index 854fac0f..ca000527 100644
--- a/templates/SSReportTableField_printable.ss
+++ b/templates/SSReportTableField_printable.ss
@@ -8,19 +8,19 @@
 
 <%-- <body onload="window.print();"> --%>
 <body>
-	<% control Form.Controller %>
+	<% with Form.Controller %>
 		<h1 style="margin-bottom: 0">$CurrentReport.Title</h1>
-		<% control CurrentReport.getCmsFields %>
+		<% with CurrentReport.getCmsFields %>
 			<% if Name == Filters %>
 				<h2 style="margin-bottom: 0; margin-top: 0;">Filters</h2>
 				<ul style="margin-top: 0">
-				<% control FieldSet %>
+				<% loop FieldSet %>
 					<li>$Title = $performReadonlyTransformation.Field</li>
-				<% end_control %>
+				<% end_loop %>
 				</ul>
 			<% end_if %>
-		<% end_control %>
-	<% end_control %>
+		<% end_with %>
+	<% end_with %>
 	<% include TableListField %>
 </body>
 </html>
\ No newline at end of file