fix saving/renaming