Upgrade remaining eco templates to swig