Really, no. They both can stay.

Make Classes the Variables and Jobs the specifics. I've rather gotten fond of the system of being able to switch between depending on my mood and needs.