Change API identifiers

Want the names to be a little more descriptive, and avoid prefixing the
type of struct they operate on.