finished renaming fields