template: don't ignore newline; renamed procedures