Minor docstring and naming changes, ready to merge