Rename functions, update documentation