more field renaming to avoid assignment errors