Refactoring few class names.