One more rename/cleanup for callback err functions
Update docs for new callback return value behavior