diff --git a/resources/templates/html_export_default.tmpl b/resources/templates/html_export_default.tmpl
index c3ed921255..7aac247e59 100644
--- a/resources/templates/html_export_default.tmpl
+++ b/resources/templates/html_export_default.tmpl
@@ -14,16 +14,16 @@ ${head_content}$
   ${for title in meta.titles():}$
     ${if pos1:}$
     <h1>
-      <a href="${tocUrl}$">${print title}$</a>
+      <a href="${tocUrl}$">${print(title)}$</a>
     </h1>
     ${:else:}$
-    <div class="calibreMetaSubtitle">${print title}$</div>
+    <div class="calibreMetaSubtitle">${print(title)}$</div>
     ${:endif}$
     ${pos1=0}$
   ${:endfor}$
   </div>
   <div class="calibreMetaAuthor">
-    ${print ', '.join(meta.creators())}$
+    ${print(', '.join(meta.creators()))}$
   </div>
 </div>
 
@@ -33,13 +33,13 @@ ${head_content}$
     ${if prevLink or nextLink:}$
       <div class="calibreEbNavTop">
         ${if prevLink:}$
-          <a href="${prevLink}$" class="calibreAPrev">${print _('previous page'),}$</a>
+          <a href="${prevLink}$" class="calibreAPrev">${print(_('previous page'))}$</a>
         ${:else:}$
-          <a href="${tocUrl}$" class="calibreAPrev">${print _('previous page'),}$</a>
+          <a href="${tocUrl}$" class="calibreAPrev">${print(_('previous page'))}$</a>
         ${:endif}$
 
         ${if nextLink:}$
-          <a href="${nextLink}$" class="calibreANext">${print _('next page'),}$</a>
+          <a href="${nextLink}$" class="calibreANext">${print(_('next page'))}$</a>
         ${:endif}$
       </div>
     ${:endif}$
@@ -49,22 +49,22 @@ ${head_content}$
 
   ${if has_toc:}$
   <div class="calibreToc">
-    <h2><a href="${tocUrl}$">${print _('Table of contents'),}$</a></h2>
-    ${print toc()}$
+    <h2><a href="${tocUrl}$">${print( _('Table of contents'))}$</a></h2>
+    ${print(toc())}$
   </div>
   ${:endif}$
 
   <div class="calibreEbNav">
     ${if prevLink:}$
-      <a href="${prevLink}$" class="calibreAPrev">${print _('previous page'),}$</a>
+      <a href="${prevLink}$" class="calibreAPrev">${print(_('previous page'))}$</a>
     ${:else:}$
-      <a href="${tocUrl}$" class="calibreAPrev">${print _('previous page'),}$</a>
+      <a href="${tocUrl}$" class="calibreAPrev">${print(_('previous page'))}$</a>
     ${:endif}$
 
-    <a href="${tocUrl}$" class="calibreAHome">${print _('start'),}$</a>
+    <a href="${tocUrl}$" class="calibreAHome">${print(_('start'))}$</a>
 
     ${if nextLink:}$
-      <a href="${nextLink}$" class="calibreANext">${print _('next page'),}$</a>
+      <a href="${nextLink}$" class="calibreANext">${print(_('next page'))}$</a>
     ${:endif}$
   </div>
 
diff --git a/resources/templates/html_export_default_index.tmpl b/resources/templates/html_export_default_index.tmpl
index 4a9e8ab6f3..f0665ad275 100644
--- a/resources/templates/html_export_default_index.tmpl
+++ b/resources/templates/html_export_default_index.tmpl
@@ -6,10 +6,10 @@
 <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
 <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
 
-<title>${print ', '.join(meta.creators()),}$ - ${print meta.titles().next(); meta.titles().close()}$</title>
+<title>${print(', '.join(meta.creators()))}$ - ${print(next(meta.titles())); print(meta.titles().close())}$</title>
 
 ${for item in meta:}$
-  <meta ${print 'name="DC.'+item['name']+'"',}$ ${print 'content="'+item['value']+'"',}$ />
+  <meta ${print('name="DC.'+item['name']+'"')}$ ${print('content="'+item['value']+'"')}$ />
 ${:endfor}$
 
 <link href="${cssLink}$" type="text/css" rel="stylesheet" />
@@ -22,16 +22,16 @@ ${:endfor}$
   ${for title in meta.titles():}$
     ${if pos1:}$
     <h1>
-      <a href="${tocUrl}$">${print title}$</a>
+      <a href="${tocUrl}$">${print(title)}$</a>
     </h1>
     ${:else:}$
-    <div class="calibreMetaSubtitle">${print title}$</div>
+    <div class="calibreMetaSubtitle">${print(title)}$</div>
     ${:endif}$
     ${pos1=0}$
   ${:endfor}$
   </div>
   <div class="calibreMetaAuthor">
-    ${print ', '.join(meta.creators()),}$
+    ${print(', '.join(meta.creators()))}$
   </div>
 </div>
 
@@ -40,19 +40,19 @@ ${:endfor}$
 
     ${if has_toc:}$
       <div class="calibreTocIndex">
-        <h2>${print _('Table of contents'),}$</h2>
+        <h2>${print(_('Table of contents'))}$</h2>
         ${toc}$
       </div>
     ${:else:}$
-        <h2>${print _('No table of contents present'),}$</h2>
-        <div><strong><a href="${nextLink}$">${print _('begin to read'),}$</a></strong></div>
+        <h2>${print(_('No table of contents present'))}$</h2>
+        <div><strong><a href="${nextLink}$">${print(_('begin to read'))}$</a></strong></div>
     ${:endif}$
 
   </div>
 
   <div class="calibreEbNav">
     ${if nextLink:}$
-      <a href="${nextLink}$" class="calibreANext">${print _('next page'),}$</a>
+      <a href="${nextLink}$" class="calibreANext">${print(_('next page'))}$</a>
     ${:endif}$
   </div>
 </div>