Refactored class names.