added flavor parameter and naming prefix