refactored class name for a better fit