Minor renaming and docstring edits