Change tokens in Parser.grm to reflect the keywords in report