Fixes for jobs code.
Refactor names.