Rename and clean up perfect tracking functions