Update and rename mack.flav to mack2.flav