Renaming functions to avoid camel case; refs #7