diff: rename 'template' variables