Fix bucket names.