Rename some variables on client/S3 classes