Refactoring on class names.
Add history.