Rename and Complete