prov/psm: clean up the fid_xxx variable names