diff --git a/src/root/all.tt b/src/root/all.tt
index 65979cc7..931686c7 100644
--- a/src/root/all.tt
+++ b/src/root/all.tt
@@ -9,7 +9,7 @@
 <p>Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %]
 out of [% totalBuilds %] in order of descending timestamp.</p>
 
-[% PROCESS renderBuildList %]
+[% INCLUDE renderBuildList %]
 
 [<a href="[% "$baseUri/1" %]">First</a>]
 [% IF page > 1 %]
diff --git a/src/root/build.tt b/src/root/build.tt
index 38ab2fba..a9628703 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -64,7 +64,7 @@
         [% END %]
       [% ELSIF build.schedulingInfo.busy %]
         <strong>Build in progress</strong>
-        since [% PROCESS renderDateTime timestamp = build.schedulingInfo.starttime %]
+        since [% INCLUDE renderDateTime timestamp = build.schedulingInfo.starttime %]
       [% ELSE %]
         <strong>Scheduled to be built</strong>
         [% IF c.user_exists %]
@@ -77,15 +77,15 @@
   </tr>
   <tr>
     <th>Project:</th>
-    <td>[% PROCESS renderProjectName %]</td>
+    <td>[% INCLUDE renderProjectName %]</td>
   </tr>
   <tr>
     <th>Jobset:</th>
-    <td>[% PROCESS renderJobsetName %]</td>
+    <td>[% INCLUDE renderJobsetName %]</td>
   </tr>
   <tr>
     <th>Job name:</th>
-    <td>[% PROCESS renderJobName %]</td>
+    <td>[% INCLUDE renderJobName %]</td>
   </tr>
   <tr>
     <th>Nix name:</th>
@@ -137,16 +137,16 @@
   </tr>
   <tr>
     <th>Time added:</th>
-    <td>[% PROCESS renderDateTime timestamp = build.timestamp %]</td>
+    <td>[% INCLUDE renderDateTime timestamp = build.timestamp %]</td>
   </tr>
   [% IF build.finished && build.resultInfo.buildstatus != 4 %]
     <tr>
       <th>Build started:</th>
-      <td>[% IF build.resultInfo.starttime %][% PROCESS renderDateTime timestamp = build.resultInfo.starttime %][% ELSE %]<em>(cached build)</em>[% END %]</td>
+      <td>[% IF build.resultInfo.starttime %][% INCLUDE renderDateTime timestamp = build.resultInfo.starttime %][% ELSE %]<em>(cached build)</em>[% END %]</td>
     </tr>
     <tr>
       <th>Build finished:</th>
-      <td>[% IF build.resultInfo.stoptime %][% PROCESS renderDateTime timestamp = build.resultInfo.stoptime %][% ELSE %]<em>(cached build)</em>[% END %]</td>
+      <td>[% IF build.resultInfo.stoptime %][% INCLUDE renderDateTime timestamp = build.resultInfo.stoptime %][% ELSE %]<em>(cached build)</em>[% END %]</td>
     </tr>
     <tr>
       <th>Duration:</th>
@@ -189,7 +189,7 @@
         <td><tt>[% type = input.type; inputTypes.$type %]</tt></td>
         <td>
           [% IF input.type == "build" %]
-            Job [% PROCESS renderFullJobNameOfBuild build=input.dependency %] <a href="[% c.uri_for('/build' input.dependency.id) %]">build [% input.dependency.id %]</a>
+            Job [% INCLUDE renderFullJobNameOfBuild build=input.dependency %] <a href="[% c.uri_for('/build' input.dependency.id) %]">build [% input.dependency.id %]</a>
           [% ELSIF input.type == "string" || input.type == "boolean" %]
             <tt>"[% input.value %]"</tt>
           [% ELSE %]
@@ -282,7 +282,7 @@
   <p class="error">Note: this build is no longer available.</p>
 [% END %]
 
-[% PROCESS renderProductList %]
+[% INCLUDE renderProductList %]
 
 [% END %]
 
@@ -300,10 +300,10 @@
   <tbody>
     [% FOREACH input IN build.dependents -%]
       <tr>
-        <td>Job [% PROCESS renderFullJobNameOfBuild build=input.build %] <a href="[% c.uri_for('/build' input.build.id) %]">build [% input.build.id %]</a></td>
+        <td>Job [% INCLUDE renderFullJobNameOfBuild build=input.build %] <a href="[% c.uri_for('/build' input.build.id) %]">build [% input.build.id %]</a></td>
         <td><tt>[% input.name %]</tt></td>
         <td><tt>[% input.build.system %]</tt></td>
-        <td>[% PROCESS renderDateTime timestamp = input.build.timestamp %]</td>
+        <td>[% INCLUDE renderDateTime timestamp = input.build.timestamp %]</td>
       </tr>
     [% END -%]
   </tbody>
diff --git a/src/root/common.tt b/src/root/common.tt
index 1232ead4..74535dfa 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -32,14 +32,14 @@
 
 [% BLOCK renderFullJobName %]
   <tt>
-  [% PROCESS renderProjectName %]:[% PROCESS renderJobsetName %]:[% PROCESS renderJobName %]
+  [% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %]:[% INCLUDE renderJobName %]
   </a>
 [% END %]
 
 
 [% BLOCK renderFullJobNameOfBuild %]
   <tt>
-  [% PROCESS renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.get_column("job") %]
+  [% INCLUDE renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.get_column("job") %]
   </a>
 [% END %]
 
@@ -86,7 +86,7 @@
             <td>[% build.schedulingInfo.priority %]</td>
           [% END %]
           <td>
-            [% PROCESS renderFullJobNameOfBuild %]
+            [% INCLUDE renderFullJobNameOfBuild %]
           </td>
           <td>[% build.resultInfo.releasename ? build.resultInfo.releasename : build.nixname %]</td>
           <td><tt>[% build.system %]</tt></td>
diff --git a/src/root/index.tt b/src/root/index.tt
index 44ff308e..c2b2f4a6 100644
--- a/src/root/index.tt
+++ b/src/root/index.tt
@@ -7,7 +7,7 @@
 
 <h2>Statistics</h2>
 
-[% PROCESS showBuildStats %]
+[% INCLUDE showBuildStats %]
 
 
 [% END %]
diff --git a/src/root/jobstatus.tt b/src/root/jobstatus.tt
index bf2f773a..b6a6c060 100644
--- a/src/root/jobstatus.tt
+++ b/src/root/jobstatus.tt
@@ -5,6 +5,6 @@
 
 <p>Below are the latest builds for each job.</p>
 
-[% PROCESS renderBuildList builds=latestBuilds %]
+[% INCLUDE renderBuildList builds=latestBuilds %]
 
 [% END %]
diff --git a/src/root/layout.tt b/src/root/layout.tt
index c9240055..7509a29d 100644
--- a/src/root/layout.tt
+++ b/src/root/layout.tt
@@ -146,7 +146,7 @@
         [% content %]
         <div id="footer">
           <hr />
-          Generated on [% PROCESS renderDateTime %].
+          Generated on [% INCLUDE renderDateTime %].
           [% IF c.user_exists %]
           You are logged in as <tt>[% c.user.username %]</tt>.
           [% END %]
diff --git a/src/root/project.tt b/src/root/project.tt
index ea8381c4..0537043d 100644
--- a/src/root/project.tt
+++ b/src/root/project.tt
@@ -97,7 +97,7 @@
         <th>Last checked:</th>
         <td>
           [% IF jobset.lastcheckedtime %]
-            [% PROCESS renderDateTime timestamp = jobset.lastcheckedtime -%][% IF jobset.errormsg -%]<em>, evaluation error</em>:
+            [% INCLUDE renderDateTime timestamp = jobset.lastcheckedtime -%][% IF jobset.errormsg -%]<em>, evaluation error</em>:
               <pre class="multiLineMsg error">[% HTML.escape(jobset.errormsg) %]</pre>
             [% ELSE %], <em>no errors</em>
             [% END %]
@@ -192,7 +192,7 @@
 
 <h2>Statistics</h2>
 
-[% PROCESS showBuildStats %]
+[% INCLUDE showBuildStats %]
 
 [% END %]
 
diff --git a/src/root/queue.tt b/src/root/queue.tt
index a7a46198..86efed27 100644
--- a/src/root/queue.tt
+++ b/src/root/queue.tt
@@ -13,7 +13,7 @@
   currently executing. Builds in <span
   class="disabledBuild">grey</span> are currently disabled.</p>
 
-  [% PROCESS renderBuildList builds=queue showSchedulingInfo=1 hideResultInfo=1 %]
+  [% INCLUDE renderBuildList builds=queue showSchedulingInfo=1 hideResultInfo=1 %]
 
 [% END %]
 
diff --git a/src/root/releases.tt b/src/root/releases.tt
index e13d8a17..bba770d3 100644
--- a/src/root/releases.tt
+++ b/src/root/releases.tt
@@ -17,7 +17,7 @@
       <th>Release</th>
       <th>Date</th>
       [% FOREACH job IN jobs %]
-        <th class="releaseSetJobName">[% PROCESS renderReleaseJobName %]</th>
+        <th class="releaseSetJobName">[% INCLUDE renderReleaseJobName %]</th>
       [% END %]
     </tr>
   </thead>