Rename factory vars to varStack