NCPFS: update diagnostic strings to match routine names.