cleanup
tmpl name change