Rename and update all methods