Finish rename