Change mashup to setMashup