Renamed originals, added new flavours