Rename of classes and tidy up.