Improve naming of jobs