Clean up function names/descriptions
Just a few cleanup things on function names and documentation to support some changes that have recently been made.
Just a few cleanup things on function names and documentation to support some changes that have recently been made.