Rename bubble tea to base tea, extend bubble tea from base tea