Keep docstring up to date with the code in basic module
Update CHANGELOG.md

OH NO NAMING CONFLICT
Merge pull request #8488 from bekimb/docstring_basic_module

Keep docstring up to date with the code in basic module