Fixing flavor naming