after the rename mentioned above, those env vars need to be renamed as well.