refactored some class names