Rename and work on edit.