s3: Change sockaddr util function names for consistency