diff --git a/webtools/PLIF/output/http/error b/webtools/PLIF/output/http/error
index 511c7ef11502..78ebe51efa94 100644
--- a/webtools/PLIF/output/http/error
+++ b/webtools/PLIF/output/http/error
@@ -5,7 +5,7 @@ COSES
 
 <set variable="title" value="Internal Error">
 <set variable="response" value="500 Server Error">
-  <include href="template.html.header"/>
+  <include href="template.header"/>
 </set></set>
 
 <![CDATA[
@@ -17,6 +17,6 @@ below:</p>
 <pre>]]><text escape="html" value="(error)"/><![CDATA[</pre>
 ]]>
 
-<include href="template.html.footer"/>
+<include href="template.footer"/>
 
 </text>
\ No newline at end of file
diff --git a/webtools/PLIF/output/http/login.accessDenied b/webtools/PLIF/output/http/login.accessDenied
index 346f1dd70a0f..764fffd3a944 100644
--- a/webtools/PLIF/output/http/login.accessDenied
+++ b/webtools/PLIF/output/http/login.accessDenied
@@ -5,7 +5,7 @@ COSES
 
 <set variable="title" value="Access Denied">
 <set variable="response" value="403 Access Denied">
-  <include href="template.html.header"/>
+  <include href="template.header"/>
 </set></set>
 
 <text><![CDATA[
@@ -15,5 +15,5 @@ COSES
   </p>
 ]]></text>
 
-<include href="template.html.footer"/>
+<include href="template.footer"/>
 </text>
\ No newline at end of file
diff --git a/webtools/PLIF/output/http/login.detailsSent b/webtools/PLIF/output/http/login.detailsSent
index 211361a230bb..3c273714040f 100644
--- a/webtools/PLIF/output/http/login.detailsSent
+++ b/webtools/PLIF/output/http/login.detailsSent
@@ -1,7 +1,7 @@
 TemplateToolkit
 1
 
-[% INCLUDE template.html.header title = 'Details Sent' -%]
+[% INCLUDE template.header title = 'Details Sent' -%]
 
   <p>Your password has been sent.</p>
 
@@ -18,4 +18,4 @@ TemplateToolkit
   <p><a href="?">Return to index.</a></p>
   [% END %]
 
-[% INCLUDE template.html.footer %]
+[% INCLUDE template.footer %]
diff --git a/webtools/PLIF/output/http/login.failed b/webtools/PLIF/output/http/login.failed
index e2abec6ba1a1..fa21af6b891c 100644
--- a/webtools/PLIF/output/http/login.failed
+++ b/webtools/PLIF/output/http/login.failed
@@ -1,7 +1,7 @@
 TemplateToolkit
 1
 
-[% INCLUDE template.html.header
+[% INCLUDE template.header
     title = 'Login'
     response = '401 Authentication Required'
     headers = "WWW-Authenticate: Basic realm=\"$app.name\""
@@ -16,9 +16,9 @@ TemplateToolkit
    contact:</p>
 
    <p>
-    [%- INCLUDE template.html.login.form buttonLabel = 'Get Password' %]
+    [%- INCLUDE template.login.form buttonLabel = 'Get Password' %]
     <input type="hidden" name="loginPendingCommands" value="[% pendingCommands | html %]">
    </p>
   </form>
 
-[% INCLUDE template.html.footer %]
+[% INCLUDE template.footer %]
diff --git a/webtools/PLIF/output/http/login.requestAccount b/webtools/PLIF/output/http/login.requestAccount
index 24958710a204..ff9a7afa800c 100644
--- a/webtools/PLIF/output/http/login.requestAccount
+++ b/webtools/PLIF/output/http/login.requestAccount
@@ -1,15 +1,15 @@
 TemplateToolkit
 1
 
-[% INCLUDE template.html.header title = 'Create Account' -%]
+[% INCLUDE template.header title = 'Create Account' -%]
 
   <form action="" method="GET"> <!-- XXX POST -->
    <p>To create a new account fill in your e-mail address or other
    means of contact in the form below and hit the submit button:</p>
 
    <p>
-    [%- INCLUDE template.html.login.form buttonLabel = 'Submit' %]
+    [%- INCLUDE template.login.form buttonLabel = 'Submit' %]
    </p>
   </form>
 
-[% INCLUDE template.html.footer %]
+[% INCLUDE template.footer %]
diff --git a/webtools/PLIF/output/http/userPrefs.index b/webtools/PLIF/output/http/userPrefs.index
index 736cfe7d05c8..15d47fb9d4a9 100644
--- a/webtools/PLIF/output/http/userPrefs.index
+++ b/webtools/PLIF/output/http/userPrefs.index
@@ -1,7 +1,7 @@
 TemplateToolkit
 1
 
-[% INCLUDE template.html.header
+[% INCLUDE template.header
    title = 'User Preferences' -%]
 
   <form action="?" method="GET">
@@ -109,4 +109,4 @@ TemplateToolkit
 
   </form>
 
-[% INCLUDE template.html.footer %]
+[% INCLUDE template.footer %]
diff --git a/webtools/PLIF/output/http/userPrefs.notification b/webtools/PLIF/output/http/userPrefs.notification
index f20fa03d742e..a0ba9208cd70 100644
--- a/webtools/PLIF/output/http/userPrefs.notification
+++ b/webtools/PLIF/output/http/userPrefs.notification
@@ -1,7 +1,7 @@
 TemplateToolkit
 1
 
-[% INCLUDE template.html.header
+[% INCLUDE template.header
    title = 'User Preferences: Notes'
 %]
 
@@ -11,4 +11,4 @@ TemplateToolkit
 
 [% END %]
 
-[% INCLUDE template.html.footer %]
+[% INCLUDE template.footer %]
diff --git a/webtools/PLIF/output/http/userPrefs.success b/webtools/PLIF/output/http/userPrefs.success
index 7fe3d556b9ad..92decdf7395d 100644
--- a/webtools/PLIF/output/http/userPrefs.success
+++ b/webtools/PLIF/output/http/userPrefs.success
@@ -1,9 +1,9 @@
 TemplateToolkit
 1
 
-[% INCLUDE template.html.header title = 'User Preferences Saved' -%]
+[% INCLUDE template.header title = 'User Preferences Saved' -%]
 
   <p>The changes have been saved.</p>
   <p><a href="?">Return to index.</a></p>
 
-[% INCLUDE template.html.footer %]
+[% INCLUDE template.footer %]