Better naming of the jobs