Better naming of client API