changed namespaces for lexer