More readable flavor names

Change-Id: Id6e04b3129434c465995be7a86484ee7104db263
Merge "More readable flavor names"