Modify s3-related function name