Issue #22 - Updated bucket names