Clean up task names, fix file lookup

This is still outside the doFirst