Rename classes. Add some unit tests.