diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java
index 659ea78c16d0..d6a4d77bb5ea 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java
@@ -419,7 +419,7 @@ public class FileTemplateConfigurable implements Configurable, Configurable.NoSc
     private final Lexer myLexer;
 
     public TemplateHighlighter() {
-      myLexer = new MergingLexerAdapter(new FlexAdapter(new FileTemplateTextLexer()), TokenSet.create(FileTemplateTokenType.TEXT));
+      myLexer = new MergingLexerAdapter(new FlexAdapter(new _FileTemplateTextLexer()), TokenSet.create(FileTemplateTokenType.TEXT));
     }
 
     @NotNull
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTextLexer.flex b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTextLexer.flex
index 022fdc8a2962..9491026c617e 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTextLexer.flex
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTextLexer.flex
@@ -7,13 +7,13 @@ import com.intellij.psi.tree.IElementType;
 %%
 
 %{
-   public FileTemplateTextLexer() {
+   public _FileTemplateTextLexer() {
      this((java.io.Reader)null);
    }
 %}
 
 %unicode
-%class FileTemplateTextLexer
+%class _FileTemplateTextLexer
 %implements FlexLexer
 %function advance
 %type IElementType
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xpath-lexer.flex b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xpath-lexer.flex
index 038ac804dfcd..c0607ad41762 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xpath-lexer.flex
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xpath-lexer.flex
@@ -13,8 +13,6 @@ import com.intellij.psi.tree.IElementType;
 %unicode
 %function advance
 %type IElementType
-%eof{  return;
-%eof}
 
 %{
   private boolean allowXPath2Syntax = false;
diff --git a/plugins/xpath/xpath.iml b/plugins/xpath/xpath.iml
index 5e0762e6cb22..192629b58324 100644
--- a/plugins/xpath/xpath.iml
+++ b/plugins/xpath/xpath.iml
@@ -6,6 +6,7 @@
       <sourceFolder url="file://$MODULE_DIR$/xpath-lang/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/xpath-lang/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/xpath-view/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/xpath-lang/gen" isTestSource="false" generated="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -24,5 +25,4 @@
     <orderEntry type="module" module-name="dom-impl" scope="RUNTIME" />
     <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/psi/types/PyType.flex b/python/src/com/jetbrains/python/psi/types/PyType.flex
index 9fa65f0e320b..0e4194906ed6 100644
--- a/python/src/com/jetbrains/python/psi/types/PyType.flex
+++ b/python/src/com/jetbrains/python/psi/types/PyType.flex
@@ -8,7 +8,7 @@ import static com.jetbrains.python.psi.types.PyTypeTokenTypes.*;
 %%
 
 
-%class PyTypeLexer
+%class _PyTypeLexer
 %implements FlexLexer
 %unicode
 %public
@@ -16,9 +16,6 @@ import static com.jetbrains.python.psi.types.PyTypeTokenTypes.*;
 %function advance
 %type PyElementType
 
-%eof{ return;
-%eof}
-
 
 %%
 
diff --git a/python/src/com/jetbrains/python/psi/types/PyTypeParser.java b/python/src/com/jetbrains/python/psi/types/PyTypeParser.java
index 376d44f20394..7b644fb2a4fe 100644
--- a/python/src/com/jetbrains/python/psi/types/PyTypeParser.java
+++ b/python/src/com/jetbrains/python/psi/types/PyTypeParser.java
@@ -713,7 +713,7 @@ public class PyTypeParser {
 
   private static List<Token<PyElementType>> tokenize(@NotNull String s) {
     final List<Token<PyElementType>> tokens = new ArrayList<Token<PyElementType>>();
-    final PyTypeLexer lexer = new PyTypeLexer(new StringReader(s));
+    final _PyTypeLexer lexer = new _PyTypeLexer(new StringReader(s));
     lexer.reset(s, 0, s.length(), lexer.yystate());
     try {
       PyElementType type;