Simplify package jobs; rename package jobs.