Updated task names to match namespace