Completed the Renaming