change field names passed to Optiq, so that we don't encounter special names in the new AST