Rename and document