update names + docstrings