Rename functions to comply with library name.  Fixed various code style issues.