Refactored several classes to correct naming schemes.