Cleanup API

Renamed some methods. Clearer and more consistant.