Fixed docstrings and naming