Refactored class names for readability