Rename and fix pig script