refactored class names