Merge pull request #124 from rwcarlsen/fnames-new

renamed remaining func changes from cyclus
fixed typedef names to CapCase