Using more appropriate class name and updated docstrings.