Bug 1060763 - Update job names to match new additions to TBPL

It's probably best to view each commit separately, since the overall PR diff is much less clear.