Better docs and more consistent naming