Lexer get name with spaces
Lexer refactor