Fix job/jobdef naming
Merge branch 'jobdefs'