Better job name handling