Remove usage of the old namespace for mashup templates