Renaming and documentation