Switched to using canonical file names.