Rename hmac functions to comply with library name.  Change some functions to static.