Refactoring: Changed class names.