Rename and reindent