diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java
index 01ddc3ca563f..57dc97700a74 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java
@@ -313,7 +313,7 @@ public class XmlEmmetParser extends EmmetParser {
     }
 
     if (token == ZenCodingTokens.DOT || token == ZenCodingTokens.SHARP) {
-      final String name = token == ZenCodingTokens.DOT ? CLASS : ID;
+      final String name = getAttributeName(token);
       advance();
       token = getToken();
       final String value = getAttributeValueByToken(token);
@@ -326,6 +326,10 @@ public class XmlEmmetParser extends EmmetParser {
     return null;
   }
 
+  protected String getAttributeName(ZenCodingToken delimiterToken) {
+    return delimiterToken == ZenCodingTokens.DOT ? CLASS : ID;
+  }
+
   @Nullable
   private List<Couple<String>> parseAttributeList() {
     final List<Couple<String>> result = new ArrayList<Couple<String>>();
diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java
index b15df8b5da2e..846eb867d844 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java
@@ -61,8 +61,8 @@ public abstract class ZenCodingGenerator {
 
   public static List<ZenCodingGenerator> getInstances() {
     List<ZenCodingGenerator> generators = new ArrayList<ZenCodingGenerator>();
-    generators.add(XmlZenCodingGeneratorImpl.INSTANCE);
     Collections.addAll(generators, EP_NAME.getExtensions());
+    generators.add(XmlZenCodingGeneratorImpl.INSTANCE);
     return generators;
   }