renaming and updates