file renames and some small changes