change some api funciton names around.

Were a little to close to the interface function names