API rename

Simplifying for consistency