Fix docstrings
Rename functions @ custom functions