Give better names to our two flavors