refactor on job name