Renames for consistency with PEP-8 and the splunklib code base

Signed-off-by: David Noble <dnoble@splunk.com>