backporting s3 bucket naming fix