Refactored job names