Fixed naming of lexer and parser to better match correct semantic meaning