diff --git a/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdated.soy b/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdated.soy
index c570bd7..43c6bd7 100644
--- a/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdated.soy
+++ b/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdated.soy
@@ -17,10 +17,10 @@
 {namespace com.google.gerrit.server.mail.template.CombinedCheckStateUpdated}
 
 /**
- * The .CombinedCheckStateUpdated template will determine the contents of the email related to a
+ * The CombinedCheckStateUpdated template will determine the contents of the email related to a
  * change for which the combined check state was updated.
  */
-{template .CombinedCheckStateUpdated kind="text"}
+{template CombinedCheckStateUpdated kind="text"}
   {@param email: ?}
   {@param change: ?}
   {@param patchSet: ?}
@@ -50,27 +50,27 @@
   {\n}
   {if $allCheckers}
     All checks:{\n}
-    {call .PrintCheckers_Text}
+    {call PrintCheckers_Text}
       {param state: 'Successful' /}
       {param checkers: $allCheckers.successful /}
     {/call}
-    {call .PrintCheckers_Text}
+    {call PrintCheckers_Text}
       {param state: 'Not Relevant' /}
       {param checkers: $allCheckers.notRelevant /}
     {/call}
-    {call .PrintCheckers_Text}
+    {call PrintCheckers_Text}
       {param state: 'Failed' /}
       {param checkers: $allCheckers.failed /}
     {/call}
-    {call .PrintCheckers_Text}
+    {call PrintCheckers_Text}
       {param state: 'Running' /}
       {param checkers: $allCheckers.running /}
     {/call}
-    {call .PrintCheckers_Text}
+    {call PrintCheckers_Text}
       {param state: 'Scheduled' /}
       {param checkers: $allCheckers.scheduled /}
     {/call}
-    {call .PrintCheckers_Text}
+    {call PrintCheckers_Text}
       {param state: 'Not Started' /}
       {param checkers: $allCheckers.notStarted /}
     {/call}
@@ -80,7 +80,7 @@
   ......................................................................{\n}
 {/template}
 
-{template .PrintCheckers_Text kind="text"}
+{template PrintCheckers_Text kind="text"}
   {@param state: ?}
   {@param checkers: ?}
   {if length($checkers) > 0}
diff --git a/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdatedHtml.soy b/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdatedHtml.soy
index 13bfa8a..2a9cafc 100644
--- a/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdatedHtml.soy
+++ b/resources/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdatedHtml.soy
@@ -19,10 +19,10 @@
 import * as mailTemplate from 'com/google/gerrit/server/mail/Private.soy';
 
 /**
- * The .CombinedCheckStateUpdatedHtml template will determine the contents of the email related to
+ * The CombinedCheckStateUpdatedHtml template will determine the contents of the email related to
  * a change for which the combined check state was updated.
  */
-{template .CombinedCheckStateUpdatedHtml}
+{template CombinedCheckStateUpdatedHtml}
   {@param email: ?}
   {@param patchSet: ?}
   {@param checker: ?}
@@ -64,27 +64,27 @@
 
   {if $allCheckers}
     <p><u><strong>All checks:</strong></u><br>
-    {call .PrintCheckers}
+    {call PrintCheckers}
       {param state: 'Successful' /}
       {param checkers: $allCheckers.successful /}
     {/call}
-    {call .PrintCheckers}
+    {call PrintCheckers}
       {param state: 'Not Relevant' /}
       {param checkers: $allCheckers.notRelevant /}
     {/call}
-    {call .PrintCheckers}
+    {call PrintCheckers}
       {param state: 'Failed' /}
       {param checkers: $allCheckers.failed /}
     {/call}
-    {call .PrintCheckers}
+    {call PrintCheckers}
       {param state: 'Running' /}
       {param checkers: $allCheckers.running /}
     {/call}
-    {call .PrintCheckers}
+    {call PrintCheckers}
       {param state: 'Scheduled' /}
       {param checkers: $allCheckers.scheduled /}
     {/call}
-    {call .PrintCheckers}
+    {call PrintCheckers}
       {param state: 'Not Started' /}
       {param checkers: $allCheckers.notStarted /}
     {/call}
@@ -98,7 +98,7 @@
   {/if}
 {/template}
 
-{template .PrintCheckers}
+{template PrintCheckers}
   {@param state: ?}
   {@param checkers: ?}
   {if length($checkers) > 0}