Refactoring for task names