Bugfix: Cleanup lexer and parser linking and naming.