Clean up API with more explicit names