Rename and update structure