On setup, rename within tasks as well