Class names refactoring.