Use more consistent Jinja variable names