fixing references to the bucket names