Class names refactoring