Refactored class names