Refactor #1984
Terminology: message -> job
Give credit for #1984