More class names refactored