Do not change the class names,
Implement Job Titles Ontop of them

Character > Class > Job > Role

It makes more sense. Classes are broader then the very specific jobs.