diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java
index b977625c066c..4cdf75ba1bf7 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java
@@ -353,7 +353,7 @@ public class ZenCodingTemplate implements CustomLiveTemplate {
       return null;
     }
     if (template == null) {
-      template = generator.generateTemplate(token.getKey());
+      template = generator.createTemplateByKey(token.getKey());
     }
     if (template == null) {
       return null;
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/generators/XmlZenCodingGenerator.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/generators/XmlZenCodingGenerator.java
index cf5736ea0df4..09cc107d11ab 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/generators/XmlZenCodingGenerator.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/generators/XmlZenCodingGenerator.java
@@ -41,7 +41,7 @@ public abstract class XmlZenCodingGenerator extends ZenCodingGenerator {
   }
 
   @Override
-  public TemplateImpl generateTemplate(@NotNull String key) {
+  public TemplateImpl createTemplateByKey(@NotNull String key) {
     StringBuilder builder = new StringBuilder("<");
     builder.append(key).append('>');
     if (!HtmlUtil.isSingleHtmlTag(key)) {
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/generators/ZenCodingGenerator.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/generators/ZenCodingGenerator.java
index 85e63ef8524f..472506fb3748 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/generators/ZenCodingGenerator.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/generators/ZenCodingGenerator.java
@@ -43,14 +43,16 @@ public abstract class ZenCodingGenerator {
   public abstract TemplateImpl generateTemplate(@NotNull TemplateToken token, boolean hasChildren, @NotNull PsiElement context);
 
   @Nullable
-  public TemplateImpl generateTemplate(@NotNull String key) {
+  public TemplateImpl createTemplateByKey(@NotNull String key) {
     return null;
   }
 
   public abstract boolean isMyContext(@NotNull PsiElement context);
 
   @Nullable
-  public abstract String getSuffix();
+  public String getSuffix() {
+    return null;
+  }
 
   public abstract boolean isAppliedByDefault(@NotNull PsiElement context);