Renaming and documentation.