Changed function names and docstrings.