Refactored some class names.