Finished rename edits