Fixes S3 bucket names