Updated task names in handlers