fn renaming in lib; add comments to fns; update commissioner form controller accordingly