updated for bucket name changes