File renaming and header text fixes