Renamed custom grammar, put 'official' grammar in place, changed some rules names to match the code