Merge pull request #107 from j-xiong/master

prov/psm: clean up the fid_xxx variable names