Clean up task names, fix file lookup