Some file renaming and fixes