Refactoring a few class names.