Rename functions, fix docs