Removed ANTLR generated tokens.
Some renamings.