Restructure so tasks must be unique and match workflow controller names