Fix on task names