Renaming JobOpportunity & Company (Refactored)