Completed implementing rename functionality