Refactored API naming, closing in on a finalized API now