Scrub function names based on current organization

[jphickey]

In recent change sets some functions got moved around, and names may not correctly correlate to the sub-modules anymore. Should do another rename scrub to make sure functions and types are named correctly per their associated sub-module.