Fixed lexer to allow _ as part of names