updates and renaming