Differentiate aroma naming and remove the "eXPerimental" flag.