Class renaming and documentation.