Issue #27: Refactor task names