Improved naming of jobs