renaming fns and files