refactored class name