Rename and update todo