Finished rename modifications