Improve API naming consistency