Rename a few functions. Trying to balance go convention with weird API.