Small improvements to API naming