Renaming/cleanup in pfsm.js
More pfsm cleanup