Fixed File Rename and PC Problems