Tidy up task names