Changed names to make the Parser and Lexer more readable and fixed ISR order error