Replace hyphens with underscores in bucket names

The job of allowing hyphens in bucket names has been moved to another story as there is more work to it.