Refactored class name