Renamed the flavors.

The new names should be more descriptive.