Refactor #1984
Terminology: message -> job