Ready: Change data type bucket names

As per @macintux's recommendation