finished renaming changes